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 ch...@apache.org on 2006/10/27 19:30:43 UTC

svn commit: r468469 - in /webservices/axis2/branches/java/1_1: ./ legal/min/ legal/std/

Author: chinthaka
Date: Fri Oct 27 10:30:42 2006
New Revision: 468469

URL: http://svn.apache.org/viewvc?view=rev&rev=468469
Log:
Removing the minimal distribution from releases.


Added:
    webservices/axis2/branches/java/1_1/legal/std/XmlSchema-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/XmlSchema-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/activation-LICENSE.txt
      - copied unchanged from r468290, webservices/axis2/branches/java/1_1/legal/min/activation-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/annogen-LICENSE.txt
      - copied unchanged from r468290, webservices/axis2/branches/java/1_1/legal/min/annogen-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/axiom-api-LICENSE.txt
      - copied unchanged from r468290, webservices/axis2/branches/java/1_1/legal/min/axiom-api-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/axiom-dom-LICENSE.txt
      - copied unchanged from r468290, webservices/axis2/branches/java/1_1/legal/min/axiom-dom-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/axiom-impl-LICENSE.txt
      - copied unchanged from r468290, webservices/axis2/branches/java/1_1/legal/min/axiom-impl-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/backport-util-concurrent-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/backport-util-concurrent-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/commons-codec-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/commons-codec-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/commons-fileupload-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/commons-fileupload-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/commons-httpclient-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/commons-httpclient-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/commons-logging-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/commons-logging-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/geronimo-spec-jms-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/geronimo-spec-jms-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/jakarta-httpcore-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/jakarta-httpcore-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/jaxen-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/jaxen-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/mail-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/mail-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/neethi-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/neethi-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/servlet-api-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/servlet-api-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/stax-api-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/stax-api-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/woden-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/woden-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/wsdl4j-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/wsdl4j-LICENSE.txt
    webservices/axis2/branches/java/1_1/legal/std/wstx-LICENSE.txt
      - copied, changed from r468290, webservices/axis2/branches/java/1_1/legal/min/wstx-LICENSE.txt
Removed:
    webservices/axis2/branches/java/1_1/legal/min/
Modified:
    webservices/axis2/branches/java/1_1/maven.xml

Copied: webservices/axis2/branches/java/1_1/legal/std/XmlSchema-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/XmlSchema-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/XmlSchema-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/XmlSchema-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/XmlSchema-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/backport-util-concurrent-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/backport-util-concurrent-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/backport-util-concurrent-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/backport-util-concurrent-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/backport-util-concurrent-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/commons-codec-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/commons-codec-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/commons-codec-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/commons-codec-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/commons-codec-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/commons-fileupload-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/commons-fileupload-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/commons-fileupload-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/commons-fileupload-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/commons-fileupload-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/commons-httpclient-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/commons-httpclient-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/commons-httpclient-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/commons-httpclient-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/commons-httpclient-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/commons-logging-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/commons-logging-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/commons-logging-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/commons-logging-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/commons-logging-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/geronimo-spec-jms-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/geronimo-spec-jms-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/geronimo-spec-jms-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/geronimo-spec-jms-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/geronimo-spec-jms-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/jakarta-httpcore-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/jakarta-httpcore-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/jakarta-httpcore-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/jakarta-httpcore-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/jakarta-httpcore-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/jaxen-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/jaxen-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/jaxen-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/jaxen-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/jaxen-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/mail-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/mail-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/mail-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/mail-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/mail-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/neethi-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/neethi-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/neethi-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/neethi-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/neethi-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/servlet-api-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/servlet-api-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/servlet-api-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/servlet-api-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/servlet-api-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/stax-api-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/stax-api-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/stax-api-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/stax-api-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/stax-api-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/woden-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/woden-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/woden-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/woden-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/woden-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/wsdl4j-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/wsdl4j-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/wsdl4j-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/wsdl4j-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/wsdl4j-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Copied: webservices/axis2/branches/java/1_1/legal/std/wstx-LICENSE.txt (from r468290, webservices/axis2/branches/java/1_1/legal/min/wstx-LICENSE.txt)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/legal/std/wstx-LICENSE.txt?view=diff&rev=468469&p1=webservices/axis2/branches/java/1_1/legal/min/wstx-LICENSE.txt&r1=468290&p2=webservices/axis2/branches/java/1_1/legal/std/wstx-LICENSE.txt&r2=468469
==============================================================================
    (empty)

