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/05/04 13:02:27 UTC

svn commit: r399659 - in /webservices/axis2/trunk/java: NOTICE.txt legal/min/axis2-adb-LICENSE.txt legal/std/axis2-adb-LICENSE.txt maven.xml

Author: chinthaka
Date: Thu May  4 04:02:25 2006
New Revision: 399659

URL: http://svn.apache.org/viewcvs?rev=399659&view=rev
Log:
Adding notice file only for bin releases


Added:
    webservices/axis2/trunk/java/legal/min/axis2-adb-LICENSE.txt
      - copied, changed from r399608, webservices/axis2/trunk/java/legal/std/axis2-adb-LICENSE.txt
Removed:
    webservices/axis2/trunk/java/legal/std/axis2-adb-LICENSE.txt
Modified:
    webservices/axis2/trunk/java/NOTICE.txt
    webservices/axis2/trunk/java/maven.xml

Modified: webservices/axis2/trunk/java/NOTICE.txt
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/NOTICE.txt?rev=399659&r1=399658&r2=399659&view=diff
==============================================================================
--- webservices/axis2/trunk/java/NOTICE.txt (original)
+++ webservices/axis2/trunk/java/NOTICE.txt Thu May  4 04:02:25 2006
@@ -7,5 +7,5 @@
    This product includes software developed by
    The Apache Software Foundation (http://www.apache.org/).
 
-   Please read the different LICENSE files present in the licenses directory of
+   Please read the different LICENSE files present in the lib directory of
    this distribution.

Copied: webservices/axis2/trunk/java/legal/min/axis2-adb-LICENSE.txt (from r399608, webservices/axis2/trunk/java/legal/std/axis2-adb-LICENSE.txt)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/legal/min/axis2-adb-LICENSE.txt?p2=webservices/axis2/trunk/java/legal/min/axis2-adb-LICENSE.txt&p1=webservices/axis2/trunk/java/legal/std/axis2-adb-LICENSE.txt&r1=399608&r2=399659&rev=399659&view=diff
==============================================================================
    (empty)

Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/maven.xml?rev=399659&r1=399658&r2=399659&view=diff
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Thu May  4 04:02:25 2006
@@ -374,7 +374,7 @@
         <ant:mkdir dir="target/temp/war/toWEB-INF/conf"/>
 
         <attainGoal name="create-kernel"/>
-        
+
         <!-- Create axis2-core.jar -->
         <jar destfile="target/temp/war/lib/axis2-kernel-${pom.currentVersion}.jar">
             <fileset dir="modules/java2wsdl/target/classes"/>
@@ -409,7 +409,8 @@
 
         <!-- Copy the soapmonitor jar - the servlet classes -->
         <ant:copy toDir="target/temp/war/lib">
-            <ant:fileset file="modules/soapmonitor/target/axis2-soapmonitor-${pom.currentVersion}.jar"/>
+            <ant:fileset
+                    file="modules/soapmonitor/target/axis2-soapmonitor-${pom.currentVersion}.jar"/>
         </ant:copy>
 
         <!-- copy the soapmonitor mar -->
@@ -455,12 +456,12 @@
             <ant:classes dir="modules/core/conf">
                 <ant:include name="*.properties"/>
             </ant:classes>
-          <!--  <ant:webinf dir="modules/core/src/org/apache/axis2/deployment">
-                <ant:include name="*.xml"/>
-            </ant:webinf> -->
+            <!--  <ant:webinf dir="modules/core/src/org/apache/axis2/deployment">
+               <ant:include name="*.xml"/>
+           </ant:webinf> -->
             <ant:webinf dir="target/temp/war/toWEB-INF"/>
             <ant:fileset dir="target/temp/war">
-              <ant:include name="**/axis2-web/**" />
+                <ant:include name="**/axis2-web/**"/>
             </ant:fileset>
         </ant:war>
     </goal>
@@ -526,6 +527,12 @@
             </fileset>
         </ant:delete>
 
+
+        <!--copy NOTICE.txt file-->
+        <ant:copy toFile="target/temp/min/bin/NOTICE.txt">
+            <ant:fileset file="NOTICE.txt"/>
+        </ant:copy>
+
         <!-- Create axis2-core.jar -->
         <jar destfile="target/temp/min/bin/lib/axis2-kernel-${pom.currentVersion}.jar">
             <fileset dir="modules/java2wsdl/target/classes"/>
@@ -614,6 +621,12 @@
             <ant:fileset dir="modules/tool/script"/>
         </ant:copy>
 
+
+        <!--copy NOTICE.txt file-->
+        <ant:copy toFile="${std.bin.temp.dir}/NOTICE.txt" filtering="on">
+            <ant:fileset file="NOTICE.txt"/>
+        </ant:copy>
+
         <!-- Copy the 3rd party libs -->
         <ant:copy toDir="${std.bin.temp.dir}/lib">
             <ant:fileset dir="${min_dep_cache}"/>
@@ -836,7 +849,7 @@
             <property name="warDeps.uptodate" value="yes"/>
         </j:if>
 
-         <!--copy the license files also-->
+        <!--copy the license files also-->
         <ant:copy toDir="${war_dep_cache}">
             <ant:fileset dir="legal/war">
                 <ant:include name="*.txt"/>
@@ -1073,9 +1086,6 @@
             </ant:copy>
             <ant:copy toFile="${toDir}/LICENSE.txt" filtering="on">
                 <ant:fileset file="LICENSE.txt"/>
-            </ant:copy>
-            <ant:copy toFile="${toDir}/NOTICE.txt" filtering="on">
-                <ant:fileset file="NOTICE.txt"/>
             </ant:copy>
         </define:tag>
     </define:taglib>