You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2006/04/08 11:08:05 UTC
svn commit: r392498 - in /webservices/axis2/trunk/java: maven.xml
modules/codegen/project.xml modules/tool/project.xml
Author: chinthaka
Date: Sat Apr 8 02:08:02 2006
New Revision: 392498
URL: http://svn.apache.org/viewcvs?rev=392498&view=rev
Log:
First step in removing wsdl package from Axis2. Removed dependencies on that.
Modified:
webservices/axis2/trunk/java/maven.xml
webservices/axis2/trunk/java/modules/codegen/project.xml
webservices/axis2/trunk/java/modules/tool/project.xml
Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/maven.xml?rev=392498&r1=392497&r2=392498&view=diff
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Sat Apr 8 02:08:02 2006
@@ -338,7 +338,6 @@
<fileset dir="modules/core/target/classes"/>
<!-- adding the tool classes. This is needed to get the ant task -->
<fileset dir="modules/tool/target/classes"/>
- <fileset dir="modules/wsdl/target/classes"/>
<fileset dir="modules/saaj/target/classes"/>
<fileset dir="modules/common/target/classes"/>
<fileset dir="modules/addressing/target/classes"/>
@@ -361,7 +360,6 @@
<fileset dir="modules/java2wsdl/target/classes"/>
<fileset dir="modules/core/target/classes/"/>
<fileset dir="modules/common/target/classes/"/>
- <fileset dir="modules/wsdl/target/classes/"/>
</jar>
</goal>
@@ -381,7 +379,6 @@
<fileset dir="modules/java2wsdl/target/classes"/>
<fileset dir="modules/core/target/classes/"/>
<fileset dir="modules/common/target/classes/"/>
- <fileset dir="modules/wsdl/target/classes/"/>
</jar>
<!-- Copy the adb jar -->
@@ -512,7 +509,6 @@
<fileset dir="modules/java2wsdl/target/classes"/>
<fileset dir="modules/core/target/classes/"/>
<fileset dir="modules/common/target/classes/"/>
- <fileset dir="modules/wsdl/target/classes/"/>
</jar>
<!-- Copy the adb jar -->
@@ -544,7 +540,6 @@
<ant:include name="**/modules/java2wsdl/**"/>
<ant:include name="**/modules/core/**"/>
<ant:include name="**/modules/common/**"/>
- <ant:include name="**/modules/wsdl/**"/>
<ant:include name="**/modules/adb/**"/>
<ant:exclude name="**/SameServiceAddingTest.java"/>
<!-- TODO: This is failing in the distros. Must Fix it. -->
@@ -613,12 +608,11 @@
</fileset>
</ant:delete>
- <!-- Create axis2-core.jar -->
+ <!-- Create axis2-kernel.jar -->
<jar destfile="${std.bin.temp.dir}/lib/axis2-kernel-${pom.currentVersion}.jar">
<fileset dir="modules/java2wsdl/target/classes/"/>
<fileset dir="modules/core/target/classes/"/>
<fileset dir="modules/common/target/classes/"/>
- <fileset dir="modules/wsdl/target/classes/"/>
</jar>
<ant:copy toDir="${std.bin.temp.dir}/lib">
@@ -673,7 +667,6 @@
<ant:include name="**/modules/java2wsdl/**"/>
<ant:include name="**/modules/core/**"/>
<ant:include name="**/modules/common/**"/>
- <ant:include name="**/modules/wsdl/**"/>
<ant:include name="**/modules/adb/**"/>
<ant:include name="**/modules/codegen/**"/>
<ant:include name="**/modules/webapp/**"/>
@@ -757,7 +750,7 @@
<ant:mkdir dir="${min_dep_cache}"/>
<j:if test="${minDeps.uptodate != 'yes'}">
<macros:copy-deps copyToDir="${min_dep_cache}"
- mods="core,common,wsdl,adb,java2wsdl"/>
+ mods="core,common,adb,java2wsdl"/>
<property name="minDeps.uptodate" value="yes"/>
</j:if>
</goal>
@@ -808,7 +801,6 @@
<ant:pathelement location="modules/saaj/src"/>
<ant:pathelement location="modules/security/src"/>
<ant:pathelement location="modules/tool/src"/>
- <ant:pathelement location="modules/wsdl/src"/>
</ant:sourcepath>
<ant:classpath>
<ant:fileset dir="target/lib">
@@ -885,11 +877,9 @@
<fileset dir="modules/java2wsdl/target/classes/"/>
<fileset dir="modules/core/target/classes/"/>
<fileset dir="modules/common/target/classes/"/>
- <fileset dir="modules/wsdl/target/classes/"/>
</jar>
<ant:copy toDir="${destdir}">
- <ant:fileset file="modules/wsdl/target/axis2-wsdl-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/core/target/axis2-core-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/common/target/axis2-common-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/adb/target/axis2-adb-${pom.currentVersion}.jar"/>
Modified: webservices/axis2/trunk/java/modules/codegen/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/project.xml?rev=392498&r1=392497&r2=392498&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/project.xml (original)
+++ webservices/axis2/trunk/java/modules/codegen/project.xml Sat Apr 8 02:08:02 2006
@@ -53,11 +53,6 @@
</dependency>
<dependency>
<groupId>axis2</groupId>
- <artifactId>axis2-wsdl</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
<artifactId>axis2-adb</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Modified: webservices/axis2/trunk/java/modules/tool/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/project.xml?rev=392498&r1=392497&r2=392498&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/project.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/project.xml Sat Apr 8 02:08:02 2006
@@ -41,14 +41,8 @@
<artifactId>axis2-common</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-wsdl</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
-
- <dependency>
+ <dependency>
<groupId>axis2</groupId>
<artifactId>axis2-codegen</artifactId>
<version>${pom.currentVersion}</version>