axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r777897 - in /webservices/axis2/trunk/java/modules: distribution/pom.xml distribution/src/main/assembly/bin-assembly.xml distribution/src/main/assembly/repository.xml parent/pom.xml
Date Sat, 23 May 2009 12:04:12 GMT
Author: veithen
Date: Sat May 23 12:04:12 2009
New Revision: 777897

URL: http://svn.apache.org/viewvc?rev=777897&view=rev
Log:
Some improvements to the distribution module:
* Include the JARs using Maven dependencies: the distribution now only depends on the axis2-*
artifacts directly and transitive dependencies are included automatically by Maven, so that
we don't need to maintain a separate sets of dependencies. This also has the advantage that
the distribution can be built without building the entire project first (in this case the
JARs will be downloaded from the snapshot repository).
* MARs and AARs are also declared as dependencies and the repository is built using the Maven
assembly plugin.
* Got rid of the xxx.mar.version properties introduced as a quick hack in r553898 (see also
AXIS2-4034). This is made possible by the changes in r777751.
* Build the modules.list and services.list files using a script.

Added:
    webservices/axis2/trunk/java/modules/distribution/src/main/assembly/repository.xml   (with
props)
Modified:
    webservices/axis2/trunk/java/modules/distribution/pom.xml
    webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml
    webservices/axis2/trunk/java/modules/parent/pom.xml

Modified: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?rev=777897&r1=777896&r2=777897&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Sat May 23 12:04:12 2009
@@ -41,186 +41,146 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.sun.xml.fastinfoset</groupId>
-            <artifactId>FastInfoset</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-java2wsdl</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tribes</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>juli</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-adb</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-codegen</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-adb-codegen</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-xmlbeans</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-jibx</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-json</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-spring</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>soapmonitor-servlet</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-fastinfoset</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jettison</groupId>
-            <artifactId>jettison</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-jaxbri</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-bind</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-jaxws</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-run</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-metadata</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-launcher</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-clustering</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-saaj</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.neethi</groupId>
-            <artifactId>neethi</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-ant-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>mex</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.bcel</groupId>
-            <artifactId>bcel</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-corba</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-mtompolicy</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-transport-http</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>${stax.impl.groupid}</groupId>
-            <artifactId>${stax.impl.artifact}</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-transport-local</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>soapmonitor</artifactId>
+            <version>${pom.version}</version>
+            <type>mar</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>addressing</artifactId>
+            <version>${pom.version}</version>
+            <type>mar</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>ping</artifactId>
+            <version>${pom.version}</version>
+            <type>mar</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-scripting</artifactId>
+            <version>${pom.version}</version>
+            <type>mar</type>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-saaj_1.3_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.woden</groupId>
-            <artifactId>woden-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.woden</groupId>
-            <artifactId>woden-impl-dom</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>rhino</groupId>
-            <artifactId>js</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>bsf</groupId>
-            <artifactId>bsf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jalopy</groupId>
-            <artifactId>jalopy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xml-resolver</groupId>
-            <artifactId>xml-resolver</artifactId>
-        </dependency>
-        <!-- Smack Jabber client libraries to be included -->
-        <dependency>
-            <groupId>org.igniterealtime</groupId>
-            <artifactId>smack</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.igniterealtime</groupId>
-            <artifactId>smackx</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>version</artifactId>
+            <version>${pom.version}</version>
+            <type>aar</type>
         </dependency>
     </dependencies>
     <distributionManagement>
@@ -241,6 +201,65 @@
     <build>
         <plugins>
             <plugin>
