[wsas-java-dev] svn commit r309 - in wsas/java/trunk/modules/distribution: . release release/src release/src/assemble standalone webapp

svn at wso2.com svn at wso2.com
Tue Jan 2 03:54:23 PST 2007


Author: saminda
Date: Tue Jan  2 03:54:21 2007
New Revision: 309

Added:
   wsas/java/trunk/modules/distribution/release/pom.xml
   wsas/java/trunk/modules/distribution/release/src/
   wsas/java/trunk/modules/distribution/release/src/assemble/
   wsas/java/trunk/modules/distribution/release/src/assemble/src-release-assembly.xml
Modified:
   wsas/java/trunk/modules/distribution/pom.xml
   wsas/java/trunk/modules/distribution/standalone/pom.xml
   wsas/java/trunk/modules/distribution/webapp/pom.xml
Log:
added release dist/ and src dist 


Modified: wsas/java/trunk/modules/distribution/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/pom.xml	(original)
+++ wsas/java/trunk/modules/distribution/pom.xml	Tue Jan  2 03:54:21 2007
@@ -92,6 +92,7 @@
         <module>common</module>
         <module>standalone</module>
         <module>webapp</module>
+        <module>release</module>
     </modules>
 
 </project>
\ No newline at end of file

Added: wsas/java/trunk/modules/distribution/release/pom.xml
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/distribution/release/pom.xml	Tue Jan  2 03:54:21 2007
@@ -0,0 +1,76 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.wsas</groupId>
+        <artifactId>org.wso2.wsas</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wso2wsas-distribution-release</artifactId>
+    <packaging>pom</packaging>
+    <version>1.2-SNAPSHOT</version>
+    <name>WSO2 Web Services Application Server - Distribution/Release</name>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <activation>
+                <property>
+                    <name>release</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.1</version>
+                        <executions>
+                            <execution>
+                                <id>distribution-package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attached</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/assemble/src-release-assembly.xml</descriptor>
+                                    </descriptors>
+                                    <finalName>wso2wsas-java</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.1</version>
+                        <executions>
+                            <execution>
+                                <id>install</id>
+                                <phase>install</phase>
+                                <configuration>
+                                    <tasks>
+                                        <mkdir dir="target"/>
+                                        <copy todir="target/wso2wsas-standalone-edition-java-${wso2wsas.version}.zip" file="../standalone/wso2wsas-standalone-edition-java-${wso2wsas.version}.zip"/>
+                                        <copy todir="target/wso2wsas-servlet-edition-java-${wso2wsas.version}.zip" file="../wso2wsas-servlet-edition-java-${wso2wsas.version}.zip"/>
+                                    </tasks>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
\ No newline at end of file

Added: wsas/java/trunk/modules/distribution/release/src/assemble/src-release-assembly.xml
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/distribution/release/src/assemble/src-release-assembly.xml	Tue Jan  2 03:54:21 2007
@@ -0,0 +1,37 @@
+<assembly>
+    <id>src</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <fileSets>
+        <fileSet>
+            <directory>../../..</directory>
+            <outputDirectory>${dist.temp.assembly.bin.dir}</outputDirectory>
+            <includes>
+                <include>README.txt</include>
+                <include>NOTICE.txt</include>
+                <include>LICENSE.txt</include>
+                <include>release-notes.html</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>.</directory>
+            <outputDirectory>wso2wsas-src-${wso2wsas.version}</outputDirectory>
+            <includes>
+                <include>../../../admin/**</include>
+                <include>../../../core/**</include>
+                <include>../../../distribution/**</include>
+                <include>../../../integration/**</include>
+                <include>../../../samples/**</include>
+                <include>../../../servlet-edition/**</include>
+                <include>../../../www/**</include>
+                <include>../../../../pom.xml</include>
+            </includes>
+            <excludes>
+                <exclude>../../../../target/**</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</assembly>

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	Tue Jan  2 03:54:21 2007
@@ -35,7 +35,6 @@
                                 <configuration>
                                     <tasks>
                                         <!-- Creating the distribution -->
-                                        <!-- TODO Copy the correct sample properties files -->
                                         <mkdir dir="target"/>
                                         <mkdir dir="${dist.temp.dir}/samples/CommodityQuote/conf"/>
                                         <mkdir dir="${dist.temp.dir}/samples/Trader/conf"/>

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	Tue Jan  2 03:54:21 2007
@@ -121,7 +121,6 @@
                                 <phase>package</phase>
                                 <configuration>
                                     <tasks>
-                                        <!-- TODO -->
                                         <mkdir dir="${dist.dir.temp.war.www}"/>
                                         <unzip src="target/zips/wso2-adminui-zip-${wso2.adminui.version}.zip"
                                                dest="${dist.dir.temp.war.www}"/>
@@ -201,12 +200,104 @@
                                 <phase>install</phase>
                                 <configuration>
                                     <tasks>
-                                        <!-- TODO Unzip -->
                                         <unzip src="target/webapp-bin.zip" dest="target"/>
-                                        <zip destfile="wso2wsas-war.zip">
+                                        <zip destfile="target/wso2wsas-war.zip">
                                             <fileset dir="${war.temp.dir}"/>
                                             <fileset dir="target/${war.temp.assembly.dir}"/>
                                         </zip>
+
+                                        <!-- Building the distribution -->
+                                        <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"/>
+
+                                        <!-- 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"/>
+                                        <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 -->
+                                        <copy tofile="${dist.temp.dir}/samples/CommodityQuote/conf/default_epr.properties"
+                                              file="../../samples/CommodityQuote/conf/default_epr_web.properties"
+                                              overwrite="true"/>
+                                        <copy tofile="${dist.temp.dir}/samples/Trader/conf/default_epr.properties"
+                                              file="../../samples/Trader/conf/default_epr_web.properties"
+                                              overwrite="true"/>
+                                        <copy tofile="${dist.temp.dir}/samples/JavascriptService/conf/default_epr.properties"
+                                              file="../../samples/JavascriptService/conf/default_epr_web.properties"
+                                              overwrite="true"/>
+
+                                        <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"/>
+                                        </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>
+
+                                        <zip destfile="target/wso2wsas-servlet-edition-java-${wso2wsas.version}.zip">
+                                            <fileset dir="${dist.dir}/temp/"/>
+                                        </zip>
+
+
                                     </tasks>
                                 </configuration>
                                 <goals>




More information about the Wsas-java-dev mailing list