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 sa...@apache.org on 2007/07/05 12:50:29 UTC

svn commit: r553451 [1/2] - in /webservices/axis2/trunk/java/modules: distribution/ distribution/src/main/assembly/ fastinfoset/ java2wsdl/ kernel/ parent/ tool/axis2-ant-plugin/ tool/axis2-eclipse-codegen-plugin/ tool/axis2-idea-plugin/ webapp/

Author: saminda
Date: Thu Jul  5 03:50:27 2007
New Revision: 553451

URL: http://svn.apache.org/viewvc?view=rev&rev=553451
Log:
Fixing the poms for build. Cleaning up the poms 

Added:
    webservices/axis2/trunk/java/modules/distribution/distribution.iml
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/fastinfoset/pom.xml
    webservices/axis2/trunk/java/modules/java2wsdl/pom.xml
    webservices/axis2/trunk/java/modules/kernel/pom.xml
    webservices/axis2/trunk/java/modules/parent/pom.xml
    webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml
    webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
    webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml
    webservices/axis2/trunk/java/modules/webapp/pom.xml

Added: webservices/axis2/trunk/java/modules/distribution/distribution.iml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/distribution.iml?view=auto&rev=553451
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/distribution.iml (added)
+++ webservices/axis2/trunk/java/modules/distribution/distribution.iml Thu Jul  5 03:50:27 2007
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntryProperties />
+  </component>
+  <component name="copyright">
+    <Base>
+      <setting name="state" value="2" />
+    </Base>
+    <LanguageOptions name="$TEMPLATE$">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="4" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="CSS">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="2" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="HTML">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="2" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="JAVA">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="2" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="JSP">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="2" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="JavaScript">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="2" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="Properties">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="2" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="XML">
+      <option name="templateOptions">
+        <value>
+          <option name="block" value="true" />
+          <option name="separateBefore" value="false" />
+          <option name="separateAfter" value="false" />
+          <option name="prefixLines" value="true" />
+          <option name="lenBefore" value="80" />
+          <option name="lenAfter" value="80" />
+          <option name="box" value="false" />
+          <option name="filler" value=" " />
+        </value>
+      </option>
+      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
+      <option name="keyword" value="Copyright" />
+      <option name="fileTypeOverride" value="2" />
+      <option name="relativeBefore" value="true" />
+      <option name="addBlankAfter" value="true" />
+      <option name="fileLocation" value="1" />
+      <option name="useAlternate" value="false" />
+    </LanguageOptions>
+  </component>
+</module>
+

Modified: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?view=diff&rev=553451&r1=553450&r2=553451
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Thu Jul  5 03:50:27 2007
@@ -15,14 +15,14 @@
   -->
 
 <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">
+        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>axis2-parent</artifactId>
+        <version>SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.axis2</groupId>
@@ -32,494 +32,283 @@
     <packaging>pom</packaging>
 
 
