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 di...@apache.org on 2008/03/13 15:16:57 UTC
svn commit: r636773 - in /webservices/axis2/trunk/java: ./
modules/distribution/ modules/distribution/src/main/assembly/
modules/documentation/ modules/mex-mar/ modules/mex/
modules/mex/src/META-INF/ modules/webapp/ release-docs/readme-files/
Author: dims
Date: Thu Mar 13 07:16:51 2008
New Revision: 636773
URL: http://svn.apache.org/viewvc?rev=636773&view=rev
Log:
Fix for AXIS2-3284 - MEX module does not contain implementation class files after build : eliminate the extra maven module as well
Added:
webservices/axis2/trunk/java/modules/mex/src/META-INF/
webservices/axis2/trunk/java/modules/mex/src/META-INF/module.xml
Removed:
webservices/axis2/trunk/java/modules/mex-mar/
Modified:
webservices/axis2/trunk/java/modules/distribution/pom.xml
webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml
webservices/axis2/trunk/java/modules/documentation/pom.xml
webservices/axis2/trunk/java/modules/mex/pom.xml
webservices/axis2/trunk/java/modules/webapp/pom.xml
webservices/axis2/trunk/java/pom.xml
webservices/axis2/trunk/java/release-docs/readme-files/README-std-src.txt
Modified: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?rev=636773&r1=636772&r2=636773&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Thu Mar 13 07:16:51 2008
@@ -335,7 +335,7 @@
tofile="target/tmp-repository/modules/addressing-${addressing.mar.version}.mar"/>
<copy file="../../modules/ping/target/ping-${version}.mar"
tofile="target/tmp-repository/modules/ping-${ping.mar.version}.mar"/>
- <copy file="../../modules/mex-mar/target/mex-${version}.mar"
+ <copy file="../../modules/mex/target/mex-impl-${version}.mar"
tofile="target/tmp-repository/modules/mex-${mex.mar.version}.mar"/>
<copy file="../../modules/scripting/target/axis2-scripting-${version}.mar"
tofile="target/tmp-repository/modules/scripting-${scripting.mar.version}.mar"/>
Modified: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml?rev=636773&r1=636772&r2=636773&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml Thu Mar 13 07:16:51 2008
@@ -30,7 +30,6 @@
<include>modules/kernel/**</include>
<include>modules/metadata/**</include>
<include>modules/mex/**</include>
- <include>modules/mex-mar/**</include>
<include>modules/mtompolicy/**</include>
<include>modules/parent/**</include>
<include>modules/ping/**</include>
Modified: webservices/axis2/trunk/java/modules/documentation/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/pom.xml?rev=636773&r1=636772&r2=636773&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/pom.xml Thu Mar 13 07:16:51 2008
@@ -318,10 +318,6 @@
<include name="org/apache/axis2/**"/>
<include name="javax/**"/>
</packageset>
- <packageset dir="../../modules/mex-mar/src" defaultexcludes="yes">
- <include name="org/apache/axis2/**"/>
- <include name="javax/**"/>
- </packageset>
<packageset dir="../../modules/mtompolicy/src" defaultexcludes="yes">
<include name="org/apache/axis2/**"/>
<include name="javax/**"/>
Modified: webservices/axis2/trunk/java/modules/mex/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex/pom.xml?rev=636773&r1=636772&r2=636773&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/mex/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/mex/pom.xml Thu Mar 13 07:16:51 2008
@@ -66,6 +66,24 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mar-maven-plugin</artifactId>
+ <version>${version}</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>generate-mar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>mar</goal>
+ </goals>
+ <configuration>
+ <includeDependencies>false</includeDependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
Added: webservices/axis2/trunk/java/modules/mex/src/META-INF/module.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex/src/META-INF/module.xml?rev=636773&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/mex/src/META-INF/module.xml (added)
+++ webservices/axis2/trunk/java/modules/mex/src/META-INF/module.xml Thu Mar 13 07:16:51 2008
@@ -0,0 +1,31 @@
+<!--
+ ~ 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.
+ -->
+
+<module name="metadataExchange" class="org.apache.axis2.mex.MetadataExchangeModule">
+ <operation name="getMetadata" mep="http://www.w3.org/2004/08/wsdl/in-out">
+ <messageReceiver class="org.apache.axis2.mex.MexMessageReceiver"/>
+
+ <!-- namespaces for the 2004-09 spec -->
+
+ <actionMapping>http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Request</actionMapping>
+ <outputActionMapping>http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Response</outputActionMapping>
+
+ </operation>
+
+</module>
Modified: webservices/axis2/trunk/java/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/pom.xml?rev=636773&r1=636772&r2=636773&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/webapp/pom.xml Thu Mar 13 07:16:51 2008
@@ -1358,7 +1358,7 @@
</includes>
</resource>
<resource>
- <directory>${basedir}/../mex-mar/target</directory>
+ <directory>${basedir}/../mex/target</directory>
<targetPath>WEB-INF/modules</targetPath>
<includes>
<include>mex*.mar</include>
Modified: webservices/axis2/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/pom.xml?rev=636773&r1=636772&r2=636773&view=diff
==============================================================================
--- webservices/axis2/trunk/java/pom.xml (original)
+++ webservices/axis2/trunk/java/pom.xml Thu Mar 13 07:16:51 2008
@@ -43,7 +43,6 @@
<module>modules/json</module>
<module>modules/kernel</module>
<module>modules/mex</module>
- <module>modules/mex-mar</module>
<module>modules/mtompolicy</module>
<module>modules/parent</module>
<module>modules/ping</module>
Modified: webservices/axis2/trunk/java/release-docs/readme-files/README-std-src.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/release-docs/readme-files/README-std-src.txt?rev=636773&r1=636772&r2=636773&view=diff
==============================================================================
--- webservices/axis2/trunk/java/release-docs/readme-files/README-std-src.txt (original)
+++ webservices/axis2/trunk/java/release-docs/readme-files/README-std-src.txt Thu Mar 13 07:16:51 2008
@@ -28,19 +28,18 @@
16. kernel
17. metadata
18. mex
-19. mex-mar
-20. mtompolicy
-21. parent
-22. ping
-23. saaj
-24. saaj-api
-25. samples
-26. scripting
-27. soapmonitor
-28. spring
-29. tool
-30. webapp
-31. xmlbeans
+19. mtompolicy
+20. parent
+21. ping
+22. saaj
+23. saaj-api
+24. samples
+25. scripting
+26. soapmonitor
+27. spring
+28. tool
+29. webapp
+30. xmlbeans
One can use maven 2.x to create the Standard Binary Distribution from this,
by typing "mvn clean install".
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org