+                <!-- This builds the Axis2 repository with the modules and services -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>directory-single</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <finalName>tmp-repository</finalName>
+                            <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/main/assembly/repository.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!-- This generates the modules.list and services.list files -->
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>script-maven-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>groovy</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                                <body>
+                                    def modulesdir = new File(project.build.directory, "tmp-repository/modules");
+                                    def moduleslist = new File(modulesdir, "modules.list");
+                                    moduleslist.delete();
+                                    modulesdir.eachFile({
+                                        if (it.name.endsWith(".mar")) {
+                                            moduleslist.append("$it.name\n");
+                                        }
+                                    })
+                                    
+                                    def servicesdir = new File(project.build.directory, "tmp-repository/services");
+                                    def serviceslist = new File(servicesdir, "services.list");
+                                    serviceslist.delete();
+                                    servicesdir.eachFile({
+                                        if (it.name.endsWith(".aar")) {
+                                            serviceslist.append("$it.name\n");
+                                        }
+                                    })
+                                </body>
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
@@ -332,83 +351,6 @@
                         </goals>
                     </execution>
                     <execution>
-                        <id>service-module-list-generation</id>
-                        <phase>process-resources</phase>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="target/tmp-repository"/>
-                                <mkdir dir="target/tmp-repository/modules"/>
-                                <mkdir dir="target/tmp-repository/services"/>
-
-                                <copy file="../../modules/soapmonitor/module/target/soapmonitor-${version}.mar"
-                                      tofile="target/tmp-repository/modules/soapmonitor-${soapmonitor.mar.version}.mar"/>
-                                <copy file="../../modules/addressing/target/addressing-${version}.mar"
-                                      tofile="target/tmp-repository/modules/addressing-${addressing.mar.version}.mar"/>
-                                <copy file="../../modules/ping/target/ping-${version}.mar"
-                                      tofile="target/tmp-repository/modules/ping-${ping.mar.version}.mar"/>
-                                <copy file="../../modules/mex/target/mex-${version}.mar"
-                                      tofile="target/tmp-repository/modules/mex-${mex.mar.version}.mar"/>
-                                <copy file="../../modules/scripting/target/axis2-scripting-${version}.mar"
-                                      tofile="target/tmp-repository/modules/scripting-${scripting.mar.version}.mar"/>
-
-                                <!-- generate modules.list -->
-                                <echo file="target/tmp-repository/modules/modules.list"
append="false">
-                                    #
-                                    # Licensed to the Apache Software Foundation (ASF) under
one
-                                    # or more contributor license agreements. See the NOTICE
file
-                                    # distributed with this work for additional information
-                                    # regarding copyright ownership. The ASF licenses this
file
-                                    # to you 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.
-                                    #
-                                    soapmonitor-${soapmonitor.mar.version}.mar
-                                    addressing-${addressing.mar.version}.mar
-                                    ping-${ping.mar.version}.mar
-                                    mex-${mex.mar.version}.mar
-                                    scripting-${scripting.mar.version}.mar
-                                </echo>
-
-                                <copy file="../../modules/samples/target/toWar/services/version.aar"
-                                      todir="target/tmp-repository/services"/>
-                                <!-- generate services.list -->
-                                <echo file="target/tmp-repository/services/services.list"
append="false">
-                                    #
-                                    # Licensed to the Apache Software Foundation (ASF) under
one
-                                    # or more contributor license agreements. See the NOTICE
file
-                                    # distributed with this work for additional information
-                                    # regarding copyright ownership. The ASF licenses this
file
-                                    # to you 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.
-                                    #
-                                    version.aar
-                                </echo>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <execution>
                         <id>delete-temporary-files</id>
                         <phase>install</phase>
                         <configuration>

Modified: 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?rev=777897&r1=777896&r2=777897&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml Sat
May 23 12:04:12 2009
@@ -121,170 +121,6 @@
             </excludes>
         </fileSet>
 