Modified: webservices/axis2/branches/java/1_1/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/maven.xml?view=diff&rev=468469&r1=468468&r2=468469
==============================================================================
--- webservices/axis2/branches/java/1_1/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/maven.xml Fri Oct 27 10:30:42 2006
@@ -38,11 +38,8 @@
      | dist-docs
      |		Creates the docs distribution
      |
-     | dist-min-bin
-     |      Creates the minimal binary distribution
-     |
      | release
-     |      Creates the complete release (dist-bin, dist-src, dist-docs, dist-min-bin)
+     |      Creates the complete release (dist-bin, dist-src, dist-docs, war)
      | war
      |    Build the war
    -->
@@ -531,7 +528,7 @@
     <!--- Create the Release -->
     <!-- ================================================================ -->
     <goal name="release"
-          prereqs="jar,dist-min-bin,dist-bin,dist-src,dist-docs,war">
+          prereqs="jar,dist-bin,dist-src,dist-docs,war">
         <ant:echo>+----------------------------------------------</ant:echo>
         <ant:echo>| Creating: Axis2 Distributions</ant:echo>
         <ant:echo>+----------------------------------------------</ant:echo>
@@ -553,70 +550,12 @@
         <ant:filter token="axis2_version" value="${pom.currentVersion}"/>
         <ant:filter token="release_date" value="${release_date}"/>
 
-        <property name="min_dep_cache" value="target/temp/cache/min"/>
         <property name="std_dep_cache" value="target/temp/cache/std"/>
         <property name="war_dep_cache" value="target/temp/cache/war"/>
 
         <ant:mkdir dir="target/dist"/>
     </goal>
 
-    <goal name="dist-min-bin" prereqs="jar,init-dist,cache-min-deps">
-        <ant:echo>+----------------------------------------------</ant:echo>
-        <ant:echo>| Creating: Axis2 Minimal Binary Distribution</ant:echo>
-        <ant:echo>+----------------------------------------------</ant:echo>
-
-        <ant:mkdir dir="target/dist"/>
-
-        <ant:property name="min.bin.temp.dir"
-                      value="target/temp/min/bin/axis2-min-${pom.currentVersion}-bin"/>
-        <ant:mkdir dir="${min.bin.temp.dir}/lib"/>
-
-        <!-- Copy the 3rd party libs -->
-        <ant:copy toDir="${min.bin.temp.dir}/lib">
-            <ant:fileset dir="${min_dep_cache}"/>
-        </ant:copy>
-
-        <!-- Delete testing jars -->
-        <echo message="Deleting Unwanted testing jars"/>
-        <ant:delete>
-            <fileset dir="${min.bin.temp.dir}/lib">
-                <include name="**/ant*.jar"/>
-                <include name="**/xmlunit*.jar"/>
-                <include name="**/junit*.jar"/>
-            </fileset>
-        </ant:delete>
-
-
-        <!--copy NOTICE.txt file-->
-        <ant:copy toFile="${min.bin.temp.dir}/NOTICE.txt">
-            <ant:fileset file="NOTICE.txt"/>
-        </ant:copy>
-
-        <!-- Copy the java2wsdl jar -->
-        <ant:copy toDir="${min.bin.temp.dir}/lib">
-            <ant:fileset file="modules/java2wsdl/target/axis2-java2wsdl-${pom.currentVersion}.jar"/>
-        </ant:copy>
-
-        <!-- Copy the kernel jar -->
-        <ant:copy toDir="${min.bin.temp.dir}/lib">
-            <ant:fileset file="modules/kernel/target/axis2-kernel-${pom.currentVersion}.jar"/>
-        </ant:copy>
-
-        <!-- Copy the adb jar -->
-        <ant:copy toDir="${min.bin.temp.dir}/lib">
-            <ant:fileset file="modules/adb/target/axis2-adb-${pom.currentVersion}.jar"/>
-        </ant:copy>
-
-        <!-- Copy the release documents -->
-        <macros:copy-release-docs toDir="${min.bin.temp.dir}"
-                                  readmeFile="release-docs/readme-files/README-min-bin.txt"/>
-
-        <ant:mkdir dir="${dist.dir}"/>
-        <ant:zip file="${dist.dir}/axis2-min-${pom.currentVersion}-bin.zip"
-                 basedir="target/temp/min/bin"/>
-        <ant:delete dir="target/temp/min/bin"/>
-    </goal>
-
     <goal name="dist-bin" prereqs="jar,init-dist,cache-std-deps">
         <ant:echo>+----------------------------------------------</ant:echo>
         <ant:echo>| Creating: Axis2 Main Binary Distribution</ant:echo>
