[wsas-java-dev] svn commit r685 - in
wsas/java/trunk/modules/distribution: common standalone
webapp webapp/src/assemble
svn at wso2.com
svn at wso2.com
Fri Feb 2 08:31:18 PST 2007
Author: azeez
Date: Fri Feb 2 08:31:10 2007
New Revision: 685
Modified:
wsas/java/trunk/modules/distribution/common/pom.xml
wsas/java/trunk/modules/distribution/standalone/pom.xml
wsas/java/trunk/modules/distribution/webapp/pom.xml
wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml
Log:
more fixes to build scripts
Modified: wsas/java/trunk/modules/distribution/common/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/common/pom.xml (original)
+++ wsas/java/trunk/modules/distribution/common/pom.xml Fri Feb 2 08:31:10 2007
@@ -248,19 +248,6 @@
<mkdir dir="${dist.temp.dir}/database"/>
<echo message="######################### END ################################"/>
- <echo message="############ Copy all core/bin scripts in to bin ##############"/>
- <copy todir="${dist.temp.dir}/bin" filtering="on">
- <fileset dir="../../core/bin">
- <exclude name="**/*.bat"/>
- </fileset>
- </copy>
- <copy todir="${dist.temp.dir}/bin">
- <fileset dir="../../core/bin">
- <include name="**/*.bat"/>
- </fileset>
- </copy>
- <echo message="######################### END ################################"/>
-
<echo message="######################### Copy samples #######################"/>
<copy todir="${dist.temp.dir}/samples" filtering="on">
<fileset dir="../../samples">
@@ -447,7 +434,11 @@
<create-database sqlOutput="${sqlOutput}" dbURL="${dbURL}"/>
<echo message="######################### END ################################"/>
-
+ <echo message="###################### Copy release note #####################"/>
+ <copy todir="${dist.temp.dir}" filtering="on">
+ <fileset file="../../../release-notes.html"/>
+ </copy>
+ <echo message="######################### END ################################"/>
</tasks>
</configuration>
<goals>
Modified: wsas/java/trunk/modules/distribution/standalone/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/standalone/pom.xml (original)
+++ wsas/java/trunk/modules/distribution/standalone/pom.xml Fri Feb 2 08:31:10 2007
@@ -97,15 +97,25 @@
<filter token="wso2wsas_version"
value="${wso2wsas.version}"/>
- <echo message="############## Copy File ################"/>
- <copy todir="${dist.temp.dir}" filtering="on">
- <fileset file="../../../release-notes.html"/>
- </copy>
+ <echo message="############## Copy README ###############"/>
<copy todir="${dist.temp.dir}" filtering="on">
<fileset file="../../standalone-edition/README.txt"/>
</copy>
<echo message="################ END ####################"/>
+ <echo message="############ Copy all core/bin scripts in to bin ##############"/>
+ <copy todir="${dist.temp.dir}/bin" filtering="on">
+ <fileset dir="../../core/bin">
+ <exclude name="**/*.bat"/>
+ </fileset>
+ </copy>
+ <copy todir="${dist.temp.dir}/bin">
+ <fileset dir="../../core/bin">
+ <include name="**/*.bat"/>
+ </fileset>
+ </copy>
+ <echo message="######################### END ################################"/>
+
<echo message="########## Copy common dist ##############"/>
<mkdir dir="${dist.temp.dir}/lib/www"/>
<copy todir="${dist.temp.dir}">
Modified: wsas/java/trunk/modules/distribution/webapp/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/webapp/pom.xml (original)
+++ wsas/java/trunk/modules/distribution/webapp/pom.xml Fri Feb 2 08:31:10 2007
@@ -245,6 +245,8 @@
<fileset dir="../common/${dist.temp.dir}"/>
</copy>
+ <!--<unzip src="target/dist-bin.zip" dest="target/dist"/>-->
+
<echo message="####################### Copy bin files #######################"/>
<mkdir dir="${dist.temp.dir}/bin"/>
<copy todir="${dist.temp.dir}/bin">
@@ -259,17 +261,22 @@
<fileset dir="../../servlet-edition/conf">
<exclude name="hibernate"/>
</fileset>
- <fileset file="../../servlet-edition/conf/hibernate/wso2wsas.hibernate.cfg.xml"/>
+ <fileset
+ file="../../servlet-edition/conf/hibernate/wso2wsas.hibernate.cfg.xml"/>
</copy>
<echo message="######################### END ################################"/>
- <unzip src="target/webapp-bin.zip" dest="target"/>
+ <!--<unzip src="target/webapp-bin.zip" dest="target"/>
<zip destfile="target/wso2wsas-war.zip">
<fileset dir="${war.temp.dir}"/>
<fileset dir="target/${war.temp.assembly.dir}"/>
</zip>
- <!-- Building the distribution -->
+ <copy file="target/wso2wsas-war.zip" todir="${dist.temp.dir}"/>
+ <copy todir="${dist.temp.dir}" filtering="on">
+ <fileset file="../../servlet-edition/README.txt"/>
+ </copy>
+
<mkdir dir="${dist.temp.dir}"/>
<mkdir dir="${dist.dir.temp.www}"/>
<copy todir="${dist.temp.dir}">
@@ -280,8 +287,8 @@
<copy todir="${dist.dir.temp.www}">
<fileset dir="../common/${dist.dir.temp.www}"/>
</copy>
-
- <delete dir="${dist.temp.dir}/lib/www"/>
+-->
+ <!--<delete dir="${dist.temp.dir}/lib/www"/>
<delete dir="${dist.temp.dir}/lib/styles"/>
<delete dir="${dist.temp.dir}/lib/endorsed"/>
<delete file="${dist.temp.dir}/README.txt"/>
@@ -294,7 +301,6 @@
<delete dir="${dist.temp.dir}/bin"/>
<mkdir dir="${dist.temp.dir}/bin"/>
- <!-- Chad sample -->
<delete file="${dist.temp.dir}/samples/Chad/build.xml"/>
<copy tofile="${dist.temp.dir}/samples/Chad/build.xml"
file="../../samples/Chad/build-war.xml"/>
@@ -333,11 +339,11 @@
<mkdir dir="${dist.temp.dir}/conf/geronimo"/>
<copy todir="${dist.temp.dir}/conf/geronimo">
<fileset dir="../../servlet-edition/conf/geronimo"/>
- </copy>
+ </copy>-->
<!-- Copy the sample default_epr.properties file -->
- <delete failonerror="false">
+ <!--<delete failonerror="false">
<fileset
dir="${dist.temp.dir}/samples/CommodityQuote/conf/">
<include name="**/**.properties"/>
@@ -378,7 +384,7 @@
<zip destfile="target/wso2wsas-servlet-edition-java-${wso2wsas.version}.zip">
<fileset dir="${dist.dir}/temp/"/>
- </zip>
+ </zip>-->
</tasks>
Modified: wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml (original)
+++ wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml Fri Feb 2 08:31:10 2007
@@ -19,13 +19,6 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../../servlet-edition/bin</directory>
- <outputDirectory>${war.temp.assembly.dir}/bin</outputDirectory>
- <includes>
- <include>version.txt</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>../../core/conf</directory>
<outputDirectory>${war.temp.assembly.dir}/WEB-INF/classes</outputDirectory>
<includes>
@@ -42,10 +35,6 @@
</includes>
</fileSet>
<fileSet>
- <directory>../../../legal</directory>
- <outputDirectory>${war.temp.assembly.dir}/WEB-INF/lib</outputDirectory>
- </fileSet>
- <fileSet>
<directory>../../servlet-edition/conf</directory>
<outputDirectory>${war.temp.assembly.dir}/WEB-INF</outputDirectory>
<includes>
@@ -54,7 +43,6 @@
<include>geronimo/geronimo-web.xml</include>
</includes>
</fileSet>
-
</fileSets>
<dependencySets>
More information about the Wsas-java-dev
mailing list