perfsonar-dev - perfsonar: r5441 - in branches/new-structure-with-base2/ps-mdm-web-admin: . ant src/main/java/org/perfsonar/webadmin/base2 src/main/java/org/perfsonar/webadmin/base2/servlet src/main/java/org/perfsonar/webadmin/base2/test tomcat tomcat/soapMessages
Subject: perfsonar development work
List archive
perfsonar: r5441 - in branches/new-structure-with-base2/ps-mdm-web-admin: . ant src/main/java/org/perfsonar/webadmin/base2 src/main/java/org/perfsonar/webadmin/base2/servlet src/main/java/org/perfsonar/webadmin/base2/test tomcat tomcat/soapMessages
Chronological Thread
- From:
- To:
- Subject: perfsonar: r5441 - in branches/new-structure-with-base2/ps-mdm-web-admin: . ant src/main/java/org/perfsonar/webadmin/base2 src/main/java/org/perfsonar/webadmin/base2/servlet src/main/java/org/perfsonar/webadmin/base2/test tomcat tomcat/soapMessages
- Date: Wed, 30 Dec 2009 06:06:43 -0500
Author: trzaszcz
Date: 2009-12-30 06:06:43 -0500 (Wed, 30 Dec 2009)
New Revision: 5441
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/SelfTestServlet.java
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/test/
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/test/SOAPClient.java
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/soapMessages/
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/soapMessages/selfTest.xml
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/.classpath
branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/web.xml
Log:
selfTest servlet added
Modified: branches/new-structure-with-base2/ps-mdm-web-admin/.classpath
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/.classpath
2009-12-30 10:20:28 UTC (rev 5440)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/.classpath
2009-12-30 11:06:43 UTC (rev 5441)
@@ -18,5 +18,7 @@
<classpathentry kind="lib" path="lib/librt/jaxme2/jaxmexs-0.5.2.jar"/>
<classpathentry kind="lib"
path="lib/librt/xmldb/xmldb-common-20030701.jar"/>
<classpathentry kind="lib"
path="lib/librt/xmldb/xmldb-xupdate-20040205.jar"/>
+ <classpathentry kind="lib"
path="lib/repository/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0.jar"/>
+ <classpathentry kind="lib"
path="lib/repository/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
2009-12-30 10:20:28 UTC (rev 5440)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
2009-12-30 11:06:43 UTC (rev 5441)
@@ -58,6 +58,7 @@
<dependency groupId="Validation"
artifactId="relaxngDatatype" version="1.0" />
<dependency groupId="xerces" artifactId="xercesImpl"
version="2.8.0" />
<dependency groupId="xalan" artifactId="xalan"
version="2.7.0" />
+ <dependency groupId="org.apache.httpcomponents"
artifactId="httpclient" version="4.0" />
<localRepository refid="local.repository" />
<remoteRepository refid="remote.repository" />
</artifact:dependencies>
@@ -126,6 +127,9 @@
<fileset dir="${lib}">
<include name="**/*.jar" />
</fileset>
+ <fileset dir="${basedir}/lib/repository">
+ <include name="**/*.jar" />
+ </fileset>
<fileset dir="${servlet.dir}">
<include name="*.jar" />
</fileset>
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/SelfTestServlet.java
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/test/SOAPClient.java
Added:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/soapMessages/selfTest.xml
Modified: branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/web.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/web.xml
2009-12-30 10:20:28 UTC (rev 5440)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/web.xml
2009-12-30 11:06:43 UTC (rev 5441)
@@ -4,205 +4,133 @@
Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app>
- <display-name>Apache-Axis</display-name>
+ <display-name>Apache-Axis</display-name>
- <!-- <listener>
-
<listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
- </listener>-->
+ <!--
+ <listener>
+
<listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
+ </listener>
+ -->
- <!-- <listener>
-
<listener-class>org.perfsonar.service.base.container.listeners.StartupInitializer</listener-class>
- </listener>-->
+ <!--
+ <listener>
+
<listener-class>org.perfsonar.service.base.container.listeners.StartupInitializer</listener-class>
+ </listener>
+ -->
- <servlet>
- <servlet-name>AxisServlet</servlet-name>
- <display-name>Apache-Axis Servlet</display-name>
- <servlet-class>
- org.apache.axis.transport.http.AxisServlet
+ <servlet>
+ <servlet-name>AxisServlet</servlet-name>
+ <display-name>Apache-Axis Servlet</display-name>
+ <servlet-class>
+ org.apache.axis.transport.http.AxisServlet
</servlet-class>
- </servlet>
+ </servlet>
- <servlet>
- <servlet-name>AdminServlet</servlet-name>
- <display-name>Axis Admin Servlet</display-name>
- <servlet-class>
- org.apache.axis.transport.http.AdminServlet
+ <servlet>
+ <servlet-name>AdminServlet</servlet-name>
+ <display-name>Axis Admin Servlet</display-name>
+ <servlet-class>
+ org.apache.axis.transport.http.AdminServlet
</servlet-class>
- <load-on-startup>100</load-on-startup>
- </servlet>
+ <load-on-startup>100</load-on-startup>
+ </servlet>
- <servlet>
- <servlet-name>SOAPMonitorService</servlet-name>
- <display-name>SOAPMonitorService</display-name>
- <servlet-class>
- org.apache.axis.monitor.SOAPMonitorService
+ <servlet>
+ <servlet-name>SOAPMonitorService</servlet-name>
+ <display-name>SOAPMonitorService</display-name>
+ <servlet-class>
+ org.apache.axis.monitor.SOAPMonitorService
</servlet-class>
- <init-param>
- <param-name>SOAPMonitorPort</param-name>
- <param-value>5001</param-value>
- </init-param>
- <load-on-startup>100</load-on-startup>
- </servlet>
+ <init-param>
+ <param-name>SOAPMonitorPort</param-name>
+ <param-value>5001</param-value>
+ </init-param>
+ <load-on-startup>100</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/servlet/AxisServlet</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>/servlet/AxisServlet</url-pattern>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>*.jws</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>*.jws</url-pattern>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>SOAPMonitorService</servlet-name>
- <url-pattern>/SOAPMonitor</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SOAPMonitorService</servlet-name>
+ <url-pattern>/SOAPMonitor</url-pattern>
+ </servlet-mapping>
- <!-- uncomment this if you want the admin servlet -->
- <!--
- <servlet-mapping>
- <servlet-name>AdminServlet</servlet-name>
- <url-pattern>/servlet/AdminServlet</url-pattern>
- </servlet-mapping>
- -->
+ <!-- uncomment this if you want the admin servlet -->
+ <!--
+ <servlet-mapping> <servlet-name>AdminServlet</servlet-name>
+ <url-pattern>/servlet/AdminServlet</url-pattern>
</servlet-mapping>
+ -->
- <session-config>
- <!-- Default to 5 minute session timeouts -->
- <session-timeout>5</session-timeout>
- </session-config>
+ <session-config>
+ <!-- Default to 5 minute session timeouts -->
+ <session-timeout>5</session-timeout>
+ </session-config>
- <!-- currently the W3C havent settled on a media type for WSDL;
- http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
- for now we go with the basic 'it's XML' response -->
- <mime-mapping>
- <extension>wsdl</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
+ <!--
+ currently the W3C havent settled on a media type for WSDL;
+ http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft for
now we go
+ with the basic 'it's XML' response
+ -->
+ <mime-mapping>
+ <extension>wsdl</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
- <mime-mapping>
- <extension>xsd</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
+ <mime-mapping>
+ <extension>xsd</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
- <!-- pS Config Servlet Admin -->
+ <!-- pS Config Servlet Admin -->
- <servlet>
- <servlet-name>
- BasicConfiguration
- </servlet-name>
- <servlet-class>
-
org.perfsonar.webadmin.base2.servlet.BasicConfigurationServlet
- </servlet-class>
- </servlet>
+ <servlet>
+ <servlet-name>BasicConfiguration</servlet-name>
+ <servlet-class>
+
org.perfsonar.webadmin.base2.servlet.BasicConfigurationServlet
+ </servlet-class>
+ </servlet>
- <servlet-mapping>
- <servlet-name>
- BasicConfiguration
- </servlet-name>
- <url-pattern>
- /config
- </url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>BasicConfiguration</servlet-name>
+ <url-pattern>
+ /config
+ </url-pattern>
+ </servlet-mapping>
- <!--
- <servlet>
- <servlet-name>
- ServiceAdmin
- </servlet-name>
- <servlet-class>
- perfSONARWebAdmin.admin.service.Admin
- </servlet-class>
- </servlet>
+ <!-- SelfTest servlet -->
+ <servlet>
+ <servlet-name>SelfTestServlet</servlet-name>
+ <servlet-class>
+ org.perfsonar.webadmin.base2.servlet.SelfTestServlet
+ </servlet-class>
+ </servlet>
- <servlet-mapping>
- <servlet-name>
- ServiceAdmin
- </servlet-name>
- <url-pattern>
- /ServiceAdmin
- </url-pattern>
- </servlet-mapping>
- -->
+ <servlet-mapping>
+ <servlet-name>SelfTestServlet</servlet-name>
+ <url-pattern>
+ /selfTest
+ </url-pattern>
+ </servlet-mapping>
- <!-- pS Config eXist Admin -->
- <!--
- <servlet>
- <servlet-name>
- eXistAdmin
- </servlet-name>
- <servlet-class>
- perfSONARWebAdmin.admin.exist.eXistAdmin
- </servlet-class>
- </servlet>
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
- <servlet-mapping>
- <servlet-name>
- eXistAdmin
- </servlet-name>
- <url-pattern>
- /eXistAdmin
- </url-pattern>
- </servlet-mapping>
- -->
-
- <!-- pS Config Wizard Admin -->
- <!--
- <servlet>
- <servlet-name>
- Wizard
- </servlet-name>
- <servlet-class>
- perfSONARWebAdmin.admin.wizard.Wizard
- </servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>
- Wizard
- </servlet-name>
- <url-pattern>
- /Wizard
- </url-pattern>
- </servlet-mapping>
- -->
-
- <!-- pS Stitching Servlet -->
- <!--
- <servlet>
- <servlet-name>
- MetadataAdmin
- </servlet-name>
- <servlet-class>
- perfSONARWebAdmin.admin.stitching.StitchingServlet
- </servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>
- MetadataAdmin
- </servlet-name>
- <url-pattern>
- /MetadataAdmin
- </url-pattern>
- </servlet-mapping>
- -->
-
-
-
- <welcome-file-list id="WelcomeFileList">
- <!-- <welcome-file>index.html</welcome-file> -->
- <welcome-file>index.jsp</welcome-file>
- <!-- <welcome-file>index.jws</welcome-file>-->
- </welcome-file-list>
-
</web-app>
- perfsonar: r5441 - in branches/new-structure-with-base2/ps-mdm-web-admin: . ant src/main/java/org/perfsonar/webadmin/base2 src/main/java/org/perfsonar/webadmin/base2/servlet src/main/java/org/perfsonar/webadmin/base2/test tomcat tomcat/soapMessages, svnlog, 12/30/2009
Archive powered by MHonArc 2.6.16.