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 th...@apache.org on 2006/12/20 11:14:25 UTC

svn commit: r489013 - in /webservices/axis2/branches/java/1_1/modules: adb-codegen/ adb/ addressing/ codegen/ integration/ java2wsdl/ jaxws/ jibx/ kernel/ rahas/ saaj/ samples/ savan/ secpolicy/ security/ soapmonitor/ spring/ tool/ xmlbeans/

Author: thilina
Date: Wed Dec 20 02:14:23 2006
New Revision: 489013

URL: http://svn.apache.org/viewvc?view=rev&rev=489013
Log:
fixing AXIS2-1869
Adding licence and notice files to all the jars and mars..

Modified:
    webservices/axis2/branches/java/1_1/modules/adb-codegen/project.xml
    webservices/axis2/branches/java/1_1/modules/adb/project.xml
    webservices/axis2/branches/java/1_1/modules/addressing/maven.xml
    webservices/axis2/branches/java/1_1/modules/codegen/project.xml
    webservices/axis2/branches/java/1_1/modules/integration/project.xml
    webservices/axis2/branches/java/1_1/modules/java2wsdl/project.xml
    webservices/axis2/branches/java/1_1/modules/jaxws/project.xml
    webservices/axis2/branches/java/1_1/modules/jibx/project.xml
    webservices/axis2/branches/java/1_1/modules/kernel/project.xml
    webservices/axis2/branches/java/1_1/modules/rahas/project.xml
    webservices/axis2/branches/java/1_1/modules/saaj/project.xml
    webservices/axis2/branches/java/1_1/modules/samples/project.xml
    webservices/axis2/branches/java/1_1/modules/savan/project.xml
    webservices/axis2/branches/java/1_1/modules/secpolicy/project.xml
    webservices/axis2/branches/java/1_1/modules/security/project.xml
    webservices/axis2/branches/java/1_1/modules/soapmonitor/maven.xml
    webservices/axis2/branches/java/1_1/modules/soapmonitor/project.xml
    webservices/axis2/branches/java/1_1/modules/spring/project.xml
    webservices/axis2/branches/java/1_1/modules/tool/project.xml
    webservices/axis2/branches/java/1_1/modules/xmlbeans/project.xml

Modified: webservices/axis2/branches/java/1_1/modules/adb-codegen/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb-codegen/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb-codegen/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/adb-codegen/project.xml Wed Dec 20 02:14:23 2006
@@ -166,7 +166,15 @@
                     <include>**/*.xsl</include>
                     <include>**/*.xsd</include>
                 </includes>
-            </resource>
+            </resource>
+            <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
         </resources>
     </build>
 </project>

Modified: webservices/axis2/branches/java/1_1/modules/adb/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/adb/project.xml Wed Dec 20 02:14:23 2006
@@ -134,7 +134,15 @@
                     <include>**/*.xsl</include>
                     <include>**/*.xsd</include>
                 </includes>
-            </resource>
+            </resource>
+            	<resource>
+               <directory>../../</directory>
+               <targetPath>META-INF</targetPath>
+               <includes>
+                 <include>NOTICE.txt</include>
+                 <include>LICENSE.txt</include>
+               </includes>
+   </resource>
         </resources>
     </build>
 </project>

Modified: webservices/axis2/branches/java/1_1/modules/addressing/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/addressing/maven.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/addressing/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/addressing/maven.xml Wed Dec 20 02:14:23 2006
@@ -14,6 +14,8 @@
             tofile="target/classes/META-INF/module.xml"/>
         <copy file="../../LICENSE.txt"
             tofile="target/classes/META-INF/LICENSE.txt" overwrite="true"/>
+        <copy file="../../NOTICE.txt"
+            tofile="target/classes/META-INF/LICENSE.txt" overwrite="true"/>
         <copy file="./test-resources/axis2.xml"
             tofile="target/axis2.xml"/>
         <mkdir dir="target/modules"/>

Modified: webservices/axis2/branches/java/1_1/modules/codegen/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/codegen/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/codegen/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/codegen/project.xml Wed Dec 20 02:14:23 2006
@@ -226,6 +226,14 @@
                     <include>**/*.xsd</include>
                 </includes>
             </resource>
+            <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
         </resources>
     </build>
 </project>

Modified: webservices/axis2/branches/java/1_1/modules/integration/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/integration/project.xml Wed Dec 20 02:14:23 2006
@@ -32,16 +32,7 @@
             <artifactId>axis2-kernel</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-security</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-secpolicy</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-java2wsdl</artifactId>
@@ -103,11 +94,6 @@
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-tools</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-rahas</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
 

Modified: webservices/axis2/branches/java/1_1/modules/java2wsdl/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/java2wsdl/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/java2wsdl/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/java2wsdl/project.xml Wed Dec 20 02:14:23 2006
@@ -129,8 +129,16 @@
                     <include>**/*.xml</include>
                     <include>**/*.xsl</include>
                 </includes>
-            </resource>
+            </resource>
+            <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
         </resources>
     </build>
     <reports/>
-</project>
\ No newline at end of file
+</project>

Modified: webservices/axis2/branches/java/1_1/modules/jaxws/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/jaxws/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/jaxws/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/jaxws/project.xml Wed Dec 20 02:14:23 2006
@@ -318,5 +318,17 @@
                 <module>true</module>
             </properties>
         </dependency> 
-    </dependencies>
+    </dependencies>
+       <build>
+        <resources>
+			   <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
+		</resources>
+		 </build>
 </project>

Modified: webservices/axis2/branches/java/1_1/modules/jibx/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/jibx/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/jibx/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/jibx/project.xml Wed Dec 20 02:14:23 2006
@@ -182,6 +182,17 @@
         </dependency>
 
     </dependencies>
-    <build/>
+    <build>
+    <resources>
+			   <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
+		</resources>
+		   </build>
     <reports/>
 </project>

Modified: webservices/axis2/branches/java/1_1/modules/kernel/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/project.xml Wed Dec 20 02:14:23 2006
@@ -210,6 +210,14 @@
 					<include>**/*.xsl</include>
 				</includes>
 			</resource>
