axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r777934 - in /webservices/axis2/trunk/java: ./ modules/adb-codegen/ modules/adb/ modules/clustering/ modules/codegen/ modules/corba/ modules/fastinfoset/ modules/java2wsdl/ modules/jaxbri/ modules/jaxws-mar/ modules/jaxws/ modules/jibx/ mod...
Date Sat, 23 May 2009 14:34:26 GMT
Author: veithen
Date: Sat May 23 14:34:24 2009
New Revision: 777934

URL: http://svn.apache.org/viewvc?rev=777934&view=rev
Log:
Changed POMs so that the legal files (LICENSE.txt and NOTICE.txt) are added using maven-remote-resources-plugin.

Reason: The Maven Eclipse plugin doesn't support (re)source folders located outside of the module directory. Using maven-remote-resources-plugin solves this issue.

Added:
    webservices/axis2/trunk/java/modules/resource-bundle/
    webservices/axis2/trunk/java/modules/resource-bundle/pom.xml   (with props)
    webservices/axis2/trunk/java/modules/resource-bundle/src/
    webservices/axis2/trunk/java/modules/resource-bundle/src/main/
    webservices/axis2/trunk/java/modules/resource-bundle/src/main/resources/
    webservices/axis2/trunk/java/modules/resource-bundle/src/main/resources/LICENSE.txt.vm
      - copied unchanged from r770959, webservices/axis2/trunk/java/LICENSE.txt
    webservices/axis2/trunk/java/modules/resource-bundle/src/main/resources/NOTICE.txt.vm
      - copied unchanged from r770959, webservices/axis2/trunk/java/NOTICE.txt
Modified:
    webservices/axis2/trunk/java/modules/adb-codegen/pom.xml
    webservices/axis2/trunk/java/modules/adb/pom.xml
    webservices/axis2/trunk/java/modules/clustering/pom.xml
    webservices/axis2/trunk/java/modules/codegen/pom.xml
    webservices/axis2/trunk/java/modules/corba/pom.xml
    webservices/axis2/trunk/java/modules/fastinfoset/pom.xml
    webservices/axis2/trunk/java/modules/java2wsdl/pom.xml
    webservices/axis2/trunk/java/modules/jaxbri/pom.xml
    webservices/axis2/trunk/java/modules/jaxws-mar/pom.xml
    webservices/axis2/trunk/java/modules/jaxws/pom.xml
    webservices/axis2/trunk/java/modules/jibx/pom.xml
    webservices/axis2/trunk/java/modules/json/pom.xml
    webservices/axis2/trunk/java/modules/kernel/pom.xml
    webservices/axis2/trunk/java/modules/metadata/pom.xml
    webservices/axis2/trunk/java/modules/mex/pom.xml
    webservices/axis2/trunk/java/modules/mtompolicy-mar/pom.xml
    webservices/axis2/trunk/java/modules/mtompolicy/pom.xml
    webservices/axis2/trunk/java/modules/osgi/pom.xml
    webservices/axis2/trunk/java/modules/parent/pom.xml
    webservices/axis2/trunk/java/modules/ping/pom.xml
    webservices/axis2/trunk/java/modules/saaj/pom.xml
    webservices/axis2/trunk/java/modules/samples/version/pom.xml
    webservices/axis2/trunk/java/modules/scripting/pom.xml
    webservices/axis2/trunk/java/modules/spring/pom.xml
    webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml
    webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
    webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml
    webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml
    webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
    webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
    webservices/axis2/trunk/java/modules/xmlbeans/pom.xml
    webservices/axis2/trunk/java/pom.xml

Modified: webservices/axis2/trunk/java/modules/adb-codegen/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/pom.xml Sat May 23 14:34:24 2009
@@ -69,17 +69,25 @@
                     <exclude>**/*.java</exclude>
                 </excludes>
             </resource>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
         </resources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/adb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/adb/pom.xml Sat May 23 14:34:24 2009
@@ -72,17 +72,25 @@
                     <exclude>**/*.java</exclude>
                 </excludes>
             </resource>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
         </resources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
               <artifactId>maven-jar-plugin</artifactId>
               <configuration>
                 <archive>  

Modified: webservices/axis2/trunk/java/modules/clustering/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/clustering/pom.xml Sat May 23 14:34:24 2009
@@ -76,17 +76,25 @@
                     <exclude>**/*.java</exclude>
                 </excludes>
             </resource>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
         </resources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/codegen/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/codegen/pom.xml Sat May 23 14:34:24 2009
@@ -72,14 +72,6 @@
                     <exclude>**/*.java</exclude>
                 </excludes>
             </resource>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
         </resources>
         <testResources>
             <testResource>
@@ -114,6 +106,22 @@
             </testResource>
         </testResources>
         <plugins>
+            <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>

Modified: webservices/axis2/trunk/java/modules/corba/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/corba/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/corba/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/corba/pom.xml Sat May 23 14:34:24 2009
@@ -60,16 +60,6 @@
     <build>
         <sourceDirectory>src</sourceDirectory>
         <testSourceDirectory>test</testSourceDirectory>
