axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r431570 - in /webservices/axis2/trunk/java: ./ modules/adb-codegen/ modules/adb/ modules/addressing/ modules/codegen/ modules/common/ modules/core/ modules/core/src/org/apache/axis2/ modules/core/src/org/apache/axis2/i18n/ modules/core/src/...
Date Tue, 15 Aug 2006 10:37:57 GMT
Author: dims
Date: Tue Aug 15 03:37:55 2006
New Revision: 431570

URL: http://svn.apache.org/viewvc?rev=431570&view=rev
Log:
Fold in common into core. Rational is as follows:

In preparation for Maven2, which mandates 1 jar per module, i'd like
to propose collapsing common module into core and renaming the code to
kernel  So that it produces a axis2-kernel.jar. This will reflect the
current maven.xml's behavior which creates a axis2-kernel.jar. BUT
with one caveat, the current kernel.jar has the code from java2wsdl
module as well. I'd like to keep this separate as it does not depend
on code in core/kernel and is needed by tuscany folks. So basically we
will be collapsing 3 modules producing 1 jar currently
(core+common+java2wsdl producing kernel.jar) to 2 modules producing 2
jars (kernel jar and java2wsdl jar).


Added:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Version.java
      - copied unchanged from r431481, webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/Version.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/i18n/
      - copied from r431481, webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/namespace/
      - copied from r431481, webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/namespace/
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/util/
      - copied from r431481, webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/wsdl/wsdl/
      - copied from r431481, webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/wsdl/
Removed:
    webservices/axis2/trunk/java/modules/common/
Modified:
    webservices/axis2/trunk/java/maven.xml
    webservices/axis2/trunk/java/modules/adb-codegen/project.xml
    webservices/axis2/trunk/java/modules/adb/project.xml
    webservices/axis2/trunk/java/modules/addressing/project.xml
    webservices/axis2/trunk/java/modules/codegen/project.xml
    webservices/axis2/trunk/java/modules/core/project.xml
    webservices/axis2/trunk/java/modules/integration/project.xml
    webservices/axis2/trunk/java/modules/jaxbri/project.xml
    webservices/axis2/trunk/java/modules/jaxws/project.xml
    webservices/axis2/trunk/java/modules/jibx/project.xml
    webservices/axis2/trunk/java/modules/rahas/project.xml
    webservices/axis2/trunk/java/modules/saaj/project.xml
    webservices/axis2/trunk/java/modules/samples/project.xml
    webservices/axis2/trunk/java/modules/savan/project.xml
    webservices/axis2/trunk/java/modules/security/project.xml
    webservices/axis2/trunk/java/modules/soapmonitor/project.xml
    webservices/axis2/trunk/java/modules/spring/project.xml
    webservices/axis2/trunk/java/modules/tool/project.xml
    webservices/axis2/trunk/java/modules/xmlbeans/project.xml

Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/maven.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Tue Aug 15 03:37:55 2006
@@ -353,7 +353,6 @@
             <!-- adding the tool classes. This is needed to get the ant task -->
             <fileset dir="modules/tool/target/classes"/>
             <fileset dir="modules/saaj/target/classes"/>
-            <fileset dir="modules/common/target/classes"/>
             <fileset dir="modules/addressing/target/classes"/>
             <fileset dir="modules/codegen/target/classes"/>
             <fileset dir="modules/adb/target/classes"/>
@@ -375,7 +374,6 @@
         <jar destfile="target/temp/war/lib/axis2-kernel-${pom.currentVersion}.jar">
             <fileset dir="modules/java2wsdl/target/classes"/>
             <fileset dir="modules/core/target/classes/"/>
-            <fileset dir="modules/common/target/classes/"/>
         </jar>
     </goal>
 
@@ -394,7 +392,6 @@
         <jar destfile="target/temp/war/lib/axis2-kernel-${pom.currentVersion}.jar">
             <fileset dir="modules/java2wsdl/target/classes"/>
             <fileset dir="modules/core/target/classes/"/>
-            <fileset dir="modules/common/target/classes/"/>
         </jar>
 
         <!-- Copy the adb jar -->
@@ -572,7 +569,6 @@
         <jar destfile="target/temp/min/bin/lib/axis2-kernel-${pom.currentVersion}.jar">
             <fileset dir="modules/java2wsdl/target/classes"/>
             <fileset dir="modules/core/target/classes/"/>
