perfsonar development work

Author: psnc.pikusa
Date: 2010-03-23 14:16:57 +0000 (Tue, 23 Mar 2010)
New Revision: 5562

Modified:
   trunk/perfsonar-java-rrd-ma/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
Log:
web.xml integrated with Web Admin web.xml file


Modified: 
trunk/perfsonar-java-rrd-ma/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma/resources/axis2-1.4.1/webapp/WEB-INF/web.xml  
  2010-03-23 14:15:45 UTC (rev 5561)
+++ trunk/perfsonar-java-rrd-ma/resources/axis2-1.4.1/webapp/WEB-INF/web.xml  
  2010-03-23 14:16:57 UTC (rev 5562)
@@ -22,7 +22,13 @@
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
 
 <web-app>
-    <display-name>Apache-Axis2</display-name>
+    
+       <session-config>
+               <!-- Default to 5 minute session timeouts -->
+               <session-timeout>5</session-timeout>
+       </session-config>
+
+
     <servlet>
         <servlet-name>AxisServlet</servlet-name>
         <display-name>Apache-Axis Servlet</display-name>
@@ -70,7 +76,7 @@
         <mime-type>text/plain</mime-type>
     </mime-mapping>
 
-   <welcome-file-list>
+   <!-- <welcome-file-list>
       <welcome-file>index.jsp</welcome-file>
       <welcome-file>index.html</welcome-file>
       <welcome-file>/axis2-web/index.jsp</welcome-file>
@@ -85,4 +91,43 @@
         <error-code>500</error-code>
         <location>/axis2-web/Error/error500.jsp</location>
     </error-page>
+-->
+
+       
+
+       <!--  pS Config Servlet Admin  -->
+       <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>
+
+       <!-- SelfTest servlet -->
+       <servlet>
+               <servlet-name>SelfTestServlet</servlet-name>
+               <servlet-class>
+                       org.perfsonar.webadmin.base2.servlet.SelfTestServlet
+       </servlet-class>
+       </servlet>
+
+       <servlet-mapping>
+               <servlet-name>SelfTestServlet</servlet-name>
+               <url-pattern>
+                       /selfTest
+       </url-pattern>
+       </servlet-mapping>
+
+       <welcome-file-list>
+               <welcome-file>index.jsp</welcome-file>
+       </welcome-file-list>
+
+
 </web-app>