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 sa...@apache.org on 2007/02/24 18:10:22 UTC
svn commit: r511305 - in /webservices/axis2/trunk/java/modules: integration/
jaxbri/ jaxws-api/ jaxws/ json/ metadata/ mex/ mtompolicy/ saaj-api/ saaj/
Author: sanka
Date: Sat Feb 24 09:10:22 2007
New Revision: 511305
URL: http://svn.apache.org/viewvc?view=rev&rev=511305
Log:
Fixed jaxbri, metadata, integration, mex, saaj-api, mtompolicy, jaxws, jaxws-api, json and saaj modules to include
the LICENSE.txt and NOTICE.txt files in the META-INF folder in the jars that are created by the build.
Modified:
webservices/axis2/trunk/java/modules/integration/project.xml
webservices/axis2/trunk/java/modules/jaxbri/project.xml
webservices/axis2/trunk/java/modules/jaxws-api/project.xml
webservices/axis2/trunk/java/modules/jaxws/project.xml
webservices/axis2/trunk/java/modules/json/project.xml
webservices/axis2/trunk/java/modules/metadata/project.xml
webservices/axis2/trunk/java/modules/mex/maven.xml
webservices/axis2/trunk/java/modules/mex/project.xml
webservices/axis2/trunk/java/modules/mtompolicy/project.xml
webservices/axis2/trunk/java/modules/saaj-api/project.xml
webservices/axis2/trunk/java/modules/saaj/project.xml
Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/project.xml?view=diff&rev=511305&r1=511304&r2=511305
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Sat Feb 24 09:10:22 2007
@@ -409,12 +409,20 @@
<include>**/*.jpg</include>
</includes>
</resource>
- <resource>
+ <resource>
<directory>test</directory>
<includes>
<include>**/*.bin</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/trunk/java/modules/jaxbri/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxbri/project.xml?view=diff&rev=511305&r1=511304&r2=511305
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxbri/project.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxbri/project.xml Sat Feb 24 09:10:22 2007
@@ -99,6 +99,18 @@
<version>${jaxbri.version}</version>
</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/trunk/java/modules/jaxws-api/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-api/project.xml?view=diff&rev=511305&r1=511304&r2=511305
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-api/project.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws-api/project.xml Sat Feb 24 09:10:22 2007
@@ -42,6 +42,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>
Modified: webservices/axis2/trunk/java/modules/jaxws/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/project.xml?view=diff&rev=511305&r1=511304&r2=511305
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/project.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/project.xml Sat Feb 24 09:10:22 2007
@@ -75,6 +75,17 @@
<nagEmailAddress></nagEmailAddress>
<sourceDirectory>src</sourceDirectory>
<unitTestSourceDirectory>test</unitTestSourceDirectory>
+
+ <resources>
+ <resource>
+ <directory>../../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
<unitTest>
<includes>
Modified: webservices/axis2/trunk/java/modules/json/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/json/project.xml?view=diff&rev=511305&r1=511304&r2=511305
==============================================================================
--- webservices/axis2/trunk/java/modules/json/project.xml (original)
+++ webservices/axis2/trunk/java/modules/json/project.xml Sat Feb 24 09:10:22 2007
@@ -187,6 +187,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/trunk/java/modules/metadata/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/project.xml?view=diff&rev=511305&r1=511304&r2=511305
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/project.xml (original)
+++ webservices/axis2/trunk/java/modules/metadata/project.xml Sat Feb 24 09:10:22 2007
@@ -75,6 +75,17 @@
<nagEmailAddress></nagEmailAddress>
<sourceDirectory>src</sourceDirectory>
<unitTestSourceDirectory>test</unitTestSourceDirectory>
+
+ <resources>
+ <resource>
+ <directory>../../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
<unitTest>
<includes>
@@ -329,4 +340,9 @@
</properties>
</dependency>
</dependencies>
+ <build>
+ <resources>
+
+ </resources>
+ </build>
</project>
Modified: webservices/axis2/trunk/java/modules/mex/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex/maven.xml?view=diff&rev=511305&r1=511304&r2=511305
==============================================================================
--- webservices/axis2/trunk/java/modules/mex/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/mex/maven.xml Sat Feb 24 09:10:22 2007
@@ -32,7 +32,7 @@
<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"/>
+ tofile="target/classes/META-INF/NOTICE.txt" overwrite="true"/>
<mkdir dir="target/modules"/>
<jar jarfile="target/metadataExchange-${mex_version}.mar" basedir="target/classes">
<include name="**"/>
Modified: webservices/axis2/trunk/java/modules/mex/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex/project.xml?view=diff&rev=511305&r1=511304&r2=511305
==============================================================================
--- webservices/axis2/trunk/java/modules/mex/project.xml (original)
+++ webservices/axis2/trunk/java/modules/mex/project.xml Sat Feb 24 09:10:22 2007
@@ -82,8 +82,19 @@
<module>true</module>
</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/trunk/java/modules/mtompolicy/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mtompolicy/project.xml?view=diff&rev=511305&r1=511304&r2=511305
==============================================================================
--- webservices/axis2/trunk/java/modules/mtompolicy/project.xml (original)
+++ webservices/axis2/trunk/java/modules/mtompolicy/project.xml Sat Feb 24 09:10:22 2007
@@ -25,11 +25,11 @@
<groupId>org.apache.axis2</groupId>
<description>Axis2 : MTOM Policy</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${pom.currentVersion}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
@@ -45,7 +45,7 @@
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-dom</artifactId>
<version>${axiom.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>${stax.impl.groupid}</groupId>
<artifactId>${stax.impl.artifactid}</artifactId>
@@ -91,5 +91,15 @@
<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>
</project>
Modified: webservices/axis2/trunk/java/modules/saaj-api/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj-api/project.xml?view=diff&rev=511305&r1=511304&r2=511305
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj-api/project.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj-api/project.xml Sat Feb 24 09:10:22 2007
@@ -42,7 +42,15 @@
<include>**/*.xml</include>
</includes>
</resource>
- </resources>
+ <resource>
+ <directory>../../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
<dependencies>
Modified: webservices/axis2/trunk/java/modules/saaj/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/project.xml?view=diff&rev=511305&r1=511304&r2=511305
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/project.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/project.xml Sat Feb 24 09:10:22 2007
@@ -80,7 +80,16 @@
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
- </resource>
+ </resource>
+
+ <resource>
+ <directory>../../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
</resources>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org