-            <fileset dir="modules/common/target/classes/"/>
         </jar>
 
         <!-- Copy the adb jar -->
@@ -608,7 +604,6 @@
                 <ant:include name="**/etc/**"/>
                 <ant:include name="**/modules/java2wsdl/**"/>
                 <ant:include name="**/modules/core/**"/>
-                <ant:include name="**/modules/common/**"/>
                 <ant:include name="**/modules/adb/**"/>
                 <ant:exclude name="**/SameServiceAddingTest.java"/>
                 <!-- TODO: This is failing in the distros. Must Fix it. -->
@@ -688,7 +683,6 @@
         <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/"/>
         </jar>
 
         <ant:copy toDir="${std.bin.temp.dir}/lib">
@@ -853,7 +847,7 @@
         <ant:mkdir dir="${min_dep_cache}"/>
         <j:if test="${minDeps.uptodate != 'yes'}">
             <macros:copy-deps copyToDir="${min_dep_cache}"
-                              mods="core,common,adb,java2wsdl"/>
+                              mods="core,adb,java2wsdl"/>
             <property name="minDeps.uptodate" value="yes"/>
         </j:if>
 
@@ -942,7 +936,6 @@
                 <ant:pathelement location="modules/codegen/src"/>
                 <ant:pathelement location="modules/xmlbeans/src"/>
                 <ant:pathelement location="modules/java2wsdl/src"/>
-                <ant:pathelement location="modules/common/src"/>
                 <ant:pathelement location="modules/core/src"/>
                 <ant:pathelement location="modules/jaxws/src"/>
                 <ant:pathelement location="modules/jibx/src"/>
@@ -1027,12 +1020,10 @@
         <jar destfile="${destdir}/axis2-kernel-${pom.currentVersion}.jar">
             <fileset dir="modules/java2wsdl/target/classes/"/>
             <fileset dir="modules/core/target/classes/"/>
-            <fileset dir="modules/common/target/classes/"/>
         </jar>
 
         <ant:copy toDir="${destdir}">
             <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"/>
             <ant:fileset file="modules/codegen/target/axis2-codegen-${pom.currentVersion}.jar"/>
             <ant:fileset file="modules/codegen/target/axis2-adb-codegen-${pom.currentVersion}.jar"/>

