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 ru...@apache.org on 2007/05/01 16:09:29 UTC
svn commit: r534098 - in /webservices/axis2/trunk/java: ./ modules/mex-mar/
modules/mex-mar/src/ modules/mex-mar/src/META-INF/ modules/mex/
modules/mex/src/META-INF/ modules/mex/src/org/apache/axis2/mex/
Author: ruchithf
Date: Tue May 1 07:09:27 2007
New Revision: 534098
URL: http://svn.apache.org/viewvc?view=rev&rev=534098
Log:
Added the mex-mar module and changed the mex module to produce the mex-impl.jar
Added:
webservices/axis2/trunk/java/modules/mex-mar/
webservices/axis2/trunk/java/modules/mex-mar/maven.xml
webservices/axis2/trunk/java/modules/mex-mar/pom.xml
webservices/axis2/trunk/java/modules/mex-mar/project.xml
webservices/axis2/trunk/java/modules/mex-mar/src/
webservices/axis2/trunk/java/modules/mex-mar/src/META-INF/
webservices/axis2/trunk/java/modules/mex-mar/src/META-INF/module.xml
Removed:
webservices/axis2/trunk/java/modules/mex/src/META-INF/
Modified:
webservices/axis2/trunk/java/modules/mex/maven.xml
webservices/axis2/trunk/java/modules/mex/pom.xml
webservices/axis2/trunk/java/modules/mex/project.xml
webservices/axis2/trunk/java/modules/mex/src/org/apache/axis2/mex/MexDisabledException.java
webservices/axis2/trunk/java/modules/mex/src/org/apache/axis2/mex/MexException.java
webservices/axis2/trunk/java/pom.xml
Added: webservices/axis2/trunk/java/modules/mex-mar/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex-mar/maven.xml?view=auto&rev=534098
==============================================================================
--- webservices/axis2/trunk/java/modules/mex-mar/maven.xml (added)
+++ webservices/axis2/trunk/java/modules/mex-mar/maven.xml Tue May 1 07:09:27 2007
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2007 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+ -->
+
+<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
+
+<project default="jar"
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:maven="jelly:maven"
+ xmlns:deploy="deploy"
+ xmlns:ant="jelly:ant">
+ <postGoal name="java:compile">
+ <mkdir dir="target/classes/META-INF"/>
+ <copy file="src/META-INF/module.xml"
+ tofile="target/classes/META-INF/module.xml"/>
+ <copy file="../../LICENSE.txt"
+ tofile="target/classes/META-INF/LICENSE.txt" overwrite="true"/>
+ <copy file="../../NOTICE.txt"
+ tofile="target/classes/META-INF/NOTICE.txt" overwrite="true"/>
+ <mkdir dir="target/modules"/>
+ <jar jarfile="target/mex-${mex_version}.mar" basedir="target/classes">
+ <include name="**"/>
+ </jar>
+ <copy file="target/mex-${mex_version}.mar"
+ tofile="target/modules/mex-${mex_version}.mar"/>
+ <copy file="target/mex-${mex_version}.mar"
+ tofile="${maven.repo.local}/org.apache.axis2/mars/mex-${mex_version}.mar"/>
+ </postGoal>
+ </project>
Added: webservices/axis2/trunk/java/modules/mex-mar/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex-mar/pom.xml?view=auto&rev=534098
==============================================================================
--- webservices/axis2/trunk/java/modules/mex-mar/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/mex-mar/pom.xml Tue May 1 07:09:27 2007
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! Licensed 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>mex</artifactId>
+ <packaging>mar</packaging>
+ <name>Apache Axis 2.0 - MEX-Module</name>
+ <description>WS-Metadata Exchange : Axis2 Module</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>mex-impl</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>conf</directory>
+ <excludes>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <targetPath>../test-resources</targetPath>
+ <directory>test-resources</directory>
+ <includes>
+ <include>**/**</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mar-maven-plugin</artifactId>
+ <version>${version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <includeDependencies>false</includeDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: webservices/axis2/trunk/java/modules/mex-mar/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex-mar/project.xml?view=auto&rev=534098
==============================================================================
--- webservices/axis2/trunk/java/modules/mex-mar/project.xml (added)
+++ webservices/axis2/trunk/java/modules/mex-mar/project.xml Tue May 1 07:09:27 2007
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+
+ <name>Apache Axis 2.0 - Metadata Exchange</name>
+ <id>axis2-mex</id>
+ <groupId>org.apache.axis2</groupId>
+ <description>WS-MetadataExchange : Axis2 module </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>mex-impl</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <!-- external JARs -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>${stax.impl.groupid}</groupId>
+ <artifactId>${stax.impl.artifactid}</artifactId>
+ <version>${stax.impl.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax.api.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${neethi.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>../../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ <reports/>
+</project>
Added: webservices/axis2/trunk/java/modules/mex-mar/src/META-INF/module.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex-mar/src/META-INF/module.xml?view=auto&rev=534098
==============================================================================
--- webservices/axis2/trunk/java/modules/mex-mar/src/META-INF/module.xml (added)
+++ webservices/axis2/trunk/java/modules/mex-mar/src/META-INF/module.xml Tue May 1 07:09:27 2007
@@ -0,0 +1,30 @@
+<!--
+/*
+ * Copyright 2007 The Apache Software Foundation.
+ *
+ * Licensed 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/mex/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex/maven.xml?view=diff&rev=534098&r1=534097&r2=534098
==============================================================================
--- webservices/axis2/trunk/java/modules/mex/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/mex/maven.xml Tue May 1 07:09:27 2007
@@ -25,21 +25,4 @@
xmlns:maven="jelly:maven"
xmlns:deploy="deploy"
xmlns:ant="jelly:ant">
- <postGoal name="java:compile">
- <mkdir dir="target/classes/META-INF"/>
- <copy file="src/META-INF/module.xml"
- tofile="target/classes/META-INF/module.xml"/>
- <copy file="../../LICENSE.txt"
- tofile="target/classes/META-INF/LICENSE.txt" overwrite="true"/>
- <copy file="../../NOTICE.txt"
- tofile="target/classes/META-INF/NOTICE.txt" overwrite="true"/>
- <mkdir dir="target/modules"/>
- <jar jarfile="target/mex-${mex_version}.mar" basedir="target/classes">
- <include name="**"/>
- </jar>
- <copy file="target/mex-${mex_version}.mar"
- tofile="target/modules/mex-${mex_version}.mar"/>
- <copy file="target/mex-${mex_version}.mar"
- tofile="${maven.repo.local}/org.apache.axis2/mars/mex-${mex_version}.mar"/>
- </postGoal>
- </project>
+</project>
Modified: webservices/axis2/trunk/java/modules/mex/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex/pom.xml?view=diff&rev=534098&r1=534097&r2=534098
==============================================================================
--- webservices/axis2/trunk/java/modules/mex/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/mex/pom.xml Tue May 1 07:09:27 2007
@@ -23,7 +23,7 @@
<version>SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
- <artifactId>mex</artifactId>
+ <artifactId>mex-impl</artifactId>
<packaging>jar</packaging>
<name>Apache Axis 2.0 - MEX</name>
<description>WS-Metadata Exchange implementation</description>
@@ -67,15 +67,6 @@
<inherited>true</inherited>
<configuration>
<skip>false</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-mar-maven-plugin</artifactId>
- <version>${version}</version>
- <extensions>true</extensions>
- <configuration>
- <includeDependencies>false</includeDependencies>
</configuration>
</plugin>
</plugins>
Modified: webservices/axis2/trunk/java/modules/mex/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex/project.xml?view=diff&rev=534098&r1=534097&r2=534098
==============================================================================
--- webservices/axis2/trunk/java/modules/mex/project.xml (original)
+++ webservices/axis2/trunk/java/modules/mex/project.xml Tue May 1 07:09:27 2007
@@ -21,7 +21,7 @@
<extend>../../etc/project.xml</extend>
<name>Apache Axis 2.0 - Metadata Exchange</name>
- <id>axis2-mex</id>
+ <id>mex-impl</id>
<groupId>org.apache.axis2</groupId>
<description>WS-MetadataExchange implementation</description>
Modified: webservices/axis2/trunk/java/modules/mex/src/org/apache/axis2/mex/MexDisabledException.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex/src/org/apache/axis2/mex/MexDisabledException.java?view=diff&rev=534098&r1=534097&r2=534098
==============================================================================
--- webservices/axis2/trunk/java/modules/mex/src/org/apache/axis2/mex/MexDisabledException.java (original)
+++ webservices/axis2/trunk/java/modules/mex/src/org/apache/axis2/mex/MexDisabledException.java Tue May 1 07:09:27 2007
@@ -1,9 +1,10 @@
package org.apache.axis2.mex;
public class MexDisabledException extends MexException {
- private static final long serialVersionUID = 1L;
- public MexDisabledException(String message) {
+ private static final long serialVersionUID = 890952871867880606L;
+
+ public MexDisabledException(String message) {
super(message);
}
Modified: webservices/axis2/trunk/java/modules/mex/src/org/apache/axis2/mex/MexException.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex/src/org/apache/axis2/mex/MexException.java?view=diff&rev=534098&r1=534097&r2=534098
==============================================================================
--- webservices/axis2/trunk/java/modules/mex/src/org/apache/axis2/mex/MexException.java (original)
+++ webservices/axis2/trunk/java/modules/mex/src/org/apache/axis2/mex/MexException.java Tue May 1 07:09:27 2007
@@ -24,12 +24,10 @@
*
*/
public class MexException extends AxisFault {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
- public MexException(String message) {
+ private static final long serialVersionUID = 3398692344266837690L;
+
+ public MexException(String message) {
super(message);
}
Modified: webservices/axis2/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/pom.xml?view=diff&rev=534098&r1=534097&r2=534098
==============================================================================
--- webservices/axis2/trunk/java/pom.xml (original)
+++ webservices/axis2/trunk/java/pom.xml Tue May 1 07:09:27 2007
@@ -39,6 +39,7 @@
<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>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org