+			<resource>
+      <directory>../../</directory>
+      <targetPath>META-INF</targetPath>
+      <includes>
+        <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
 		</resources>
 	<unitTest>
 	  <resources>

Modified: webservices/axis2/branches/java/1_1/modules/rahas/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/project.xml Wed Dec 20 02:14:23 2006
@@ -206,6 +206,16 @@
                 <include>**/*Test.java</include>
             </includes>
         </unitTest>
+        <resources>
+			   <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
+		</resources>
 	</build>
     <reports/>
 </project>

Modified: webservices/axis2/branches/java/1_1/modules/saaj/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/saaj/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/saaj/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/saaj/project.xml Wed Dec 20 02:14:23 2006
@@ -247,6 +247,17 @@
             </properties>
         </dependency>
     </dependencies>
-
+    <build>
+    <resources>
+			   <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
+		</resources>
+		</build>
     <reports/>
 </project>

Modified: webservices/axis2/branches/java/1_1/modules/samples/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/samples/project.xml Wed Dec 20 02:14:23 2006
@@ -277,6 +277,14 @@
                     <include>**/*.jpg</include>
                 </includes>
             </resource>
+            			   <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
         </resources>
     </build>
 

Modified: webservices/axis2/branches/java/1_1/modules/savan/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/savan/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/savan/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/savan/project.xml Wed Dec 20 02:14:23 2006
@@ -169,7 +169,18 @@
                 <module>true</module>
             </properties>
         </dependency>
-    </dependencies>
-
+    </dependencies>
+    <build>
+    <resources>
+			   <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
+		</resources>
+		</build>
     <reports/>
 </project>

Modified: webservices/axis2/branches/java/1_1/modules/secpolicy/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/secpolicy/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/secpolicy/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/secpolicy/project.xml Wed Dec 20 02:14:23 2006
@@ -85,7 +85,17 @@
             <includes>
                 <include>**/*Test.java</include>
             </includes>
-        </unitTest>
+        </unitTest>
+         <resources>
+        			   <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
+    </resources>
 	</build>
     <reports/>
 </project>

Modified: webservices/axis2/branches/java/1_1/modules/security/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/security/project.xml Wed Dec 20 02:14:23 2006
@@ -262,6 +262,17 @@
                 <include>**/*Test.java</include>
             </includes>
         </unitTest>
-	</build>
+
+	    <resources>
+			   <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
+		</resources>
+		</build>
     <reports/>
 </project>

Modified: webservices/axis2/branches/java/1_1/modules/soapmonitor/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/soapmonitor/maven.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/soapmonitor/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/soapmonitor/maven.xml Wed Dec 20 02:14:23 2006
@@ -33,6 +33,8 @@
         
         <copy file="../../LICENSE.txt"
             tofile="target/temp-mar/META-INF/LICENSE.txt" overwrite="true"/>
+        <copy file="../../NOTICE.txt"
+            tofile="target/temp-mar/META-INF/LICENSE.txt" overwrite="true"/>
 
         <jar jarfile="target/soapmonitor-${soapmonitor_version}.mar" basedir="target/temp-mar/">
             <include name="**/*"/>

Modified: webservices/axis2/branches/java/1_1/modules/soapmonitor/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/soapmonitor/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/soapmonitor/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/soapmonitor/project.xml Wed Dec 20 02:14:23 2006
@@ -86,6 +86,17 @@
         </dependency>
 
     </dependencies>
-    <build/>
+      <build>
+        <resources>
+			   <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
+		</resources>
+		 </build>
     <reports/>
 </project>

Modified: webservices/axis2/branches/java/1_1/modules/spring/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/spring/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/spring/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/spring/project.xml Wed Dec 20 02:14:23 2006
@@ -110,8 +110,18 @@
             <module>true</module>
           </properties>
         </dependency>
-
     </dependencies>
-    <build/>
+    <build>
+        <resources>
+			   <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
+		</resources>
+		 </build>
     <reports/>
 </project>

Modified: webservices/axis2/branches/java/1_1/modules/tool/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/project.xml Wed Dec 20 02:14:23 2006
@@ -93,6 +93,14 @@
                     <include>**/*.xml</include>
                 </includes>
             </resource>
+			   <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
         </resources>
     </build>
     <reports/>

Modified: webservices/axis2/branches/java/1_1/modules/xmlbeans/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/xmlbeans/project.xml?view=diff&rev=489013&r1=489012&r2=489013
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/xmlbeans/project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/xmlbeans/project.xml Wed Dec 20 02:14:23 2006
@@ -167,7 +167,15 @@
                     <include>**/*.xsl</include>
                     <include>**/*.xsd</include>
                 </includes>
-            </resource>
+            </resource>
+             <resource>
+        <directory>../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+   </resource>
         </resources>
     </build>
 </project>



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