[wsas-java-dev] svn commit r1117 - in branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas: services/version/META-INF transport

[svn at wso2.org]

Author: azeez
Date: Fri Mar  2 20:18:49 2007
New Revision: 1117

Modified:
   branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/services/version/META-INF/services.xml
   branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/transport/MainServlet.java
Log:
Formatting services.xml
Null check for admin resource base



Modified: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/services/version/META-INF/services.xml
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/services/version/META-INF/services.xml	(original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/services/version/META-INF/services.xml	Fri Mar  2 20:18:49 2007
@@ -6,7 +6,10 @@
         This service outputs the version of WSO2 WSAS it is deployed on.
     </description>
 
-	<wsp:Policy Name="urn:version" wsu:Id="urn:version" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+	<wsp:Policy Name="urn:version"
+                wsu:Id="urn:version"
+                xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+                xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
 		<intf:ServicePolicyTestAssertion1 xmlns:intf="http://test.policy.org/wsas" marker="2" />
 	</wsp:Policy>
 

Modified: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/transport/MainServlet.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/transport/MainServlet.java	(original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/transport/MainServlet.java	Fri Mar  2 20:18:49 2007
@@ -168,6 +168,9 @@
                            wso2wsasHome + File.separator +
                            serverConfig.getFirstProperty("Database.Home"));
         serverManager.adminResourceBase = servletContext.getRealPath(".");
+        if(serverManager.adminResourceBase == null){
+            serverManager.adminResourceBase = "TODO"; //TODO: Get the path to the resource base
+        }
         serverManager.serverWorkDir =
                 wso2wsasHome + File.separator + serverConfig.getFirstProperty("WorkDirectory");
         serverManager.axis2RepoLocation