[wsas-java-dev] svn commit r2782 - in trunk/wsas/java/modules: distribution/standalone standalone-edition/src/org/wso2/wsas

[svn at wso2.org]

Author: azeez
Date: Wed May 16 23:59:38 2007
New Revision: 2782

Modified:
   trunk/wsas/java/modules/distribution/standalone/pom.xml
   trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/TomcatServer.java
Log:
Moving the tomcat directory inside the lib directory



Modified: trunk/wsas/java/modules/distribution/standalone/pom.xml
==============================================================================
--- trunk/wsas/java/modules/distribution/standalone/pom.xml	(original)
+++ trunk/wsas/java/modules/distribution/standalone/pom.xml	Wed May 16 23:59:38 2007
@@ -224,9 +224,9 @@
                                 <echo message="################ END ####################"/>
 
                                 <echo message="########## Create the Webapp #############"/>
-                                <mkdir dir="${dist.temp.dir}/tomcat/webapps/ROOT/WEB-INF"/>
-                                <mkdir dir="${dist.temp.dir}/tomcat/conf"/>
-                                <copy todir="${dist.temp.dir}/tomcat/webapps/ROOT">
+                                <mkdir dir="${dist.temp.dir}/lib/tomcat/webapps/ROOT/WEB-INF"/>
+                                <mkdir dir="${dist.temp.dir}/lib/tomcat/conf"/>
+                                <copy todir="${dist.temp.dir}/lib/tomcat/webapps/ROOT">
                                     <fileset dir="../../www">
                                         <exclude name=".svn"/>
                                         <exclude name="**/**.iml"/>
@@ -237,20 +237,21 @@
                                         <exclude name="**/pom.xml"/>
                                     </fileset>
                                 </copy>
-                                <copy todir="${dist.temp.dir}/tomcat/webapps/ROOT"
+                                <copy todir="${dist.temp.dir}/lib/tomcat/webapps/ROOT"
                                       filtering="on">
                                     <fileset dir="../../www">
                                         <include name="**/**.html"/>
                                         <include name="**/**.css"/>
                                         <include name="**/**.xsl"/>
                                         <include name="**/**.js"/>
+                                        <include name="**/**.xml"/>
                                     </fileset>
                                 </copy>
                                 <unzip src="target/zips/wso2adminui-${wso2.adminui.version}.zip"
                                        dest="${dist.dir.temp.www}"/>
                                 <unzip src="target/zips/wso2-adminui-graphs-zip-${wso2.adminui.version.graphs}.zip"
                                        dest="${dist.dir.temp.www}"/>
-                                <copy todir="${dist.temp.dir}/tomcat/webapps/ROOT">
+                                <copy todir="${dist.temp.dir}/lib/tomcat/webapps/ROOT">
                                     <fileset dir="${dist.dir.temp.www}">
                                         <exclude name=".svn"/>
                                         <exclude name="**/**.html"/>
@@ -261,7 +262,7 @@
                                         <exclude name="**/pom.xml"/>
                                     </fileset>
                                 </copy>
-                                <copy todir="${dist.temp.dir}/tomcat/webapps/ROOT"
+                                <copy todir="${dist.temp.dir}/lib/tomcat/webapps/ROOT"
                                       filtering="on">
                                     <fileset dir="${dist.dir.temp.www}">
                                         <include name="**/**.html"/>
@@ -270,10 +271,10 @@
                                         <include name="**/**.js"/>
                                     </fileset>
                                 </copy>
-                                <copy todir="${dist.temp.dir}/tomcat/webapps/ROOT/WEB-INF">
+                                <copy todir="${dist.temp.dir}/lib/tomcat/webapps/ROOT/WEB-INF">
                                     <fileset file="../../core/conf/web.xml"/>
                                 </copy>
-                                <copy todir="${dist.temp.dir}/tomcat/conf">
+                                <copy todir="${dist.temp.dir}/lib/tomcat/conf">
                                     <fileset dir="../../standalone-edition/conf/tomcat"/>
                                 </copy>
                                 <echo message="################ END ####################"/>

Modified: trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/TomcatServer.java
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/TomcatServer.java	(original)
+++ trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/TomcatServer.java	Wed May 16 23:59:38 2007
@@ -42,7 +42,8 @@
 
         String wso2wsasHome = System.getProperty(ServerConstants.WSO2WSAS_HOME);
 
-        String catalinaHome = new File(wso2wsasHome).getAbsolutePath() + File.separator + "tomcat";
+        String catalinaHome = new File(wso2wsasHome).getAbsolutePath() + File.separator + "lib" +
+                              File.separator + "tomcat";
 
         embedded.setCatalinaHome(catalinaHome);
         String webappsDir = catalinaHome + File.separator + "webapps";