axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r651786 - in /webservices/axis2/trunk/java/modules: metadata/ mex/ mtompolicy/ ping/ saaj-api/ saaj/ samples/jaxws-calculator/ scripting/ soapmonitor/ spring/ tool/axis2-aar-maven-plugin/ tool/axis2-ant-plugin/ tool/axis2-eclipse-codegen-pl...
Date Sat, 26 Apr 2008 02:13:28 GMT
Author: dims
Date: Fri Apr 25 19:13:23 2008
New Revision: 651786

URL: http://svn.apache.org/viewvc?rev=651786&view=rev
Log:
sync with 1.4 branch

Modified:
    webservices/axis2/trunk/java/modules/metadata/pom.xml
    webservices/axis2/trunk/java/modules/mex/pom.xml
    webservices/axis2/trunk/java/modules/mtompolicy/pom.xml
    webservices/axis2/trunk/java/modules/ping/pom.xml
    webservices/axis2/trunk/java/modules/saaj-api/pom.xml
    webservices/axis2/trunk/java/modules/saaj/pom.xml
    webservices/axis2/trunk/java/modules/samples/jaxws-calculator/README.txt
    webservices/axis2/trunk/java/modules/scripting/pom.xml
    webservices/axis2/trunk/java/modules/soapmonitor/pom.xml
    webservices/axis2/trunk/java/modules/spring/pom.xml
    webservices/axis2/trunk/java/modules/tool/axis2-aar-maven-plugin/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-mar-maven-plugin/pom.xml
    webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
    webservices/axis2/trunk/java/modules/xmlbeans/pom.xml

Modified: webservices/axis2/trunk/java/modules/metadata/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/pom.xml?rev=651786&r1=651785&r2=651786&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/metadata/pom.xml Fri Apr 25 19:13:23 2008
@@ -90,6 +90,14 @@
         <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>

Modified: webservices/axis2/trunk/java/modules/mex/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex/pom.xml?rev=651786&r1=651785&r2=651786&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/mex/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/mex/pom.xml Fri Apr 25 19:13:23 2008
@@ -44,6 +44,14 @@
         <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>

Modified: webservices/axis2/trunk/java/modules/mtompolicy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mtompolicy/pom.xml?rev=651786&r1=651785&r2=651786&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/mtompolicy/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/mtompolicy/pom.xml Fri Apr 25 19:13:23 2008
@@ -46,6 +46,14 @@
         <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>

Modified: webservices/axis2/trunk/java/modules/ping/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/ping/pom.xml?rev=651786&r1=651785&r2=651786&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/ping/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/ping/pom.xml Fri Apr 25 19:13:23 2008
@@ -44,6 +44,14 @@
         <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>

Modified: webservices/axis2/trunk/java/modules/saaj-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj-api/pom.xml?rev=651786&r1=651785&r2=651786&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj-api/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj-api/pom.xml Fri Apr 25 19:13:23 2008
@@ -47,6 +47,16 @@
     </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-jar-plugin</artifactId>

Modified: webservices/axis2/trunk/java/modules/saaj/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/pom.xml?rev=651786&r1=651785&r2=651786&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/pom.xml Fri Apr 25 19:13:23 2008
@@ -78,6 +78,14 @@
         <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>

Modified: webservices/axis2/trunk/java/modules/samples/jaxws-calculator/README.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/jaxws-calculator/README.txt?rev=651786&r1=651785&r2=651786&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/jaxws-calculator/README.txt (original)
+++ webservices/axis2/trunk/java/modules/samples/jaxws-calculator/README.txt Fri Apr 25 19:13:23
2008
@@ -42,3 +42,8 @@
 Improvements
 ============
 Make this sample run possible with ant 
+
+
+**** WARNING ****
+Please Remove xalan jar from <AXIS2_HOME>/ before you start axis2 server. If you are
using this
+sample inside a WAR, please remove xalan jar from WEB-INF/lib

Modified: webservices/axis2/trunk/java/modules/scripting/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/scripting/pom.xml?rev=651786&r1=651785&r2=651786&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/scripting/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/scripting/pom.xml Fri Apr 25 19:13:23 2008
@@ -56,6 +56,14 @@
         <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>

Modified: webservices/axis2/trunk/java/modules/soapmonitor/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/soapmonitor/pom.xml?rev=651786&r1=651785&r2=651786&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/soapmonitor/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/soapmonitor/pom.xml Fri Apr 25 19:13:23 2008
@@ -48,6 +48,14 @@
         <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>

Modified: webservices/axis2/trunk/java/modules/spring/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/spring/pom.xml?rev=651786&r1=651785&r2=651786&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/spring/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/spring/pom.xml Fri Apr 25 19:13:23 2008
@@ -60,5 +60,15 @@
     </dependencies>
     <build>
         <sourceDirectory>src</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>../..</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                    <include>LICENSE.txt</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: webservices/axis2/trunk/java/modules/tool/axis2-aar-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-aar-maven-plugin/pom.xml?rev=651786&r1=651785&r2=651786&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-aar-maven-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-aar-maven-plugin/pom.xml Fri Apr 25 19:13:23
2008
@@ -66,6 +66,25 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>../../..</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                    <include>LICENSE.txt</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+    </build>
     <developers>
         <developer>
             <id>jochen</id>

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=651786&r1=651785&r2=651786&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 Fri Apr 25 19:13:23
2008
@@ -93,6 +93,18 @@
             <artifactId>ant</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>../../..</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                    <include>LICENSE.txt</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+    </build>
     <distributionManagement>
         <repository>
             <id>apache-repo</id>

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=651786&r1=651785&r2=651786&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 Fri Apr
25 19:13:23 2008
@@ -268,6 +268,14 @@
     </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>
             </resource>

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=651786&r1=651785&r2=651786&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 Fri Apr
25 19:13:23 2008
@@ -183,6 +183,14 @@
     <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>
             </resource>
         </resources>

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=651786&r1=651785&r2=651786&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 Fri Apr 25 19:13:23
2008
@@ -132,6 +132,14 @@
             <resource>
                 <directory>plugin</directory>
             </resource>
+            <resource>
+                <directory>../../..</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                    <include>LICENSE.txt</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
         </resources>
 
         <plugins>

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=651786&r1=651785&r2=651786&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 Fri Apr
25 19:13:23 2008
@@ -37,6 +37,16 @@
     <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-surefire-plugin</artifactId>

Modified: webservices/axis2/trunk/java/modules/tool/axis2-mar-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-mar-maven-plugin/pom.xml?rev=651786&r1=651785&r2=651786&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-mar-maven-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-mar-maven-plugin/pom.xml Fri Apr 25 19:13:23
2008
@@ -67,6 +67,25 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>../../..</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                    <include>LICENSE.txt</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+    </build>
     <developers>
         <developer>
             <id>jochen</id>

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=651786&r1=651785&r2=651786&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 Fri Apr
25 19:13:23 2008
@@ -86,6 +86,16 @@
         </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-surefire-plugin</artifactId>

Modified: webservices/axis2/trunk/java/modules/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/xmlbeans/pom.xml?rev=651786&r1=651785&r2=651786&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xmlbeans/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/xmlbeans/pom.xml Fri Apr 25 19:13:23 2008
@@ -53,6 +53,14 @@
     <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>



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


Mime
View raw message