@@ -707,7 +646,6 @@
         <!--********************** creating the lib ********************** -->
         <!-- Copy the 3rd party libs -->
         <ant:copy toDir="${std.bin.temp.dir}/lib">
-            <ant:fileset dir="${min_dep_cache}"/>
             <ant:fileset dir="${std_dep_cache}"/>
         </ant:copy>
 
@@ -897,34 +835,11 @@
         <ant:echo message="***** IMPORTANT: Please manually copy the Eclipse &amp; IDEA plugins"/>
     </goal>
 
-    <goal name="cache-min-deps" prereqs="init-dist">
-        <ant:mkdir dir="${min_dep_cache}"/>
-        <j:if test="${minDeps.uptodate != 'yes'}">
-            <macros:copy-deps copyToDir="${min_dep_cache}"
-                              mods="kernel,adb,java2wsdl"/>
-            <property name="minDeps.uptodate" value="yes"/>
-        </j:if>
-
-        <!--copy the license files also-->
-        <ant:copy toDir="${min_dep_cache}">
-            <ant:fileset dir="legal/min">
-                <ant:include name="*.txt"/>
-            </ant:fileset>
-        </ant:copy>
-
-        <!--remove testing jars-->
-        <ant:delete dir="${min_dep_cache}">
-            <ant:include name="junit*.jar"/>
-            <ant:include name="xmlunit*.jar"/>
-            <ant:include name="maven-itest*.jar"/>
-        </ant:delete>
-    </goal>
-
-    <goal name="cache-std-deps" prereqs="init-dist,cache-min-deps">
+    <goal name="cache-std-deps" prereqs="init-dist">
         <ant:mkdir dir="${std_dep_cache}"/>
         <j:if test="${stdDeps.uptodate != 'yes'}">
             <macros:copy-deps copyToDir="${std_dep_cache}"
-                              mods="codegen,jibx,spring,saaj"/>
+                              mods="codegen,jibx,spring,saaj,kernel,adb,java2wsdl"/>
             <property name="stdDeps.uptodate" value="yes"/>
         </j:if>
 
@@ -960,9 +875,6 @@
             <ant:fileset dir="legal/std">
                 <ant:include name="*.txt"/>
             </ant:fileset>
-            <ant:fileset dir="legal/min">
-                <ant:include name="*.txt"/>
-            </ant:fileset>
         </ant:copy>
 
         <!--remove testing jars-->
@@ -1147,7 +1059,7 @@
                     <ant:include name="*.txt"/>
                 </ant:fileset>
             </ant:copy>
-     		<ant:fileset file="legal/min/axis2-LICENSE.txt"/>
+     		<ant:fileset file="LICENSE.txt"/>
 
         </ant:copy>
     	



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