-        <resources>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
         <testResources>
             <testResource>
                 <directory>test-resources</directory>
@@ -77,6 +67,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/fastinfoset/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/fastinfoset/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/fastinfoset/pom.xml Sat May 23 14:34:24 2009
@@ -117,14 +117,6 @@
                     <include>**/*</include>
                 </includes>
             </resource>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
         </resources>
         <testResources>
             <testResource>
@@ -138,6 +130,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/pom.xml Sat May 23 14:34:24 2009
@@ -93,17 +93,25 @@
                     <exclude>**/*.java</exclude>
                 </excludes>
             </resource>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
         </resources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/jaxbri/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxbri/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxbri/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxbri/pom.xml Sat May 23 14:34:24 2009
@@ -77,14 +77,6 @@
                     <exclude>**/*.java</exclude>
                 </excludes>
             </resource>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
         </resources>
         <testResources>
             <testResource>
@@ -97,6 +89,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/jaxws-mar/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-mar/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-mar/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws-mar/pom.xml Sat May 23 14:34:24 2009
@@ -59,14 +59,6 @@
                     <exclude>**/*.java</exclude>
                 </excludes>
             </resource>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
         </resources>
 
         <testResources>
@@ -81,6 +73,22 @@
 
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/pom.xml Sat May 23 14:34:24 2009
@@ -122,14 +122,6 @@
                     <include>**/*</include>
                 </includes>
             </resource>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
         </resources>
         <testResources>
             <testResource>
@@ -143,6 +135,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
               <artifactId>maven-jar-plugin</artifactId>
               <configuration>
                 <archive>  

Modified: webservices/axis2/trunk/java/modules/jibx/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jibx/pom.xml Sat May 23 14:34:24 2009
@@ -81,14 +81,6 @@
                     <exclude>**/*.java</exclude>
                 </excludes>
             </resource>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
         </resources>
         <sourceDirectory>src</sourceDirectory>
         <testSourceDirectory>test</testSourceDirectory>
@@ -103,6 +95,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/json/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/json/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/json/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/json/pom.xml Sat May 23 14:34:24 2009
@@ -56,16 +56,6 @@
     <build>
         <sourceDirectory>src</sourceDirectory>
         <testSourceDirectory>test</testSourceDirectory>
-        <resources>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
         <testResources>
             <testResource>
                 <directory>test-resources</directory>
@@ -73,6 +63,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/pom.xml Sat May 23 14:34:24 2009
@@ -129,14 +129,6 @@
                     <exclude>**/*.java</exclude>
                 </excludes>
             </resource>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
         </resources>
         <testResources>
             <testResource>
@@ -155,6 +147,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
               <artifactId>maven-jar-plugin</artifactId>
               <configuration>
                 <archive>  

Modified: webservices/axis2/trunk/java/modules/metadata/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/metadata/pom.xml Sat May 23 14:34:24 2009
@@ -96,14 +96,6 @@
         <testSourceDirectory>test</testSourceDirectory>
         <resources>
             <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
                 <directory>src</directory>
                 <excludes>
                     <exclude>**/*.java</exclude>
@@ -112,6 +104,22 @@
         </resources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
               <artifactId>maven-jar-plugin</artifactId>
               <configuration>
                 <archive>  

Modified: webservices/axis2/trunk/java/modules/mex/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/mex/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/mex/pom.xml Sat May 23 14:34:24 2009
@@ -44,14 +44,6 @@
         <testSourceDirectory>test</testSourceDirectory>
         <resources>
             <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
                 <directory>conf</directory>
                 <excludes>
                     <exclude>**/*.properties</exclude>
@@ -76,6 +68,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-mar-maven-plugin</artifactId>
                 <version>${version}</version>

Modified: webservices/axis2/trunk/java/modules/mtompolicy-mar/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mtompolicy-mar/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/mtompolicy-mar/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/mtompolicy-mar/pom.xml Sat May 23 14:34:24 2009
@@ -52,14 +52,6 @@
         <sourceDirectory>src</sourceDirectory>
         <resources>
             <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
                 <directory>src</directory>
                 <excludes>
                     <exclude>**/*.java</exclude>
@@ -74,6 +66,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/mtompolicy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mtompolicy/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/mtompolicy/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/mtompolicy/pom.xml Sat May 23 14:34:24 2009
@@ -46,14 +46,6 @@
         <sourceDirectory>src</sourceDirectory>
         <resources>
             <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
                 <directory>src</directory>
                 <excludes>
                     <exclude>**/*.java</exclude>
@@ -68,6 +60,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/osgi/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/osgi/pom.xml Sat May 23 14:34:24 2009
@@ -42,17 +42,25 @@
                 <directory>resources</directory>
                 <filtering>false</filtering>
             </resource>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
         </resources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <version>1.4.0</version>

Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Sat May 23 14:34:24 2009
@@ -1229,6 +1229,10 @@
                     <artifactId>maven-war-plugin</artifactId>
                     <version>2.1-alpha-1</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-remote-resources-plugin</artifactId>
+                    <version>1.0</version>                
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>

Modified: webservices/axis2/trunk/java/modules/ping/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/ping/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/ping/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/ping/pom.xml Sat May 23 14:34:24 2009
@@ -44,14 +44,6 @@
         <testSourceDirectory>test</testSourceDirectory>
         <resources>
             <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
                 <directory>conf</directory>
                 <excludes>
                     <exclude>**/*.properties</exclude>
