You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/02/09 21:53:04 UTC
svn commit: r1242521 - in /axis/axis1/java/trunk: ./ axis-maven-plugin/
integration/ maven/ maven/maven-axis-server-plugin/
maven/maven-axis-server-plugin/src/ maven/maven-axis-server-plugin/src/main/
maven/maven-axis-server-plugin/src/main/java/ maven...
Author: veithen
Date: Thu Feb 9 20:53:02 2012
New Revision: 1242521
URL: http://svn.apache.org/viewvc?rev=1242521&view=rev
Log:
Split axis-maven-plugin into two distinct plugins.
Added:
axis/axis1/java/trunk/maven/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/pom.xml (with props)
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java
- copied, changed from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/DefaultServerManager.java
- copied unchanged from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/DefaultServerManager.java
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/FileSet.java
- copied unchanged from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/FileSet.java
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/Server.java
- copied unchanged from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/Server.java
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/ServerManager.java
- copied unchanged from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/ServerManager.java
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/StartServerMojo.java
- copied unchanged from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/StartServerMojo.java
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/StopServerMojo.java
- copied unchanged from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/StopServerMojo.java
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/StreamPump.java
- copied unchanged from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/StreamPump.java
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/resources/
- copied from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/resources/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/pom.xml (with props)
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java
- copied, changed from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/Mapping.java
- copied unchanged from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/Mapping.java
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/Wsdl2JavaMojo.java
- copied unchanged from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/Wsdl2JavaMojo.java
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/Wsdl2JavaTestMojo.java
- copied unchanged from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/Wsdl2JavaTestMojo.java
axis/axis1/java/trunk/maven/pom.xml (with props)
Removed:
axis/axis1/java/trunk/axis-maven-plugin/
Modified:
axis/axis1/java/trunk/integration/pom.xml
axis/axis1/java/trunk/pom.xml
axis/axis1/java/trunk/samples/attachments-sample/pom.xml
axis/axis1/java/trunk/samples/bidbuy-sample/pom.xml
axis/axis1/java/trunk/samples/echo-sample/pom.xml
axis/axis1/java/trunk/samples/encoding-sample/pom.xml
axis/axis1/java/trunk/samples/faults-sample/pom.xml
axis/axis1/java/trunk/samples/handler-sample/pom.xml
axis/axis1/java/trunk/samples/message-sample/pom.xml
axis/axis1/java/trunk/samples/misc-sample/pom.xml
axis/axis1/java/trunk/samples/proxy-sample/pom.xml
axis/axis1/java/trunk/samples/stock-sample/pom.xml
axis/axis1/java/trunk/samples/transport-sample/pom.xml
Modified: axis/axis1/java/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1242521&r1=1242520&r2=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Thu Feb 9 20:53:02 2012
@@ -54,7 +54,7 @@
<plugins>
<plugin>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-maven-plugin</artifactId>
+ <artifactId>maven-wsdl2java-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<output>${project.build.directory}/work</output>
@@ -879,6 +879,13 @@
</mappings>
</configuration>
</execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>maven-axis-server-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
<execution>
<id>start-server</id>
<goals>
Added: axis/axis1/java/trunk/maven/maven-axis-server-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/pom.xml?rev=1242521&view=auto
==============================================================================
--- axis/axis1/java/trunk/maven/maven-axis-server-plugin/pom.xml (added)
+++ axis/axis1/java/trunk/maven/maven-axis-server-plugin/pom.xml Thu Feb 9 20:53:02 2012
@@ -0,0 +1,65 @@
+<?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.axis</groupId>
+ <artifactId>maven</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>maven-axis-server-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>Axis server plugin</name>
+ <description>
+ Axis server Maven plugin.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.github.veithen.ulog</groupId>
+ <artifactId>ulog</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-toolchain</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.9</version>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: axis/axis1/java/trunk/maven/maven-axis-server-plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java (from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java?p2=axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java&p1=axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java&r1=1242481&r2=1242521&rev=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java (original)
+++ axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/AbstractServerMojo.java Thu Feb 9 20:53:02 2012
@@ -18,7 +18,18 @@
*/
package org.apache.axis.maven;
-public abstract class AbstractServerMojo extends AbstractAxisMojo {
+import org.apache.maven.plugin.AbstractMojo;
+
+import com.github.veithen.ulog.PlexusLoggerInjector;
+
+public abstract class AbstractServerMojo extends AbstractMojo {
+ /**
+ * @component
+ */
+ // This is necessary to set up logging such that all messages logged by the Axis
+ // libraries through commons logging are redirected to Plexus logs.
+ PlexusLoggerInjector loggerInjector;
+
/**
* The port of the Axis server.
*
Added: axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/pom.xml?rev=1242521&view=auto
==============================================================================
--- axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/pom.xml (added)
+++ axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/pom.xml Thu Feb 9 20:53:02 2012
@@ -0,0 +1,60 @@
+<?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.axis</groupId>
+ <artifactId>maven</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>maven-wsdl2java-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>wsdl2java plugin</name>
+ <description>
+ Axis wsdl2java Maven plugin.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.github.veithen.ulog</groupId>
+ <artifactId>ulog</artifactId>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.9</version>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java (from r1242481, axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java?p2=axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java&p1=axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java&r1=1242481&r2=1242521&rev=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java (original)
+++ axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java Thu Feb 9 20:53:02 2012
@@ -24,11 +24,21 @@ import java.util.HashMap;
import org.apache.axis.constants.Scope;
import org.apache.axis.wsdl.toJava.Emitter;
+import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
-public abstract class AbstractWsdl2JavaMojo extends AbstractAxisMojo {
+import com.github.veithen.ulog.PlexusLoggerInjector;
+
+public abstract class AbstractWsdl2JavaMojo extends AbstractMojo {
+ /**
+ * @component
+ */
+ // This is necessary to set up logging such that all messages logged by the Axis
+ // libraries through commons logging are redirected to Plexus logs.
+ PlexusLoggerInjector loggerInjector;
+
/**
* The maven project.
*
Added: axis/axis1/java/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/pom.xml?rev=1242521&view=auto
==============================================================================
--- axis/axis1/java/trunk/maven/pom.xml (added)
+++ axis/axis1/java/trunk/maven/pom.xml Thu Feb 9 20:53:02 2012
@@ -0,0 +1,88 @@
+<?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.axis</groupId>
+ <artifactId>axis-project</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>maven</artifactId>
+ <name>Maven plugins</name>
+ <packaging>pom</packaging>
+ <description>
+ Root POM for the Axis Maven plugins.
+ </description>
+ <properties>
+ <maven.version>2.0.9</maven.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <!-- commons-logging is replaced by ulog -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <!-- ulog allows to easily redirect commons logging to Plexus logging -->
+ <dependency>
+ <groupId>com.github.veithen.ulog</groupId>
+ <artifactId>ulog</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <modules>
+ <module>maven-wsdl2java-plugin</module>
+ <module>maven-axis-server-plugin</module>
+ </modules>
+
+ <!-- TODO: remove this once a ulog release is deployed to Maven Central -->
+ <repositories>
+ <repository>
+ <id>veithen-github-mvn-repo</id>
+ <url>https://raw.github.com/veithen/mvn-repo/master/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+</project>
Propchange: axis/axis1/java/trunk/maven/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis1/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1242521&r1=1242520&r2=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Thu Feb 9 20:53:02 2012
@@ -61,7 +61,7 @@
<module>axis-jaxrpc</module>
<module>axis-saaj</module>
<module>axis-ant</module>
- <module>axis-maven-plugin</module>
+ <module>maven</module>
<module>axis-standalone-server</module>
<module>axis-castor</module>
<module>axis-jms</module>
@@ -154,19 +154,4 @@
</plugin>
</plugins>
</reporting>
-
- <!-- TODO: remove this once a ulog release is deployed to Maven Central -->
- <repositories>
- <repository>
- <id>veithen-github-mvn-repo</id>
- <url>https://raw.github.com/veithen/mvn-repo/master/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
</project>
Modified: axis/axis1/java/trunk/samples/attachments-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/attachments-sample/pom.xml?rev=1242521&r1=1242520&r2=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/attachments-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/attachments-sample/pom.xml Thu Feb 9 20:53:02 2012
@@ -59,7 +59,7 @@
</plugin>
<plugin>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-maven-plugin</artifactId>
+ <artifactId>maven-axis-server-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
Modified: axis/axis1/java/trunk/samples/bidbuy-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/bidbuy-sample/pom.xml?rev=1242521&r1=1242520&r2=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/bidbuy-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/bidbuy-sample/pom.xml Thu Feb 9 20:53:02 2012
@@ -59,7 +59,7 @@
</plugin>
<plugin>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-maven-plugin</artifactId>
+ <artifactId>maven-axis-server-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
Modified: axis/axis1/java/trunk/samples/echo-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/echo-sample/pom.xml?rev=1242521&r1=1242520&r2=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/echo-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/echo-sample/pom.xml Thu Feb 9 20:53:02 2012
@@ -43,7 +43,7 @@
<plugins>
<plugin>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-maven-plugin</artifactId>
+ <artifactId>maven-wsdl2java-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<!-- TODO: the Maven plugin should have a default here -->
Modified: axis/axis1/java/trunk/samples/encoding-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/encoding-sample/pom.xml?rev=1242521&r1=1242520&r2=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/encoding-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/encoding-sample/pom.xml Thu Feb 9 20:53:02 2012
@@ -59,7 +59,7 @@
</plugin>
<plugin>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-maven-plugin</artifactId>
+ <artifactId>maven-axis-server-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
Modified: axis/axis1/java/trunk/samples/faults-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/faults-sample/pom.xml?rev=1242521&r1=1242520&r2=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/faults-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/faults-sample/pom.xml Thu Feb 9 20:53:02 2012
@@ -59,7 +59,7 @@
</plugin>
<plugin>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-maven-plugin</artifactId>
+ <artifactId>maven-axis-server-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
Modified: axis/axis1/java/trunk/samples/handler-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/handler-sample/pom.xml?rev=1242521&r1=1242520&r2=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/handler-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/handler-sample/pom.xml Thu Feb 9 20:53:02 2012
@@ -59,7 +59,7 @@
</plugin>
<plugin>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-maven-plugin</artifactId>
+ <artifactId>maven-axis-server-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
Modified: axis/axis1/java/trunk/samples/message-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/message-sample/pom.xml?rev=1242521&r1=1242520&r2=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/message-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/message-sample/pom.xml Thu Feb 9 20:53:02 2012
@@ -59,7 +59,7 @@
</plugin>
<plugin>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-maven-plugin</artifactId>
+ <artifactId>maven-axis-server-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
Modified: axis/axis1/java/trunk/samples/misc-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/misc-sample/pom.xml?rev=1242521&r1=1242520&r2=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/misc-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/misc-sample/pom.xml Thu Feb 9 20:53:02 2012
@@ -59,7 +59,7 @@
</plugin>
<plugin>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-maven-plugin</artifactId>
+ <artifactId>maven-axis-server-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
Modified: axis/axis1/java/trunk/samples/proxy-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/proxy-sample/pom.xml?rev=1242521&r1=1242520&r2=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/proxy-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/proxy-sample/pom.xml Thu Feb 9 20:53:02 2012
@@ -70,7 +70,7 @@
</plugin>
<plugin>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-maven-plugin</artifactId>
+ <artifactId>maven-axis-server-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
Modified: axis/axis1/java/trunk/samples/stock-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/stock-sample/pom.xml?rev=1242521&r1=1242520&r2=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/stock-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/stock-sample/pom.xml Thu Feb 9 20:53:02 2012
@@ -59,7 +59,7 @@
</plugin>
<plugin>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-maven-plugin</artifactId>
+ <artifactId>maven-axis-server-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
Modified: axis/axis1/java/trunk/samples/transport-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/transport-sample/pom.xml?rev=1242521&r1=1242520&r2=1242521&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/transport-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/transport-sample/pom.xml Thu Feb 9 20:53:02 2012
@@ -65,7 +65,7 @@
</plugin>
<plugin>
<groupId>${project.groupId}</groupId>
- <artifactId>axis-maven-plugin</artifactId>
+ <artifactId>maven-axis-server-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>