Author: veithen
Date: Sun Apr 3 10:04:02 2011
New Revision: 1088239
URL: http://svn.apache.org/viewvc?rev=1088239&view=rev
Log:
Fixed a couple of samples.
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml
axis/axis2/java/core/trunk/modules/samples/mtom/build.xml
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1088239&r1=1088238&r2=1088239&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Apr 3 10:04:02
2011
@@ -347,6 +347,10 @@
<!-- Test of the databinding sample -->
<ant
dir="${project.build.directory}/axis2-${project.version}/samples/databinding"/>
+
+ <!-- Test of the mtom sample -->
+ <ant
dir="${project.build.directory}/axis2-${project.version}/samples/mtom"
target="generate.service"/>
+ <ant
dir="${project.build.directory}/axis2-${project.version}/samples/mtom"
target="generate.client"/>
</tasks>
</configuration>
</execution>
@@ -365,7 +369,7 @@
<configuration>
<projectsDirectory>${project.build.directory}/axis2-${project.version}/samples</projectsDirectory>
<pomIncludes>
-
<pomInclude>java_first_jaxws/pom.xml</pomInclude>
+ <pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<streamLogs>true</streamLogs>
</configuration>
Modified: axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml?rev=1088239&r1=1088238&r2=1088239&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
(original)
+++ axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml Sun Apr
3 10:04:02 2011
@@ -100,7 +100,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
+ <version>2.3.2</version>
<configuration>
<compilerVersion>1.5</compilerVersion>
<source>1.5</source>
@@ -110,6 +110,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
<configuration>
<warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
</configuration>
@@ -118,6 +119,7 @@
<!-- Also build the JAR during the package phase. The JAR is
required
when deploying on axis2server. -->
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
<executions>
<execution>
<goals>
@@ -156,4 +158,14 @@
</testResource>
</testResources>
</build>
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
</project>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml?rev=1088239&r1=1088238&r2=1088239&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml
(original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml Sun
Apr 3 10:04:02 2011
@@ -23,7 +23,7 @@
<groupId>org.apache.axis2.samples</groupId>
<artifactId>jaxws-addressbook</artifactId>
<packaging>jar</packaging>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<name>JAXWS Addressbook Service</name>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -36,6 +36,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
<executions>
<execution>
<id>generate-client-jar</id>
@@ -55,6 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<executions>
<execution>
<id>gen-sources</id>
@@ -87,6 +89,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
<executions>
<execution>
<id>add-sources</id>
@@ -105,6 +108,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -127,35 +131,17 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</dependency>
</dependencies>
<repositories>
<repository>
- <id>apache-m2</id>
-
<url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <repository>
- <id>apache-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- </repository>
- <repository>
- <id>maven2</id>
- <url>http://repo1.maven.org/maven2/</url>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>apache-m2</id>
-
<url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </pluginRepository>
- <pluginRepository>
- <id>apache-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </pluginRepository>
- <pluginRepository>
- <id>maven2</id>
- <url>http://repo1.maven.org/maven2/</url>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml?rev=1088239&r1=1088238&r2=1088239&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml
(original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml Sun Apr
3 10:04:02 2011
@@ -23,7 +23,7 @@
<groupId>org.apache.axis2.samples</groupId>
<artifactId>jaxws-calculator</artifactId>
<packaging>jar</packaging>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<name>JAXWS Calculator Service</name>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -36,6 +36,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -54,6 +55,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -76,35 +78,17 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</dependency>
</dependencies>
<repositories>
<repository>
- <id>apache-m2</id>
-
<url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <repository>
- <id>apache-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- </repository>
- <repository>
- <id>maven2</id>
- <url>http://repo1.maven.org/maven2/</url>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>apache-m2</id>
-
<url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </pluginRepository>
- <pluginRepository>
- <id>apache-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </pluginRepository>
- <pluginRepository>
- <id>maven2</id>
- <url>http://repo1.maven.org/maven2/</url>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml?rev=1088239&r1=1088238&r2=1088239&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml Sun Apr 3
10:04:02 2011
@@ -23,7 +23,7 @@
<groupId>org.apache.axis2.samples</groupId>
<artifactId>jaxws-interop</artifactId>
<packaging>jar</packaging>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<name>JAXWS Interop Sample</name>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -36,6 +36,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -58,35 +59,17 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</dependency>
</dependencies>
<repositories>
<repository>
- <id>apache-m2</id>
-
<url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <repository>
- <id>apache-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- </repository>
- <repository>
- <id>maven2</id>
- <url>http://repo1.maven.org/maven2/</url>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>apache-m2</id>
-
<url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </pluginRepository>
- <pluginRepository>
- <id>apache-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </pluginRepository>
- <pluginRepository>
- <id>maven2</id>
- <url>http://repo1.maven.org/maven2/</url>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml?rev=1088239&r1=1088238&r2=1088239&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml Sun Apr 3
10:04:02 2011
@@ -36,117 +36,30 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<type>mar</type>
</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>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx</artifactId>
- <version>asl-3.2.4</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.6</version>
- <exclusions>
- <exclusion>
- <artifactId>jsr173</artifactId>
- <groupId>javax.xml</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>2.1.6</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <artifactId>jsr173</artifactId>
- <groupId>javax.xml</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<version>2.1.3</version>
@@ -185,28 +98,13 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-tools</artifactId>
- <version>2.1.3</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
+ <version>2.3.2</version>
<configuration>
<compilerVersion>1.5</compilerVersion>
<source>1.5</source>
@@ -216,6 +114,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
<configuration>
<warName>jaxws-samples</warName>
<warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
@@ -256,32 +155,14 @@
</testResource>
</testResources>
</build>
-
- <!-- needed for XmlSchema -->
<repositories>
<repository>
- <id>ibiblio</id>
- <name>ibiblio maven repository</name>
- <url>http://ibiblio.org/maven/</url>
- <layout>legacy</layout>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</repository>
- <repository>
- <id>apache</id>
- <name>Apache maven repository</name>
- <url>http://www.apache.org/dist/java-repository/</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
</repositories>
-
</project>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml?rev=1088239&r1=1088238&r2=1088239&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml Sun Apr 3
10:04:02 2011
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>version</artifactId>
@@ -53,4 +53,14 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
</project>
Modified: axis/axis2/java/core/trunk/modules/samples/mtom/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/mtom/build.xml?rev=1088239&r1=1088238&r2=1088239&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/mtom/build.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/mtom/build.xml Sun Apr 3
10:04:02 2011
@@ -20,7 +20,7 @@
<project name="mtom" basedir="." default="generate.service">
<property environment="env" />
- <property name="build.dir" value="build" />
+ <property name="build.dir" value="${basedir}/build" />
<property name="client.dir" value="${build.dir}/client" />
<property name="service.dir" value="${build.dir}/service" />
<property name="client.classes.dir" value="${client.dir}/classes" />
@@ -38,7 +38,7 @@
<!-- Create Service -->
<target name="generate.service">
- <java classname="org.apache.axis2.wsdl.WSDL2Java">
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<arg value="-uri" />
<arg value="${basedir}/resources/MTOMSample.wsdl" />
<arg value="-ss" />
@@ -71,7 +71,7 @@
<!-- Generate Client -->
<target name="generate.client">
- <java classname="org.apache.axis2.wsdl.WSDL2Java">
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<arg value="-uri" />
<arg value="resources/MTOMSample.wsdl" />
<arg value="-p" />
Modified: axis/axis2/java/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1088239&r1=1088238&r2=1088239&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Sun Apr 3 10:04:02 2011
@@ -95,6 +95,11 @@
<modules>
<module>modules/distribution</module>
<module>modules/samples/java_first_jaxws</module>
+ <module>modules/samples/jaxws-addressbook</module>
+ <module>modules/samples/jaxws-calculator</module>
+ <module>modules/samples/jaxws-interop</module>
+ <module>modules/samples/jaxws-samples</module>
+ <module>modules/samples/jaxws-version</module>
</modules>
</profile>
<profile>