-
-        <fileSet>
-            <directory>../../modules/java2wsdl/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-java2wsdl-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/kernel/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-kernel-${version}.jar</include>
-            </includes>
-        </fileSet> 
-        <fileSet>
-            <directory>../../modules/adb/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-adb-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/codegen/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-codegen-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/adb-codegen/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-adb-codegen-${version}.jar</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>../../modules/xmlbeans/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-xmlbeans-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/jibx/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-jibx-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/json/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-json-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/tool/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-tools-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/spring/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-spring-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/soapmonitor/servlet/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>soapmonitor-servlet-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/fastinfoset/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-fastinfoset-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/jaxbri/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-jaxbri-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/jaxws/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-jaxws-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/metadata/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-metadata-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/clustering/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-clustering-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/saaj/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-saaj-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/tool/axis2-ant-plugin/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-ant-plugin-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/mex/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>mex-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/corba/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-corba-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/mtompolicy/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-mtompolicy-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/transport/http/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-transport-http-${version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/transport/local/target</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>axis2-transport-local-${version}.jar</include>
-            </includes>
-        </fileSet>
-
         <fileSet>
             <directory>../../legal</directory>
             <outputDirectory>lib</outputDirectory>
@@ -361,7 +197,10 @@
     
       <dependencySets>
         <dependencySet>
-          <outputDirectory>lib</outputDirectory>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>*:*:jar</include>
+            </includes>
             <excludes>
                  <exclude>mx4j:mx4j-jmx:jar</exclude>
                  <exclude>mx4j:mx4j-impl:jar</exclude>

Added: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/repository.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/repository.xml?rev=777897&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/repository.xml (added)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/repository.xml Sat
May 23 12:04:12 2009
@@ -0,0 +1,66 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements. See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership. The ASF licenses this file
+  ~ to you 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.
+  -->
+
+<assembly>
+    <id>repository</id>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory> 
+    <dependencySets>
+        <!-- Add modules to the repository -->
+        <dependencySet>
+            <outputDirectory>modules</outputDirectory>
+            <useProjectArtifact>false</useProjectArtifact>
+            <includes>
+                <include>*:*:mar</include>
+            </includes>
+            <excludes>
+                <exclude>org.apache.axis2:axis2-scripting</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <!-- TODO: maybe we should rename the artifact from axis2-scripting to scripting???
-->
+            <outputDirectory>modules</outputDirectory>
+            <useProjectArtifact>false</useProjectArtifact>
+            <includes>
+                <include>org.apache.axis2:axis2-scripting:mar</include>
+            </includes>
+            <outputFileNameMapping>scripting-${artifact.version}.mar</outputFileNameMapping>
+        </dependencySet>
+        <dependencySet>
+            <!-- TODO: mex is not available as a mar artifact; this is obviously an issue
-->
+            <outputDirectory>modules</outputDirectory>
+            <useProjectArtifact>false</useProjectArtifact>
+            <includes>
+                <include>org.apache.axis2:mex:jar</include>
+            </includes>
+            <outputFileNameMapping>${artifact.artifactId}-${artifact.version}.mar</outputFileNameMapping>
+        </dependencySet>
+        <!-- Add services to the repository -->
+        <dependencySet>
+            <outputDirectory>services</outputDirectory>
+            <useProjectArtifact>false</useProjectArtifact>
+            <includes>
+                <include>*:*:aar</include>
+            </includes>
+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+        </dependencySet>
+    </dependencySets>
+</assembly>

Propchange: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/repository.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?rev=777897&r1=777896&r2=777897&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Sat May 23 12:04:12 2009
@@ -82,13 +82,6 @@
         -->
         <version>SNAPSHOT</version>
 
-        <!-- Version #'s for the mars that we generate -->
-        <addressing.mar.version>SNAPSHOT</addressing.mar.version>
-        <soapmonitor.mar.version>SNAPSHOT</soapmonitor.mar.version>
-        <mex.mar.version>SNAPSHOT</mex.mar.version>
-        <ping.mar.version>SNAPSHOT</ping.mar.version>
-        <scripting.mar.version>SNAPSHOT</scripting.mar.version>
-
         <ant.version>1.7.0</ant.version>
         <antlr.version>2.7.7</antlr.version>
         <axiom.version>1.2.8</axiom.version>
@@ -1166,7 +1159,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-1</version>
+                    <version>2.2-beta-3</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>



Mime
View raw message