+    <dependencies>
+        <dependency>
+            <groupId>com.sun.xml.fastinfoset</groupId>
+            <artifactId>FastInfoset</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tribes</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>juli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jettison</groupId>
+            <artifactId>jettison</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jibx</groupId>
+            <artifactId>jibx-bind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jibx</groupId>
+            <artifactId>jibx-run</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant-launcher</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-dom</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.schema</groupId>
+            <artifactId>XmlSchema</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.bcel</groupId>
+            <artifactId>bcel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${stax.impl.groupid}</groupId>
+            <artifactId>${stax.impl.artifactid}</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>annogen</groupId>
+            <artifactId>annogen</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore-nio</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore-niossl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.woden</groupId>
+            <artifactId>woden</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.jaxme</groupId>
+            <artifactId>jaxme2</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>org.apache.activemq</groupId>
+            <artifactId>apache-activemq</artifactId>
+        </dependency>
+    </dependencies>
+
     <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-${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>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-1</version>
+                <executions>
                     <execution>
-                        <id>package-copy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
+                        <id>distribution-package</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>single</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>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>4.0-alpha5</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>target/bin/external-dependencies</outputDirectory>
-                                </artifactItem>
-
-                                <artifactItem>
-			            <groupId>javax.mail</groupId>
-            			    <artifactId>mail</artifactId>
-			            <version>1.4</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>target/bin/external-dependencies</outputDirectory>
-                                </artifactItem>
-
-                                <artifactItem>
-			            <groupId>javax.activation</groupId>
-			            <artifactId>activation</artifactId>
-			            <version>1.1</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>woodstox</groupId>
-                                     <artifactId>wstx-asl</artifactId>
-                                     <version>${stax.impl.version}</version>
-                                     <type>jar</type>
-                                     <overWrite>true</overWrite>
-                                     <outputDirectory>target/bin/external-dependencies</outputDirectory>
-                                </artifactItem>
-
-
-
-
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
+                        <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>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
-    </plugins>
+        </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>
+    <!--<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>

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?view=diff&rev=553451&r1=553450&r2=553451
==============================================================================
--- 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 Thu Jul  5 03:50:27 2007
@@ -7,22 +7,7 @@
     </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>
@@ -83,9 +68,8 @@
         </fileSet>
 
 
-
         <!-- copy the build.xml into webapp directory -->
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/webapp/scripts</directory>
             <outputDirectory>axis2-bin/webapp</outputDirectory>
             <includes>
@@ -95,7 +79,7 @@
 
 
         <!-- copy *.properties to webapp/WEB-INF/classes directory -->
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/kernel/conf</directory>
             <outputDirectory>axis2-bin/webapp/WEB-INF/classes</outputDirectory>
             <includes>
@@ -105,60 +89,60 @@
 
 
         <!-- copy contents of the webapp module -->
-       	<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>
+            <excludes>
+                <exclude>project.xml</exclude>
+                <exclude>**/*.iml</exclude>
+                <exclude>**/.*</exclude>
+                <exclude>**/conf/**</exclude>
+                <exclude>**/scripts/**</exclude>
+            </excludes>
         </fileSet>
 
-       	<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>
+            <excludes>
+                <exclude>project.xml</exclude>
+                <exclude>**/*.iml</exclude>
+                <exclude>**/.*</exclude>
+                <exclude>**/conf/**</exclude>
+                <exclude>**/scripts/**</exclude>
+            </excludes>
         </fileSet>
 
 
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/java2wsdl/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-java2wsdl-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/kernel/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-kernel-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/adb/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-adb-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/codegen/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-codegen-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/adb-codegen/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
@@ -166,99 +150,99 @@
             </includes>
         </fileSet>
 
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/xmlbeans/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-xmlbeans-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/jibx/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-jibx-${version}.jar</include>
             </includes>
         </fileSet>
-       	<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>
+        <!-- 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>
+        <fileSet>
             <directory>../../modules/spring/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-spring-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/soapmonitor/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-soapmonitor-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/fastinfoset/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-fastinfoset-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/jaxbri/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-jaxbri-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/jaxws/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-jaxws-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/jaxws-api/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-jaxws-api-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/metadata/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-metadata-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/saaj/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-saaj-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/saaj-api/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
                 <include>axis2-saaj-api-${version}.jar</include>
             </includes>
         </fileSet>
-       	<fileSet>
+        <fileSet>
             <directory>../../modules/xmlbeans/target</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
@@ -266,8 +250,8 @@
             </includes>
         </fileSet>
 
-	<!-- copy externel dependency libraries -->
-       	<fileSet>
+        <!-- copy externel dependency libraries -->
+        <fileSet>
             <directory>../../modules/distribution/target/bin/external-dependencies</directory>
             <outputDirectory>axis2-bin/lib</outputDirectory>
             <includes>
@@ -275,8 +259,8 @@
             </includes>
         </fileSet>
 
-	<!-- copy samples -->
-       	<fileSet>
+        <!-- copy samples -->
+        <fileSet>
             <directory>../../modules/samples</directory>
             <outputDirectory>axis2-bin/samples</outputDirectory>
             <includes>
@@ -284,61 +268,17 @@
             </includes>
         </fileSet>
     </fileSets>
-<!--
- Following is not working for dependencies in modules
-  <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>
--->
+    
+      <dependencySets>
+        <dependencySet>
+          <outputDirectory>axis2-bin/lib</outputDirectory>
+          <includes>
+              <include>*:jar:*</include>
+           </includes>
+            <!--TODO exclude the stuff if necessary-->
+            <!--<excludes>
+                <exclude></exclude>
+            </excludes>-->
+        </dependencySet>
+      </dependencySets>
 </assembly>

Modified: webservices/axis2/trunk/java/modules/fastinfoset/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/pom.xml?view=diff&rev=553451&r1=553450&r2=553451
==============================================================================
--- webservices/axis2/trunk/java/modules/fastinfoset/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/fastinfoset/pom.xml Thu Jul  5 03:50:27 2007
@@ -39,10 +39,6 @@
 			<artifactId>FastInfoset</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>stax</groupId>
-			<artifactId>stax-api</artifactId>
-		</dependency>
-		<dependency>
 			<groupId>org.apache.ws.commons.axiom</groupId>
 			<artifactId>axiom-api</artifactId>
 		</dependency>

Modified: webservices/axis2/trunk/java/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/pom.xml?view=diff&rev=553451&r1=553450&r2=553451
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/pom.xml Thu Jul  5 03:50:27 2007
@@ -55,10 +55,7 @@
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>stax</groupId>
-			<artifactId>stax-api</artifactId>
-		</dependency>
+
 		<!--added this to support to keep WSDL information in AxisService-->
 		<dependency>
 			<groupId>org.apache.ws.commons.schema</groupId>

Modified: webservices/axis2/trunk/java/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/pom.xml?view=diff&rev=553451&r1=553450&r2=553451
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/pom.xml Thu Jul  5 03:50:27 2007
@@ -57,11 +57,7 @@
 			<groupId>backport-util-concurrent</groupId>
 			<artifactId>backport-util-concurrent</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>${stax.api.version}</version>
-        </dependency>
+
 		<dependency>
 			<groupId>${stax.impl.groupid}</groupId>
 			<artifactId>${stax.impl.artifactid}</artifactId>
@@ -95,18 +91,6 @@
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jms_1.1_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ws.commons.axiom</groupId>
-			<artifactId>axiom-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ws.commons.axiom</groupId>
-			<artifactId>axiom-impl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ws.commons.axiom</groupId>
-			<artifactId>axiom-dom</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org