Modified: webservices/axis2/trunk/java/modules/adb-codegen/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/project.xml (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/project.xml Tue Aug 15 03:37:55 2006
@@ -40,11 +40,6 @@
 
         <dependency>
             <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

Modified: webservices/axis2/trunk/java/modules/adb/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/project.xml (original)
+++ webservices/axis2/trunk/java/modules/adb/project.xml Tue Aug 15 03:37:55 2006
@@ -43,11 +43,6 @@
         </dependency>
         <dependency>
             <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis2</groupId>
             <artifactId>axis2-core</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

Modified: webservices/axis2/trunk/java/modules/addressing/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/project.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/project.xml Tue Aug 15 03:37:55 2006
@@ -37,11 +37,6 @@
             <version>${axiom.version}</version>
         </dependency>
         <dependency>
-            <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
             <version>${wsdl4j.version}</version>

Modified: webservices/axis2/trunk/java/modules/codegen/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/project.xml (original)
+++ webservices/axis2/trunk/java/modules/codegen/project.xml Tue Aug 15 03:37:55 2006
@@ -43,11 +43,6 @@
         </dependency>
         <dependency>
             <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis2</groupId>
             <artifactId>axis2-core</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

Modified: webservices/axis2/trunk/java/modules/core/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/project.xml (original)
+++ webservices/axis2/trunk/java/modules/core/project.xml Tue Aug 15 03:37:55 2006
@@ -36,11 +36,6 @@
             <artifactId>axiom-impl</artifactId>
             <version>${axiom.version}</version>
         </dependency>
-               <dependency>
-            <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
         <dependency>
             <groupId>axis2</groupId>
             <artifactId>axis2-java2wsdl</artifactId>

Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Tue Aug 15 03:37:55 2006
@@ -102,11 +102,6 @@
         </dependency>
         <dependency>
             <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis2</groupId>
             <artifactId>axis2-rahas</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

Modified: webservices/axis2/trunk/java/modules/jaxbri/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxbri/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxbri/project.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxbri/project.xml Tue Aug 15 03:37:55 2006
@@ -38,11 +38,6 @@
         </dependency>
         <dependency>
             <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

Modified: webservices/axis2/trunk/java/modules/jaxws/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/project.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/project.xml Tue Aug 15 03:37:55 2006
@@ -165,11 +165,6 @@
             <version>${pom.currentVersion}</version>
         </dependency>
         <dependency>
-            <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
             <groupId>annogen</groupId>
             <artifactId>annogen</artifactId>
             <version>${annogen.version}</version>

Modified: webservices/axis2/trunk/java/modules/jibx/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/project.xml (original)
+++ webservices/axis2/trunk/java/modules/jibx/project.xml Tue Aug 15 03:37:55 2006
@@ -51,11 +51,6 @@
         </dependency>
         <dependency>
             <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

Modified: webservices/axis2/trunk/java/modules/rahas/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/project.xml (original)
+++ webservices/axis2/trunk/java/modules/rahas/project.xml Tue Aug 15 03:37:55 2006
@@ -43,11 +43,6 @@
         </dependency>
         <dependency>
             <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis2</groupId>
             <artifactId>axis2-java2wsdl</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

Modified: webservices/axis2/trunk/java/modules/saaj/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/project.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/project.xml Tue Aug 15 03:37:55 2006
@@ -122,11 +122,6 @@
         </dependency>
         <!-- external JARs -->
         <dependency>
-            <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>${commons.logging.version}</version>

Modified: webservices/axis2/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/project.xml Tue Aug 15 03:37:55 2006
@@ -49,11 +49,6 @@
         </dependency>
         <dependency>
             <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis2</groupId>
             <artifactId>axis2-savan</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

Modified: webservices/axis2/trunk/java/modules/savan/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/savan/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/savan/project.xml (original)
+++ webservices/axis2/trunk/java/modules/savan/project.xml Tue Aug 15 03:37:55 2006
@@ -37,11 +37,6 @@
             <version>${axiom.version}</version>
         </dependency>
         <dependency>
-            <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
             <version>${wsdl4j.version}</version>

Modified: webservices/axis2/trunk/java/modules/security/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/project.xml (original)
+++ webservices/axis2/trunk/java/modules/security/project.xml Tue Aug 15 03:37:55 2006
@@ -41,11 +41,6 @@
             <artifactId>axiom-dom</artifactId>
             <version>${axiom.version}</version>
         </dependency>
-        <dependency>
-            <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
   <dependency>
             <groupId>axis2</groupId>
             <artifactId>axis2-java2wsdl</artifactId>

Modified: webservices/axis2/trunk/java/modules/soapmonitor/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/soapmonitor/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/soapmonitor/project.xml (original)
+++ webservices/axis2/trunk/java/modules/soapmonitor/project.xml Tue Aug 15 03:37:55 2006
@@ -37,16 +37,6 @@
             <artifactId>axiom-impl</artifactId>
             <version>${axiom.version}</version>
         </dependency>
-               <dependency>
-            <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
         <dependency>
             <groupId>axis2</groupId>
             <artifactId>axis2-core</artifactId>

Modified: webservices/axis2/trunk/java/modules/spring/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/spring/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/spring/project.xml (original)
+++ webservices/axis2/trunk/java/modules/spring/project.xml Tue Aug 15 03:37:55 2006
@@ -37,16 +37,6 @@
             <artifactId>axiom-impl</artifactId>
             <version>${axiom.version}</version>
         </dependency>
-               <dependency>
-            <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
         <dependency>
             <groupId>axis2</groupId>
             <artifactId>axis2-core</artifactId>

Modified: webservices/axis2/trunk/java/modules/tool/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/project.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/project.xml Tue Aug 15 03:37:55 2006
@@ -38,11 +38,6 @@
 
         <dependency>
             <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis2</groupId>
             <artifactId>axis2-core</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>

Modified: webservices/axis2/trunk/java/modules/xmlbeans/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/xmlbeans/project.xml?rev=431570&r1=431569&r2=431570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xmlbeans/project.xml (original)
+++ webservices/axis2/trunk/java/modules/xmlbeans/project.xml Tue Aug 15 03:37:55 2006
@@ -40,11 +40,6 @@
 
         <dependency>
             <groupId>axis2</groupId>
-            <artifactId>axis2-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>



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


Mime
View raw message