[wsas-java-dev] svn commit r287 - in wsas/java/trunk: .
modules/distribution modules/distribution/common/src/assemble
modules/distribution/release modules/distribution/standalone
modules/distribution/webapp modules/distribution/webapp/src
modules/distribution/webapp/src/assemble
svn at wso2.com
svn at wso2.com
Wed Dec 27 23:50:24 PST 2006
Author: saminda
Date: Wed Dec 27 23:50:22 2006
New Revision: 287
Added:
wsas/java/trunk/modules/distribution/release/
wsas/java/trunk/modules/distribution/webapp/
wsas/java/trunk/modules/distribution/webapp/pom.xml
wsas/java/trunk/modules/distribution/webapp/src/
wsas/java/trunk/modules/distribution/webapp/src/assemble/
wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml
Modified:
wsas/java/trunk/modules/distribution/common/src/assemble/dist-common-assembly.xml
wsas/java/trunk/modules/distribution/pom.xml
wsas/java/trunk/modules/distribution/standalone/pom.xml
wsas/java/trunk/pom.xml
Log:
build for standalone and release, need to fix some more and test it
Modified: wsas/java/trunk/modules/distribution/common/src/assemble/dist-common-assembly.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/common/src/assemble/dist-common-assembly.xml (original)
+++ wsas/java/trunk/modules/distribution/common/src/assemble/dist-common-assembly.xml Wed Dec 27 23:50:22 2006
@@ -4,6 +4,18 @@
<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>
+ </fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>${dist.temp.assembly.bin.dir}/lib</outputDirectory>
Modified: wsas/java/trunk/modules/distribution/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/pom.xml (original)
+++ wsas/java/trunk/modules/distribution/pom.xml Wed Dec 27 23:50:22 2006
@@ -91,6 +91,7 @@
<modules>
<module>common</module>
<module>standalone</module>
+ <module>webapp</module>
</modules>
</project>
\ No newline at end of file
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 Wed Dec 27 23:50:22 2006
@@ -35,6 +35,7 @@
<configuration>
<tasks>
<!-- Creating the distribution -->
+ <!-- TODO Copy the correct sample properties files -->
<mkdir dir="target"/>
<zip destfile="target/wso2wsas-standalone-edition-java-${wso2wsas.version}.zip">
<fileset dir="../common/target/dist/temp"/>
Added: wsas/java/trunk/modules/distribution/webapp/pom.xml
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/distribution/webapp/pom.xml Wed Dec 27 23:50:22 2006
@@ -0,0 +1,224 @@
+<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-webapp</artifactId>
+ <packaging>pom</packaging>
+ <version>1.2-SNAPSHOT</version>
+ <name>WSO2 Web Services Application Server - Distribution/Webapp</name>
+
+ <profiles>
+ <profile>
+ <id>webapp</id>
+ <activation>
+ <property>
+ <name>webapp</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-webapp-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>
+ src/assemble/dist-webapp-assembly.xml</descriptor>
+ <!--<descriptor>src/main/assembly/src.xml</descriptor>-->
+ </descriptors>
+ <finalName>webapp</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0-alpha-1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>initialize-webapp-copy</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <!-- Adminui related zips -->
+ <artifactItem>
+ <groupId>org.wso2.adminui</groupId>
+ <artifactId>wso2-adminui-zip</artifactId>
+ <version>${wso2.adminui.version}</version>
+ <type>zip</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/zips</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.wso2.adminui</groupId>
+ <artifactId>wso2-adminui-graphs-zip</artifactId>
+ <version>${wso2.adminui.version}</version>
+ <type>zip</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/zips</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-webapp</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.wso2.wsas</groupId>
+ <artifactId>wso2wsas-core</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${war.temp.dir}/WEB-INF/lib</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.wso2.wsas</groupId>
+ <artifactId>wso2wsas-admin</artifactId>
+ <version>${pom.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${war.temp.dir}/WEB-INF/lib</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>package-ant-webapp</id>
+ <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}"/>
+
+ <unzip src="target/zips/wso2-adminui-graphs-zip-${wso2.adminui.version}.zip"
+ dest="${dist.dir.temp.war.www}"/>
+
+ <copy todir="${war.temp.dir}">
+ <fileset dir="../../www">
+ <exclude name="**/.svn"/>
+ <exclude name="**/**.iml"/>
+ <exclude name="**/**.html"/>
+ <exclude name="**/**.css"/>
+ <exclude name="**/**.js"/>
+ <exclude name="**/**.xsl"/>
+ </fileset>
+ </copy>
+ <copy todir="${war.temp.dir}" filtering="on">
+ <fileset dir="../../www">
+ <include name="**/**.html"/>
+ <include name="**/**.css"/>
+ <include name="**/**.js"/>
+ <include name="**/**.xsl"/>
+ </fileset>
+ </copy>
+
+ <!--copy admin web app using ZIP-->
+ <copy todir="${war.temp.dir}">
+ <fileset dir="${dist.dir.temp.war.www}">
+ <exclude name=".svn"/>
+ <exclude name="**/**.html"/>
+ <exclude name="**/**.css"/>
+ <exclude name="**/**.xsl"/>
+ <exclude name="**/**.js"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${war.temp.dir}" filtering="on">
+ <fileset dir="${dist.dir.temp.war.www}">
+ <include name="**/**.html"/>
+ <include name="**/**.css"/>
+ <include name="**/**.xsl"/>
+ <include name="**/**.js"/>
+ </fileset>
+ </copy>
+
+ <delete dir="target/zips"/>
+ <delete dir="${dist.dir.temp.war.www}"/>
+
+ <mkdir dir="${war.temp.dir}/docs"/>
+ <copy todir="${war.temp.dir}/docs" filtering="on">
+ <fileset dir="../../../xdocs">
+ <include name="**/*"/>
+ <exclude name="**/*.ico"/>
+ <exclude name="**/*.jpg"/>
+ <exclude name="**/*.jpeg"/>
+ <exclude name="**/*.gif"/>
+ </fileset>
+ </copy>
+ <copy todir="${war.temp.dir}/docs" overwrite="true">
+ <fileset dir="../../../xdocs">
+ <include name="**/*.ico"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.jpeg"/>
+ <include name="**/*.gif"/>
+ </fileset>
+ </copy>
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>unzip-dist-webapp</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <!-- TODO Unzip -->
+ <unzip src="target/webapp-bin.zip" dest="target"/>
+ <zip destfile="wso2wsas-war.zip">
+ <fileset dir="${war.temp.dir}"/>
+ <fileset dir="target/${war.temp.assembly.dir}"/>
+ </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/webapp/src/assemble/dist-webapp-assembly.xml
==============================================================================
--- (empty file)
+++ wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml Wed Dec 27 23:50:22 2006
@@ -0,0 +1,99 @@
+<assembly>
+ <id>bin</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>../../core/bin</directory>
+ <outputDirectory>${war.temp.assembly.dir}/bin</outputDirectory>
+ <excludes>
+ <exclude>wso2wsas.sh</exclude>
+ <exclude>startup.sh</exclude>
+ <exclude>shutdown.sh</exclude>
+ <exclude>wso2wsas.bat</exclude>
+ <exclude>startup.bat</exclude>
+ <exclude>shutdown.bat</exclude>
+ <exclude>version.txt</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../../wsf-common-tools/bin</directory>
+ <outputDirectory>${war.temp.assembly.dir}/bin</outputDirectory>
+ <includes>
+ <include>chpasswd.sh</include>
+ <include>chpasswd.bat</include>
+ </includes>
+ </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>
+ <include>log4j.properties</include>
+ <include>ui-extensions-config.xml</include>
+ <include>hibernate/wso2wsas.hbm.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../servlet-edition/conf/hibernate</directory>
+ <outputDirectory>${war.temp.assembly.dir}/WEB-INF/classes</outputDirectory>
+ <includes>
+ <include>wso2wsas.hibernate.cfg.xml</include>
+ </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>
+ <include>web.xml</include>
+ <include>jboss/jboss-web.xml</include>
+ <include>geronimo/geronimo-web.xml</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>${war.temp.assembly.dir}/WEB-INF/lib</outputDirectory>
+ <excludes>
+ <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.wsf:wso2wsf-mex:mar</exclude>
+ <exclude>org.wso2.wsf:wso2wsf-statistics:mar</exclude>
+ <exclude>org.wso2.wsf:wso2wsf-throttle:mar</exclude>
+ <exclude>org.wso2.wsf:wso2wsf-tracer:mar</exclude>
+ <exclude>org.apache.axis2:addressing:mar</exclude>
+ <exclude>org.apache.axis2:rampart:mar</exclude>
+ <exclude>org.apache.axis2:rahas:mar</exclude>
+ <exclude>org.apache.sandesha2:sandesha2:mar</exclude>
+ <exclude>org.wso2.adminui:wso2-adminui-zip:zip</exclude>
+ <exclude>org.wso2.adminui:wso2-adminui-graphs-zip:zip</exclude>
+ <exclude>servletapi:servletapi:jar</exclude>
+ <exclude>jetty:jetty:jar</exclude>
+ <exclude>jetty:jetty-util:jar</exclude>
+ <exclude>jetty:servlet-api-2.5:jar</exclude>
+ <exclude>org.slf4j:slf4j-log4j12:jar</exclude>
+ <exclude>org.apache.derby:derby:jar</exclude>
+ <exclude>log4j:log4j:jar</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+
+
+</assembly>
\ No newline at end of file
Modified: wsas/java/trunk/pom.xml
==============================================================================
--- wsas/java/trunk/pom.xml (original)
+++ wsas/java/trunk/pom.xml Wed Dec 27 23:50:22 2006
@@ -704,6 +704,12 @@
<dist.dir.temp.www>target/temp_www</dist.dir.temp.www>
<dist.temp.assembly.bin.dir>temp/wso2wsas-${wso2wsas.version}</dist.temp.assembly.bin.dir>
+ <!-- properties needed for war distribution -->
+ <war.dir>target/war</war.dir>
+ <war.temp.dir>${war.dir}/temp</war.temp.dir>
+ <dist.dir.temp.war.www>target/temp_war_www</dist.dir.temp.war.www>
+ <war.temp.assembly.dir>war_zip/temp</war.temp.assembly.dir>
+
</properties>
More information about the Wsas-java-dev
mailing list