[wsas-java-dev] svn commit r687 - in
wsas/java/trunk/modules/distribution: common
standalone/src/assemble webapp webapp/src/assemble
svn at wso2.com
svn at wso2.com
Fri Feb 2 09:26:24 PST 2007
Author: azeez
Date: Fri Feb 2 09:26:16 2007
New Revision: 687
Modified:
wsas/java/trunk/modules/distribution/common/pom.xml
wsas/java/trunk/modules/distribution/standalone/src/assemble/dist-standalone-assembly.xml
wsas/java/trunk/modules/distribution/webapp/pom.xml
wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml
Log:
More updates 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 09:26:16 2007
@@ -377,6 +377,7 @@
<copy todir="${dist.temp.dir}" filtering="on">
<fileset file="../../../release-notes.html"/>
<fileset file="../../../NOTICE.txt"/>
+ <fileset file="../../../LICENSE.txt"/>
</copy>
<echo message="######################### END ################################"/>
</tasks>
Modified: wsas/java/trunk/modules/distribution/standalone/src/assemble/dist-standalone-assembly.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/standalone/src/assemble/dist-standalone-assembly.xml (original)
+++ wsas/java/trunk/modules/distribution/standalone/src/assemble/dist-standalone-assembly.xml Fri Feb 2 09:26:16 2007
@@ -4,16 +4,6 @@
<formats>
<format>zip</format>
</formats>
- <fileSets>
- <fileSet>
- <directory>../../..</directory>
- <outputDirectory>${dist.temp.assembly.bin.dir}</outputDirectory>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </fileSet>
- </fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>${dist.temp.assembly.bin.dir}/lib</outputDirectory>
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 09:26:16 2007
@@ -245,8 +245,6 @@
<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">
@@ -272,7 +270,8 @@
<fileset dir="target/${war.temp.assembly.dir}"/>
</zip>
- <copy file="target/wso2wsas-war.zip" todir="${dist.temp.dir}"/>
+ <copy file="target/wso2wsas-war.zip"
+ todir="${dist.temp.dir}"/>
<echo message="####################### Copy README ###########################"/>
<copy todir="${dist.temp.dir}" filtering="on">
@@ -280,120 +279,24 @@
</copy>
<echo message="######################### END ################################"/>
- <!--<delete file="${dist.temp.dir}/lib/wso2wsas-admin-${wso2wsas.version}.jar"/>-->
- <!--<delete file="${dist.temp.dir}/lib/wso2wsas-core-${wso2wsas.version}.jar"/>-->
- <!--<delete file="${dist.temp.dir}/lib/wso2wsas-standalone-${wso2wsas.version}.jar"/>-->
- <!--
- <mkdir dir="${dist.temp.dir}"/>
- <mkdir dir="${dist.dir.temp.www}"/>
- <copy todir="${dist.temp.dir}">
- <fileset dir="../common/${dist.temp.dir}"/>
- <fileset
- dir="../common/target/dist-bin/${dist.temp.assembly.bin.dir}"/>
- </copy>
- <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/styles"/>
- <delete dir="${dist.temp.dir}/lib/endorsed"/>
- <delete file="${dist.temp.dir}/README.txt"/>
- <delete file="${dist.temp.dir}/conf/server-web.xml"/>
- <delete file="${dist.temp.dir}/conf/wso2wsas.hibernate.cfg.xml"/>
- <delete file="${dist.temp.dir}/conf/wso2wsas.hbm.xml"/>
- <delete file="${dist.temp.dir}/conf/axis2.xml"/>
-
- <delete dir="${dist.temp.dir}/lib/www"/>
- <delete dir="${dist.temp.dir}/bin"/>
- <mkdir dir="${dist.temp.dir}/bin"/>
-
- <delete file="${dist.temp.dir}/samples/Chad/build.xml"/>
- <copy tofile="${dist.temp.dir}/samples/Chad/build.xml"
- file="../../samples/Chad/build-war.xml"/>
- <mkdir dir="${dist.temp.dir}/samples/Chad/images"/>
- <mkdir dir="${dist.temp.dir}/samples/Chad/js"/>
- <mkdir dir="${dist.temp.dir}/samples/Chad/css"/>
- <copy todir="${dist.temp.dir}/samples/Chad/css">
- <fileset file="${dist.dir.temp.www}/css/wso2wsas.css"/>
- </copy>
- <copy todir="${dist.temp.dir}/samples/Chad/js">
- <fileset file="${dist.dir.temp.www}/js/main.js"/>
- <fileset
- file="${dist.dir.temp.www}/js/dhtmlHistory.js"/>
- <fileset file="${dist.dir.temp.www}/js/breadcrumbs.js"/>
- </copy>
- <copy todir="${dist.temp.dir}/samples/Chad/images">
- <fileset dir="${dist.dir.temp.www}/images">
- <include name="**/*"/>
- </fileset>
- </copy>
-
- <copy todir="${dist.temp.dir}">
- <fileset file="target/wso2wsas-war.zip"/>
- </copy>
- <copy todir="${dist.temp.dir}" filtering="on">
- <fileset file="../../servlet-edition/README.txt"/>
- </copy>
- <mkdir dir="${dist.temp.dir}/conf/tomcat"/>
- <copy todir="${dist.temp.dir}/conf/tomcat">
- <fileset dir="../../servlet-edition/conf/tomcat"/>
- </copy>
- <mkdir dir="${dist.temp.dir}/conf/jboss"/>
- <copy todir="${dist.temp.dir}/conf/jboss">
- <fileset dir="../../servlet-edition/conf/jboss"/>
- </copy>
- <mkdir dir="${dist.temp.dir}/conf/geronimo"/>
- <copy todir="${dist.temp.dir}/conf/geronimo">
- <fileset dir="../../servlet-edition/conf/geronimo"/>
- </copy>-->
-
- <!-- Copy the sample default_epr.properties file -->
-
- <!--<delete failonerror="false">
- <fileset
- dir="${dist.temp.dir}/samples/CommodityQuote/conf/">
- <include name="**/**.properties"/>
- </fileset>
- </delete>
-
- <delete failonerror="false">
- <fileset dir="${dist.temp.dir}/samples/Trader/conf/">
- <include name="**/**.properties"/>
- </fileset>
- </delete>
-
- <delete failonerror="false">
- <fileset
- dir="${dist.temp.dir}/samples/JavascriptService/conf/">
- <include name="**/**.properties"/>
- </fileset>
- </delete>
-
+ <echo message="#### Copy Sample EPR properties files ###"/>
<copy tofile="${dist.temp.dir}/samples/CommodityQuote/conf/default_epr.properties"
- file="../../samples/CommodityQuote/conf/default_epr_web.properties"/>
+ overwrite="true">
+ <fileset file="../../samples/CommodityQuote/conf/default_epr_web.properties"/>
+ </copy>
<copy tofile="${dist.temp.dir}/samples/Trader/conf/default_epr.properties"
- file="../../samples/Trader/conf/default_epr_web.properties"/>
- <copy tofile="${dist.temp.dir}/samples/JavascriptService/conf/default_epr.properties"
- file="../../samples/JavascriptService/conf/default_epr_web.properties"/>
-
- <copy todir="${dist.temp.dir}/bin" filtering="on"
- overwrite="true">
- <fileset file="../../servlet-edition/bin/install.sh"/>
- <fileset file="../../servlet-edition/bin/install.bat"/>
- <fileset file="../../servlet-edition/bin/version.txt"/>
+ overwrite="true">
+ <fileset file="../../samples/Trader/conf/default_epr_web.properties"/>
</copy>
- <copy todir="${dist.temp.dir}/conf" filtering="on"
- overwrite="true">
- <fileset file="../../servlet-edition/conf/server.xml"/>
- <fileset file="../../servlet-edition/conf/axis2.xml"/>
+ <copy tofile="${dist.temp.dir}/samples/JavascriptService/conf/default_epr.properties"
+ overwrite="true">
+ <fileset file="../../samples/JavascriptService/conf/default_epr_web.properties"/>
</copy>
+ <echo message="################ END ####################"/>
<zip destfile="target/wso2wsas-servlet-edition-java-${wso2wsas.version}.zip">
- <fileset dir="${dist.dir}/temp/"/>
- </zip>-->
-
-
+ <fileset dir="${dist.temp.dir}/.."/>
+ </zip>
</tasks>
</configuration>
<goals>
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 09:26:16 2007
@@ -24,7 +24,13 @@
<includes>
<include>log4j.properties</include>
<include>ui-extensions-config.xml</include>
- <include>hibernate/wso2wsas.hbm.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../core/conf/hibernate</directory>
+ <outputDirectory>${war.temp.assembly.dir}/WEB-INF/classes</outputDirectory>
+ <includes>
+ <include>wso2wsas.hbm.xml</include>
</includes>
</fileSet>
<fileSet>
@@ -52,8 +58,6 @@
<exclude>xerces:xml-apis:jar</exclude>
<exclude>xerces:xercesImpl:jar</exclude>
<exclude>xerces:resolver:jar</exclude>
- <exclude>bouncycastle:bcprov-jdk13:jar</exclude>
- <exclude>bouncycastle:bcprov-jdk15:jar</exclude>
<exclude>org.wso2.mex:wso2mex:mar</exclude>
<exclude>org.wso2.xfer:wso2xfer:mar</exclude>
<exclude>org.wso2.statistics:wso2statistics:mar</exclude>
@@ -73,6 +77,8 @@
<exclude>org.slf4j:slf4j-log4j12:jar</exclude>
<exclude>org.apache.derby:derby:jar</exclude>
<exclude>log4j:log4j:jar</exclude>
+ <include>bouncycastle:bcprov-jdk13:jar</include>
+ <include>bouncycastle:bcprov-jdk15:jar</include>
</excludes>
</dependencySet>
</dependencySets>
More information about the Wsas-java-dev
mailing list