@@ -76,6 +68,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Added: webservices/axis2/trunk/java/modules/resource-bundle/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/resource-bundle/pom.xml?rev=777934&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/resource-bundle/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/resource-bundle/pom.xml Sat May 23 14:34:24 2009
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements. See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership. The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.axis2</groupId>
+        <artifactId>axis2-parent</artifactId>
+        <version>SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
+    </parent>
+    <artifactId>axis2-resource-bundle</artifactId>
+    <name>Apache Axis2 - Resource bundle</name>
+    <description>Contains the legal files that must be included in all artifacts</description>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>bundle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: webservices/axis2/trunk/java/modules/resource-bundle/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/saaj/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/pom.xml Sat May 23 14:34:24 2009
@@ -100,14 +100,6 @@
         <testSourceDirectory>test</testSourceDirectory>
         <resources>
             <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
                 <directory>conf</directory>
             </resource>
         </resources>
@@ -125,6 +117,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
               <artifactId>maven-jar-plugin</artifactId>
               <configuration>
                 <archive>  

Modified: webservices/axis2/trunk/java/modules/samples/version/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/version/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/version/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/version/pom.xml Sat May 23 14:34:24 2009
@@ -31,18 +31,24 @@
     <name>Apache Axis2 - Version Service</name>
     <build>
         <sourceDirectory>src</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>            
-        </resources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/scripting/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/scripting/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/scripting/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/scripting/pom.xml Sat May 23 14:34:24 2009
@@ -56,14 +56,6 @@
         <testSourceDirectory>test</testSourceDirectory>
         <resources>
             <resource>
-                <directory>../../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
                 <directory>conf</directory>
                 <excludes>
                     <exclude>**/*.properties</exclude>
@@ -88,6 +80,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/spring/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/spring/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/spring/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/spring/pom.xml Sat May 23 14:34:24 2009
@@ -56,15 +56,23 @@
     </dependencies>
     <build>
         <sourceDirectory>src</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>

Modified: webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml Sat May 23 14:34:24 2009
@@ -94,16 +94,24 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>../../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
     <distributionManagement>
         <repository>

Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Sat May 23 14:34:24 2009
@@ -278,14 +278,6 @@
     </distributionManagement>
     <build>
         <resources>
-          <resource>
-              <directory>../../..</directory>
-              <includes>
-                  <include>NOTICE.txt</include>
-                  <include>LICENSE.txt</include>
-              </includes>
-              <filtering>false</filtering>
-          </resource>
             <resource>
                 <directory>src/main/java</directory>
                 <excludes>
@@ -295,6 +287,22 @@
         </resources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml Sat May 23 14:34:24 2009
@@ -183,14 +183,6 @@
     <build>
         <resources>
             <resource>
-                <directory>../../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
                 <directory>src/main/java</directory>
                 <excludes>
                     <exclude>**/*.java</exclude>
@@ -199,6 +191,22 @@
         </resources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml Sat May 23 14:34:24 2009
@@ -132,18 +132,26 @@
             <resource>
                 <directory>plugin</directory>
             </resource>
-            <resource>
-                <directory>../../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
         </resources>
 
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml Sat May 23 14:34:24 2009
@@ -37,18 +37,24 @@
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
         <testSourceDirectory>src/test/java</testSourceDirectory>
-        <resources>
-            <resource>
-                <directory>../../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Sat May 23 14:34:24 2009
@@ -86,18 +86,24 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>../../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/modules/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/xmlbeans/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xmlbeans/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/xmlbeans/pom.xml Sat May 23 14:34:24 2009
@@ -53,14 +53,6 @@
     <build>
         <resources>
             <resource>
-                <directory>../..</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
                 <directory>src</directory>
                 <excludes>
                     <exclude>**/*.java</exclude>
@@ -80,6 +72,22 @@
         </testResources>
         <plugins>
             <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>legal-files</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>

Modified: webservices/axis2/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/pom.xml?rev=777934&r1=777933&r2=777934&view=diff
==============================================================================
--- webservices/axis2/trunk/java/pom.xml (original)
+++ webservices/axis2/trunk/java/pom.xml Sat May 23 14:34:24 2009
@@ -34,6 +34,7 @@
     <packaging>pom</packaging>
     <name>Apache Axis2 - Root</name>
     <modules>
+        <module>modules/resource-bundle</module> <!-- Must be first in the list! -->
         <module>modules/adb</module>
         <module>modules/adb-codegen</module>
         <module>modules/addressing</module>



Mime
View raw message