You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by jo...@apache.org on 2006/10/27 02:54:59 UTC
svn commit: r468217 - in /webservices/axis2/branches/java/1_1: ./
modules/adb-codegen/ modules/adb/ modules/codegen/ modules/java2wsdl/
modules/kernel/ modules/parent/ modules/tool/
modules/tool/axis2-aar-maven-plugin/ modules/tool/axis2-java2wsdl-mave...
Author: jochen
Date: Thu Oct 26 17:54:58 2006
New Revision: 468217
URL: http://svn.apache.org/viewvc?view=rev&rev=468217
Log:
Enabling Maven 2 build for the tool directory.
Modified:
webservices/axis2/branches/java/1_1/modules/adb-codegen/pom.xml
webservices/axis2/branches/java/1_1/modules/adb/pom.xml
webservices/axis2/branches/java/1_1/modules/codegen/pom.xml
webservices/axis2/branches/java/1_1/modules/java2wsdl/pom.xml
webservices/axis2/branches/java/1_1/modules/kernel/pom.xml
webservices/axis2/branches/java/1_1/modules/parent/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/axis2-aar-maven-plugin/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
webservices/axis2/branches/java/1_1/modules/tool/pom.xml
webservices/axis2/branches/java/1_1/pom.xml
Modified: webservices/axis2/branches/java/1_1/modules/adb-codegen/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb-codegen/pom.xml?view=diff&rev=468217&r1=468216&r2=468217
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb-codegen/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/adb-codegen/pom.xml Thu Oct 26 17:54:58 2006
@@ -47,6 +47,22 @@
</dependencies>
<build>
- <sourceDirectory>src</sourceDirectory>
+ <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>
</build>
</project>
Modified: webservices/axis2/branches/java/1_1/modules/adb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/pom.xml?view=diff&rev=468217&r1=468216&r2=468217
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/adb/pom.xml Thu Oct 26 17:54:58 2006
@@ -47,6 +47,22 @@
</dependencies>
<build>
- <sourceDirectory>src</sourceDirectory>
+ <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>
</build>
</project>
Modified: webservices/axis2/branches/java/1_1/modules/codegen/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/codegen/pom.xml?view=diff&rev=468217&r1=468216&r2=468217
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/codegen/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/codegen/pom.xml Thu Oct 26 17:54:58 2006
@@ -55,6 +55,22 @@
</dependencies>
<build>
- <sourceDirectory>src</sourceDirectory>
+ <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>
</build>
</project>
Modified: webservices/axis2/branches/java/1_1/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/java2wsdl/pom.xml?view=diff&rev=468217&r1=468216&r2=468217
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/java2wsdl/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/java2wsdl/pom.xml Thu Oct 26 17:54:58 2006
@@ -79,6 +79,22 @@
</dependencies>
<build>
- <sourceDirectory>src</sourceDirectory>
+ <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>
</build>
</project>
Modified: webservices/axis2/branches/java/1_1/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/pom.xml?view=diff&rev=468217&r1=468216&r2=468217
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/pom.xml Thu Oct 26 17:54:58 2006
@@ -81,17 +81,34 @@
</dependency>
</dependencies>
<build>
- <testResources>
- <testResource>
- <targetPath>../test-resources</targetPath>
- <directory>test-resources</directory>
- <includes>
- <include>**/**</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
+ <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>
@@ -105,8 +122,8 @@
<include>**/*Test.java</include>
</includes>
</configuration>
- </plugin>
- <plugin>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
@@ -143,6 +160,6 @@
</dependency>
</dependencies>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>
Modified: webservices/axis2/branches/java/1_1/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/parent/pom.xml?view=diff&rev=468217&r1=468216&r2=468217
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/parent/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/parent/pom.xml Thu Oct 26 17:54:58 2006
@@ -424,23 +424,6 @@
</dependencyManagement>
<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>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-aar-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-aar-maven-plugin/pom.xml?view=diff&rev=468217&r1=468216&r2=468217
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-aar-maven-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-aar-maven-plugin/pom.xml Thu Oct 26 17:54:58 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-maven-tools</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>axis2-aar-maven-plugin</artifactId>
@@ -31,68 +31,27 @@
<description>
A Maven 2 plugin for creating Axis 2 service archives (aar files)
</description>
- <repositories>
- <repository>
- <id>repo1</id>
- <name>maven repository</name>
- <url>http://repo1.maven.org/maven2/</url>
- </repository>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
- <url>http://ibiblio.org/maven/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-m1</id>
- <name>apache m1-ibiblio-rsync repository</name>
- <url>http://people.apache.org/repo/m1-ibiblio-rsync-repository/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache-people-repo</id>
- <name>apache people maven repository</name>
- <url>http://people.apache.org/repository/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>ws-zones</id>
- <name>ws.zones maven repository</name>
- <url>http://ws.zones.apache.org/~dims/maven/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.0.5</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0</version>
</dependency>
</dependencies>
</project>
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?view=diff&rev=468217&r1=468216&r2=468217
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml Thu Oct 26 17:54:58 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-maven-tools</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>axis2-java2wsdl-maven-plugin</artifactId>
@@ -31,110 +31,31 @@
A Maven 2 plugin for creating WSDL files from Java source.
</description>
<packaging>maven-plugin</packaging>
- <repositories>
- <repository>
- <id>repo1</id>
- <name>maven repository</name>
- <url>http://repo1.maven.org/maven2/</url>
- </repository>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
- <url>http://ibiblio.org/maven/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
- <url>http://ibiblio.org/maven2/</url>
- </repository>
- <repository>
- <id>apache-m1</id>
- <name>apache m1-ibiblio-rsync repository</name>
- <url>http://people.apache.org/repo/m1-ibiblio-rsync-repository/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache-people-repo</id>
- <name>apache people maven repository</name>
- <url>http://people.apache.org/repository/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>ws-zones</id>
- <name>ws.zones maven repository</name>
- <url>http://ws.zones.apache.org/~dims/maven/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ </build>
<dependencies>
<dependency>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>SNAPSHOT</version>
+ <version>${parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.0-beta-1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>0.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx</artifactId>
- <version>asl-3.0.0</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?view=diff&rev=468217&r1=468216&r2=468217
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Thu Oct 26 17:54:58 2006
@@ -22,173 +22,63 @@
<parent>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-maven-tools</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>axis2-wsdl2code-maven-plugin</artifactId>
<name>Axis 2 WSDL2Code Maven Plugin</name>
<packaging>maven-plugin</packaging>
<description>The Axis 2 Plugin for Maven allows client side and server side sources from a WSDL.</description>
- <repositories>
- <repository>
- <id>repo1</id>
- <name>maven repository</name>
- <url>http://repo1.maven.org/maven2/</url>
- </repository>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
- <url>http://ibiblio.org/maven/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
- <url>http://ibiblio.org/maven2/</url>
- </repository>
- <repository>
- <id>apache-m1</id>
- <name>apache m1-ibiblio-rsync repository</name>
- <url>http://people.apache.org/repo/m1-ibiblio-rsync-repository/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache-people-repo</id>
- <name>apache people maven repository</name>
- <url>http://people.apache.org/repository/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>ws-zones</id>
- <name>ws.zones maven repository</name>
- <url>http://ws.zones.apache.org/~dims/maven/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.4</version>
</dependency>
<dependency>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>SNAPSHOT</version>
+ <version>${parent.version}</version>
</dependency>
<dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-common</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>SNAPSHOT</version>
+ <version>${parent.version}</version>
</dependency>
<dependency>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>SNAPSHOT</version>
+ <version>${parent.version}</version>
</dependency>
<dependency>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb-codegen</artifactId>
- <version>SNAPSHOT</version>
+ <version>${parent.version}</version>
</dependency>
<dependency>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>SNAPSHOT</version>
+ <version>${parent.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.0-beta-1</version>
- <scope>test</scope>
</dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx</artifactId>
- <version>asl-3.0.0</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.0.5</version>
</dependency>
</dependencies>
</project>
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java?view=diff&rev=468217&r1=468216&r2=468217
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java Thu Oct 26 17:54:58 2006
@@ -27,11 +27,11 @@
import java.util.Map;
import java.util.Set;
+import org.apache.axis2.util.CommandLineOption;
+import org.apache.axis2.util.CommandLineOptionConstants;
+import org.apache.axis2.util.CommandLineOptionParser;
import org.apache.axis2.wsdl.codegen.CodeGenerationEngine;
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
-import org.apache.axis2.wsdl.util.CommandLineOption;
-import org.apache.axis2.wsdl.util.CommandLineOptionConstants;
-import org.apache.axis2.wsdl.util.CommandLineOptionParser;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.plugin.AbstractMojo;
Modified: webservices/axis2/branches/java/1_1/modules/tool/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/pom.xml?view=diff&rev=468217&r1=468216&r2=468217
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/pom.xml Thu Oct 26 17:54:58 2006
@@ -19,10 +19,15 @@
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">
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.axis2.maven2</groupId>
<artifactId>axis2-maven-tools</artifactId>
- <version>1.0-SNAPSHOT</version>
<name>Maven 2 tools for Axis 2</name>
<description>
This is a set of Maven 2 plugins for working with Axis 2.
@@ -32,5 +37,46 @@
<module>axis2-aar-maven-plugin</module>
<module>axis2-java2wsdl-maven-plugin</module>
<module>axis2-wsdl2code-maven-plugin</module>
- </modules>
+ </modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>1.0-beta-1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: webservices/axis2/branches/java/1_1/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/pom.xml?view=diff&rev=468217&r1=468216&r2=468217
==============================================================================
--- webservices/axis2/branches/java/1_1/pom.xml (original)
+++ webservices/axis2/branches/java/1_1/pom.xml Thu Oct 26 17:54:58 2006
@@ -29,7 +29,7 @@
<module>modules/parent</module>
<module>modules/java2wsdl</module>
<module>modules/kernel</module>
-<!--<module>modules/tool</module>-->
+ <module>modules/tool</module>
<module>modules/adb</module>
<module>modules/codegen</module>
<module>modules/adb-codegen</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: svn commit: r468217 - in /webservices/axis2/branches/java/1_1:
./ modules/adb-codegen/ modules/adb/ modules/codegen/ modules/java2wsdl/
modules/kernel/ modules/parent/ modules/tool/
modules/tool/axis2-aar-maven-plugin/ modules/tool/axis2-java2wsdl-mave...
Posted by Sanjiva Weerawarana <sa...@opensource.lk>.
On Fri, 2006-10-27 at 00:54 +0000, jochen@apache.org wrote:
> Author: jochen
> Date: Thu Oct 26 17:54:58 2006
> New Revision: 468217
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=468217
> Log:
> Enabling Maven 2 build for the tool directory.
Is it worth doing this for the 1.1 release branch at all?
Sanjiva.
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: svn commit: r468217 - in /webservices/axis2/branches/java/1_1:
./ modules/adb-codegen/ modules/adb/ modules/codegen/ modules/java2wsdl/
modules/kernel/ modules/parent/ modules/tool/
modules/tool/axis2-aar-maven-plugin/ modules/tool/axis2-java2wsdl-mave...
Posted by Sanjiva Weerawarana <sa...@opensource.lk>.
On Fri, 2006-10-27 at 00:54 +0000, jochen@apache.org wrote:
> Author: jochen
> Date: Thu Oct 26 17:54:58 2006
> New Revision: 468217
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=468217
> Log:
> Enabling Maven 2 build for the tool directory.
Is it worth doing this for the 1.1 release branch at all?
Sanjiva.
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org