You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by su...@apache.org on 2007/07/05 07:04:19 UTC
svn commit: r553373 - in /webservices/axis2/trunk/java: ./ etc/
modules/distribution/ modules/distribution/src/
modules/distribution/src/main/ modules/distribution/src/main/assembly/
Author: sumedha
Date: Wed Jul 4 22:04:18 2007
New Revision: 553373
URL: http://svn.apache.org/viewvc?view=rev&rev=553373
Log:
configuration changes for creating bin,src,war distributions using maven2
Added:
webservices/axis2/trunk/java/modules/distribution/
webservices/axis2/trunk/java/modules/distribution/pom.xml (with props)
webservices/axis2/trunk/java/modules/distribution/src/
webservices/axis2/trunk/java/modules/distribution/src/main/
webservices/axis2/trunk/java/modules/distribution/src/main/assembly/
webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml (with props)
webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml (with props)
webservices/axis2/trunk/java/modules/distribution/src/main/assembly/war-assembly.xml (with props)
Removed:
webservices/axis2/trunk/java/etc/maven2-src-assembly.xml
Modified:
webservices/axis2/trunk/java/pom.xml
Added: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?view=auto&rev=553373
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Wed Jul 4 22:04:18 2007
@@ -0,0 +1,430 @@
+<!--
+ ~ Copyright (c) 2006, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>distribution</artifactId>
+ <name>Apache Axis 2.0 - Distribution</name>
+ <description>Apache Axis2 Distribution</description>
+ <packaging>pom</packaging>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>install</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-assembly.xml</descriptor>
+ <descriptor>src/main/assembly/src-assembly.xml</descriptor>
+ <descriptor>src/main/assembly/war-assembly.xml</descriptor>
+ </descriptors>
+ <finalName>axis2-bin-${version}</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0-alpha-1-SNAPSHOT</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>package-copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+
+ <artifactItem>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>${backport.util.concurrent.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons.codec.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${commons.fileupload.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons.httpclient.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo.spec.jms.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+<!--
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>jakarta-httpcore</artifactId>
+ <version>${jakarta.httpcore.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+-->
+ <artifactItem>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.api.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxbri.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxbri.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>${jettison.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>${jaxen.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>jibx</groupId>
+ <artifactId>jibx-bind</artifactId>
+ <version>${jibx.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ <version>${jibx.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>${geronimo.spec.javamail.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${neethi.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet.api.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax.api.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ <version>${woden.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>${xalan.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>${xbean.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${xmlschema.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml_apis.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+
+ <artifactItem>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>${annogen.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${axiom.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+ <dependency>
+ </dependency>
+
+
+
+
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>java15</id>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <tasks>
+ <copy toDir="target/bin/jdk1.5-modules">
+ <fileset file="../../modules/jaxbri/target/axis2-jaxbri-${version}.jar"/>
+ </copy>
+ <copy toDir="target/bin/jdk1.5-modules">
+ <fileset file="../../modules/metadata/target/axis2-metadata-${version}.jar"/>
+ </copy>
+ <copy toDir="target/bin/jdk1.5-modules">
+ <fileset file="../../modules/jaxws/target/axis2-jaxws-${version}.jar"/>
+ </copy>
+ <copy toDir="target/bin/jdk1.5-modules">
+ <fileset file="../../modules/jaxws-api/target/axis2-jaxws-api-${version}.jar"/>
+ </copy>
+ <copy toDir="target/bin/jdk1.5-modules">
+ <fileset file="../../modules/saaj-api/target/axis2-saaj-api-${version}.jar"/>
+ </copy>
+ <copy toDir="target/bin/jdk1.5-modules">
+ <fileset file="../../modules/saaj/target/axis2-saaj-${version}.jar"/>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ </profile>
+ </profiles>
+</project>
Propchange: webservices/axis2/trunk/java/modules/distribution/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Added: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml?view=auto&rev=553373
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml (added)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml Wed Jul 4 22:04:18 2007
@@ -0,0 +1,343 @@
+<assembly>
+ <id>bin</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+
+
+
+
+
+
+ <fileSets>
+<!--
+ <echo file="${std.bin.temp.dir}/repository/modules/modules.list" append="false">
+ addressing-${addressing_version}.mar
+ soapmonitor-${soapmonitor_version}.mar
+ </echo>
+ copy the sample services
+ <echo file="${std.bin.temp.dir}/repository/services/services.list" append="false">
+ version.aar
+ </echo>
+-->
+ <!--********************** creating the repository ********************** -->
+ <!-- copy the soapmonitor mar -->
+ <fileSet>
+ <directory>../../modules/soapmonitor/target</directory>
+ <outputDirectory>axis2-bin/repository/modules</outputDirectory>
+ <includes>
+ <include>soapmonitor-${version}.mar</include>
+ </includes>
+ </fileSet>
+ <!-- copy the addressing mar -->
+ <fileSet>
+ <directory>../../modules/addressing/target</directory>
+ <outputDirectory>axis2-bin/repository/modules</outputDirectory>
+ <includes>
+ <include>addressing-${version}.mar</include>
+ </includes>
+ </fileSet>
+
+ <!-- copy the sample services -->
+ <fileSet>
+ <directory>../../modules/samples/target/toWar/services</directory>
+ <outputDirectory>axis2-bin/repository/services</outputDirectory>
+ <includes>
+ <include>version.aar</include>
+ </includes>
+ </fileSet>
+
+ <!--********************** creating the bin ********************** -->
+ <!-- Copy bin scripts -->
+ <fileSet>
+ <directory>../../modules/tool/script</directory>
+ <outputDirectory>axis2-bin/bin</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+
+
+ <!--********************** creating the conf ********************** -->
+ <!-- copy the axis2.xml into conf directoy -->
+ <fileSet>
+ <directory>../../modules/kernel/conf</directory>
+ <outputDirectory>axis2-bin/conf</outputDirectory>
+ <includes>
+ <include>axis2.xml</include>
+ </includes>
+ </fileSet>
+
+ <!--********************** creating the webappp ********************** -->
+ <!-- copy the web.xml into webapp/WEB-INF directory -->
+
+ <fileSet>
+ <directory>../../modules/webapp/conf</directory>
+ <outputDirectory>axis2-bin/webapp/WEB-INF</outputDirectory>
+ <includes>
+ <include>web.xml</include>
+ </includes>
+ </fileSet>
+
+
+
+ <!-- copy the build.xml into webapp directory -->
+ <fileSet>
+ <directory>../../modules/webapp/scripts</directory>
+ <outputDirectory>axis2-bin/webapp</outputDirectory>
+ <includes>
+ <include>build.xml</include>
+ </includes>
+ </fileSet>
+
+
+ <!-- copy *.properties to webapp/WEB-INF/classes directory -->
+ <fileSet>
+ <directory>../../modules/kernel/conf</directory>
+ <outputDirectory>axis2-bin/webapp/WEB-INF/classes</outputDirectory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </fileSet>
+
+
+ <!-- copy contents of the webapp module -->
+ <fileSet>
+ <directory>../../modules/webapp/src/main/webapp</directory>
+ <outputDirectory>axis2-bin/webapp</outputDirectory>
+ <excludes>
+ <exclude>project.xml</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/conf/**</exclude>
+ <exclude>**/scripts/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../../modules/webapp/src/main/webapp</directory>
+ <outputDirectory>axis2-bin/webapp</outputDirectory>
+ <excludes>
+ <exclude>project.xml</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/conf/**</exclude>
+ <exclude>**/scripts/**</exclude>
+ </excludes>
+ </fileSet>
+
+
+ <fileSet>
+ <directory>../../modules/java2wsdl/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-java2wsdl-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/kernel/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-kernel-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/adb/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-adb-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/codegen/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-codegen-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/adb-codegen/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-adb-codegen-${version}.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../../modules/xmlbeans/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-xmlbeans-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/jibx/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-jibx-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/json/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-json-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <!-- TODO jar is not being generated -->
+ <fileSet>
+ <directory>../../modules/tools/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-tools-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/spring/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-spring-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/soapmonitor/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-soapmonitor-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/fastinfoset/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-fastinfoset-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/jaxbri/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-jaxbri-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/jaxws/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-jaxws-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/jaxws-api/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-jaxws-api-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/metadata/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-metadata-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/saaj/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-saaj-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/saaj-api/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-saaj-api-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/xmlbeans/target</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>axis2-xmlbeans-${version}.jar</include>
+ </includes>
+ </fileSet>
+
+ <!-- copy externel dependency libraries -->
+ <fileSet>
+ <directory>../../modules/distribution/target/bin/external-dependencies</directory>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+
+ <!-- copy samples -->
+ <fileSet>
+ <directory>../../modules/samples</directory>
+ <outputDirectory>axis2-bin/samples</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+<!--
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.apache.axis2:axis2-json</include>
+ </includes>
+ <binaries>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <includes>
+ <include>org.codehaus.jettison:jettison:jar</include>
+ </includes>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+-->
+<!--
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>axis2-bin/lib</outputDirectory>
+ <scope>compile</scope>
+ <includes>
+ <include>backport-util-concurrent:backport-util-concurrent:jar</include>
+ <include>commons-codec:commons-codec:jar</include>
+ <include>commons-fileupload:commons-fileupload:jar</include>
+ <include>commons-httpclient:commons-httpclient:jar</include>
+ <include>commons-io:commons-io:jar</include>
+ <include>commons-logging:commons-logging:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar</include>
+ <include>org.apache.httpcomponents:jakarta-httpcore:jar</include>
+ <include>javax.xml.bind:jaxb-api:jar</include>
+ <include>com.sun.xml.bind:jaxb-impl:jar</include>
+ <include>com.sun.xml.bind:jaxb-xjc:jar</include>
+
+ <include>org.codehaus.jettison:jettison:jar</include>
+
+ <include>jaxen:jaxen:jar</include>
+ <include>jibx:jibx-bind:jar</include>
+ <include>jibx:jibx-run:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar</include>
+ <include>org.apache.neethi:neethi:jar</include>
+ <include>javax.servlet:servlet-api:jar</include>
+ <include>stax:stax-api:jar</include>
+ <include>stax-utils:stax-utils:jar</include>
+ <include>org.apache.woden:woden:jar</include>
+ <include>wsdl4j:wsdl4j:jar</include>
+ <include>xalan:xalan:jar</include>
+ <include>xmlbeans:xbean:jar</include>
+ TODO missing wstx-asl,xercesimpl
+ <include>org.apache.ws.commons.schema:XmlSchema:jar</include>
+ <include>xml-apis:xml-apis:jar</include>
+
+ </includes>
+ </dependencySet>
+ </dependencySets>
+-->
+</assembly>
Propchange: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml
------------------------------------------------------------------------------
svn:executable = *
Added: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml?view=auto&rev=553373
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml (added)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml Wed Jul 4 22:04:18 2007
@@ -0,0 +1,107 @@
+<assembly>
+ <id>src</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <!-- <format>tar.gz</format> -->
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory>axis2-${version}-src</outputDirectory>
+ <includes>
+ <include>../../etc/**</include>
+ <include>modules/adb/**</include>
+ <include>modules/adb-codegen/**</include>
+ <include>modules/addressing/**</include>
+ <include>modules/clustering/**</include>
+ <include>modules/codegen/**</include>
+ <include>modules/fastinfoset/**</include>
+ <include>modules/integration/**</include>
+ <include>modules/java2wsdl/**</include>
+ <include>modules/jaxbri/**</include>
+ <include>modules/jaxws/**</include>
+ <include>modules/jaxws-api/**</include>
+ <include>modules/jibx/**</include>
+ <include>modules/json/**</include>
+ <include>modules/jws-api/**</include>
+ <include>modules/kernel/**</include>
+ <include>modules/metadata/**</include>
+ <include>modules/mex/**</include>
+ <include>modules/mex-mar/**</include>
+ <include>modules/mtompolicy/**</include>
+ <include>modules/ping/**</include>
+ <include>modules/saaj/**</include>
+ <include>modules/saaj-api/**</include>
+ <include>modules/samples/**</include>
+ <include>modules/scripting/**</include>
+ <include>modules/soapmonitor/**</include>
+ <include>modules/spring/**</include>
+ <include>modules/tool/**</include>
+ <include>modules/webapp/**</include>
+ <include>modules/xmlbeans/**</include>
+ </includes>
+
+ <excludes>
+ <exclude>../../SameServiceAddingTest.java</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>../../modules/samples/eventing/**</exclude>
+ <exclude>../../modules/samples/security/**</exclude>
+ <exclude>xdocs/**</exclude>
+ <!--
+ <exclude>**/*class*/**</exclude>
+ Above prevents following class being copied.
+ /modules/kernel/src/org/apache/axis2/classloader/MultiParentClassLoader.java
+ -->
+ <exclude>**/.svn/**</exclude>
+ <exclude>**/bin/**</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/*.license</exclude>
+ <exclude>**/*.iml</exclude>
+ </excludes>
+
+ </fileSet>
+
+
+ <!-- TODO : (start) copy following files with filtering on -->
+ <fileSet>
+ <directory>../../etc</directory>
+ <outputDirectory>axis2-${version}-src/etc</outputDirectory>
+ <includes>
+ <include>project.properties</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory>axis2-${version}-src</outputDirectory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+ <!-- TODO : Copy the release documents -->
+
+ <!-- TODO : (end) copy following files with filtering on -->
+
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory>axis2-${version}-src</outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory>axis2-${version}-src</outputDirectory>
+ <includes>
+ <include>project.xml</include>
+ <include>maven.xml</include>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+</assembly>
Propchange: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml
------------------------------------------------------------------------------
svn:executable = *
Added: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/war-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/war-assembly.xml?view=auto&rev=553373
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/war-assembly.xml (added)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/war-assembly.xml Wed Jul 4 22:04:18 2007
@@ -0,0 +1,244 @@
+<assembly>
+ <id>bin</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>war</format>
+ </formats>
+
+ <fileSets>
+ <!-- Copy the java2wsdl jar -->
+ <fileSet>
+ <directory>../../modules/java2wsdl/target</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>axis2-java2wsdl-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <!-- Copy the kernel jar -->
+ <fileSet>
+ <directory>../../modules/kernel/target</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>axis2-kernel-${version}.jar</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy the adb jar -->
+ <fileSet>
+ <directory>../../modules/adb/target</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>axis2-adb-${version}.jar</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy the adb codegen jar -->
+ <fileSet>
+ <directory>../../modules/adb-codegen/target</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>axis2-adb-codegenkernel-${version}.jar</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy the json jar -->
+ <fileSet>
+ <directory>../../modules/json/target</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>axis2-json-${version}.jar</include>
+ </includes>
+ </fileSet>
+
+
+ <!-- Copy the codegen jar -->
+ <fileSet>
+ <directory>../../modules/codegen/target</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>axis2-codegen-${version}.jar</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy the xmlbeans jar -->
+ <fileSet>
+ <directory>../../modules/xmlbeans/target</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>axis2-xmlbeans-${version}.jar</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy the spring jar -->
+ <fileSet>
+ <directory>../../modules/spring/target</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>axis2-spring-${version}.jar</include>
+ </includes>
+ </fileSet>
+
+
+ <!-- Copy the jibx jar -->
+ <fileSet>
+ <directory>../../modules/jibx/target</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>axis2-jibx-${version}.jar</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy the fastinfoset jar -->
+ <fileSet>
+ <directory>../../modules/fastinfoset/target</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>axis2-fastinfoset-${version}.jar</include>
+ </includes>
+ </fileSet>
+
+ <!-- copy jdk 1.5 dependent modules -->
+ <fileSet>
+ <directory>target/bin/jdk1.5-modules</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+
+ <!-- copy externel dependencies -->
+ <fileSet>
+ <directory>target/bin/external-dependencies</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>servlet-api*.jar</exclude>
+ <exclude>jibx-bind*.jar</exclude>
+ <exclude>jettison*.jar</exclude>
+ <exclude>jaxb*.jar</exclude>
+ <exclude>jakarta-httpcore*.jar</exclude>
+ <exclude>geronimo*.jar</exclude>
+ </excludes>
+ </fileSet>
+
+
+
+
+ <fileSet>
+ <directory>../../modules/addressing/target</directory>
+ <outputDirectory>WEB-INF/modules</outputDirectory>
+ <includes>
+ <include>addressing-${version}.mar</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy the soapmonitor jar - the servlet classes -->
+ <fileSet>
+ <directory>../../modules/soapmonitor/target</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>axis2-soapmonitor-${version}.jar</include>
+ </includes>
+ </fileSet>
+
+
+ <!-- copy the soapmonitor mar -->
+ <fileSet>
+ <directory>../../modules/soapmonitor/target</directory>
+ <outputDirectory>WEB-INF/modules</outputDirectory>
+ <includes>
+ <include>soapmonitor-${version}.mar</include>
+ </includes>
+ </fileSet>
+
+ <!-- copy the addressing mar -->
+
+ <fileSet>
+ <directory>../../modules/addressing/target</directory>
+ <outputDirectory>WEB-INF/modules</outputDirectory>
+ <includes>
+ <include>addressing-${version}.mar</include>
+ </includes>
+ </fileSet>
+
+<!-- TODO -->
+ <echo file="target/temp/war/toWEB-INF/modules/modules.list" append="false">
+ addressing-${addressing_version}.mar
+ soapmonitor-${soapmonitor_version}.mar
+ </echo>
+<!-- end TODO -->
+
+ <!-- copy the sample services -->
+ <fileSet>
+ <directory>../../modules/samples/target/toWar/services</directory>
+ <outputDirectory>WEB-INF/services</outputDirectory>
+ <includes>
+ <include>version.aar</include>
+ </includes>
+ </fileSet>
+
+
+<!-- TODO -->
+ <echo file="target/temp/war/toWEB-INF/services/services.list" append="false">version.aar
+ </echo>
+<!-- end TODO -->
+
+ <!-- copy the axis2.xml into conf directoy -->
+ <fileSet>
+ <directory>../../modules/kernel/conf</directory>
+ <outputDirectory>WEB-INF/conf</outputDirectory>
+ <includes>
+ <include>axis2.xml</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../../modules/webapp/src/main/webapp/axis2-web</directory>
+ <outputDirectory>axis2-web</outputDirectory>
+ <excludes>
+ <exclude>project.xml</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/conf/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- copy web.xml -->
+ <fileSet>
+ <directory>../../modules/webapp/conf</directory>
+ <outputDirectory>WEB-INF</outputDirectory>
+ <includes>
+ <include>web.xml</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../../modules/kernel/conf</directory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </fileSet>
+
+ <!--copy the license files -->
+ <fileSet>
+ <directory>../../legal/war</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../legal/std</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+
+
+</assembly>
Propchange: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/war-assembly.xml
------------------------------------------------------------------------------
svn:executable = *
Modified: webservices/axis2/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/pom.xml?view=diff&rev=553373&r1=553372&r2=553373
==============================================================================
--- webservices/axis2/trunk/java/pom.xml (original)
+++ webservices/axis2/trunk/java/pom.xml Wed Jul 4 22:04:18 2007
@@ -34,8 +34,8 @@
<module>modules/adb-codegen</module>
<module>modules/addressing</module>
<module>modules/codegen</module>
- <module>modules/fastinfoset</module>
- <module>modules/integration</module>
+ <module>modules/fastinfoset</module>
+ <module>modules/integration</module>
<module>modules/java2wsdl</module>
<module>modules/jibx</module>
<module>modules/json</module>
@@ -57,7 +57,8 @@
<module>modules/tool/axis2-mar-maven-plugin</module>
<module>modules/tool/axis2-wsdl2code-maven-plugin</module>
<module>modules/webapp</module>
- <module>modules/xmlbeans</module>
+ <module>modules/xmlbeans</module>
+ <module>modules/distribution</module>
</modules>
<profiles>
<profile>
@@ -177,33 +178,6 @@
</execution>
</executions>
</plugin>
- <!--
- Distribution Packaging for maven2 is still in preliminarily stage.
- Please uncomment following section, if you are interested to see
- the current status.
- -->
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <id>distribution-package</id>
- <phase>install</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>etc/maven2-src-assembly.xml</descriptor>
- </descriptors>
- <finalName>axis2-${version}</finalName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
</plugins>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org