[wsas-java-dev] svn commit r1690 - in trunk/wsas/java/modules: servlet-edition/conf standalone-edition/conf

[svn at wso2.org]

Author: azeez
Date: Mon Apr  2 01:29:17 2007
New Revision: 1690

Modified:
   trunk/wsas/java/modules/servlet-edition/conf/server.xml
   trunk/wsas/java/modules/standalone-edition/conf/server.xml
Log:
Updating server.xml files to refer to the wso2wsas.home System property



Modified: trunk/wsas/java/modules/servlet-edition/conf/server.xml
==============================================================================
--- trunk/wsas/java/modules/servlet-edition/conf/server.xml	(original)
+++ trunk/wsas/java/modules/servlet-edition/conf/server.xml	Mon Apr  2 01:29:17 2007
@@ -16,7 +16,12 @@
      limitations under the License.
 -->
 
-<!--  This is the server configuration file-->
+<!--
+    This is the server configuration file
+
+    ${wso2wsas.home} represents the wso2wsas.home system property.
+    Other system properties can be specified in a similar manner.
+-->
 <Server xmlns="http://www.wso2.org/products/wsas">
 
     <!--
@@ -47,7 +52,7 @@
              3. file:///home/wso2wsas/repository
              4. http://wso2wsas/repository
         -->
-        <RepositoryLocation>repository</RepositoryLocation>
+        <RepositoryLocation>${wso2wsas.home}/repository</RepositoryLocation>
 
         <!--
             Location of the main Axis2 configuration descriptor file, a.k.a. axis2.xml file
@@ -60,7 +65,7 @@
             3. file:///home/wso2wsas/conf/axis2.xml
             4. http://wso2wsas/conf/axis2.xml
         -->
-        <ConfigurationFile>conf/axis2.xml</ConfigurationFile>
+        <ConfigurationFile>${wso2wsas.home}/conf/axis2.xml</ConfigurationFile>
 
         <!--
           ServiceGroupContextIdleTime, which will be set in ConfigurationContex
@@ -71,12 +76,23 @@
     </Axis2Config>
 
     <!--
+       Functions related to the Management Console
+    -->
+    <Management>
+
+        <!--
+           Enable the Management Console, true/false
+        -->
+        <EnableConsole>true</EnableConsole>
+    </Management>
+
+    <!--
        Command Listener - Listens to external commands
     -->
     <CommandListener>
         <Port>6666</Port>
     </CommandListener>
-       
+
     <!--
        Uncomment this section and provide the correct HTTP port
        in the case of a generic server installation
@@ -122,7 +138,7 @@
         -->
         <KeyStore>
             <!-- Key store file location-->
-            <Location>conf/wso2wsas.jks</Location>
+            <Location>${wso2wsas.home}/conf/wso2wsas.jks</Location>
             <!-- Key store type (JKS/PKCS12 etc.)-->
             <Type>JKS</Type>
             <!-- Key store password-->
@@ -136,7 +152,7 @@
         <!--
            The directory under which all other KeyStore files will be stored
         -->
-        <KeyStoresDir>conf/keystores</KeyStoresDir>
+        <KeyStoresDir>${wso2wsas.home}/conf/keystores</KeyStoresDir>
     </Security>
 
     <!--

Modified: trunk/wsas/java/modules/standalone-edition/conf/server.xml
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/conf/server.xml	(original)
+++ trunk/wsas/java/modules/standalone-edition/conf/server.xml	Mon Apr  2 01:29:17 2007
@@ -16,7 +16,12 @@
      limitations under the License.
 -->
 
-<!--  This is the main server configuration file-->
+<!--
+    This is the main server configuration file
+    
+    ${wso2wsas.home} represents the wso2wsas.home system property.
+    Other system properties can be specified in a similar manner.
+-->
 <Server xmlns="http://www.wso2.org/products/wsas">
 
     <!--
@@ -47,7 +52,7 @@
              3. file:///home/wso2wsas/repository
              4. http://wso2wsas/repository
         -->
-        <RepositoryLocation>repository</RepositoryLocation>
+        <RepositoryLocation>${wso2wsas.home}/repository</RepositoryLocation>
 
         <!--
             Location of the main Axis2 configuration descriptor file, a.k.a. axis2.xml file
@@ -60,7 +65,7 @@
             3. file:///home/wso2wsas/conf/axis2.xml
             4. http://wso2wsas/conf/axis2.xml
         -->
-        <ConfigurationFile>conf/axis2.xml</ConfigurationFile>
+        <ConfigurationFile>${wso2wsas.home}/conf/axis2.xml</ConfigurationFile>
 
         <!--
           ServiceGroupContextIdleTime, which will be set in ConfigurationContex
@@ -71,6 +76,17 @@
     </Axis2Config>
 
     <!--
+       Functions related to the Management Console
+    -->
+    <Management>
+
+        <!--
+           Enable the Management Console, true/false
+        -->
+        <EnableConsole>true</EnableConsole>
+    </Management>
+
+    <!--
        Command Listener - Listens to external commands
     -->
     <CommandListener>
@@ -102,7 +118,7 @@
         -->
         <KeyStore>
             <!-- Key store file location-->
-            <Location>conf/wso2wsas.jks</Location>
+            <Location>${wso2wsas.home}/conf/wso2wsas.jks</Location>
             <!-- Key store type (JKS/PKCS12 etc.)-->
             <Type>JKS</Type>
             <!-- Key store password-->
@@ -116,13 +132,13 @@
         <!--
            The directory under which all other KeyStore files will be stored
         -->
-        <KeyStoresDir>conf/keystores</KeyStoresDir>
+        <KeyStoresDir>${wso2wsas.home}/conf/keystores</KeyStoresDir>
     </Security>
 
     <!--
        The temporary work directory which will be created under WSO2WSAS_HOME
     -->
-    <WorkDirectory>work</WorkDirectory>
+    <WorkDirectory>${wso2wsas.home}/work</WorkDirectory>
 
     <!--
        The Database configurations
@@ -133,7 +149,7 @@
            the derby.system.home System property. This is where
            the derby.properties file should reside.
         -->
-        <Home>conf</Home>
+        <Home>${wso2wsas.home}/conf</Home>
     </Database>
 
     <!--