Author: rineholt
Date: Sun Mar 26 13:53:43 2006
New Revision: 388972
URL: http://svn.apache.org/viewcvs?rev=388972&view=rev
Log:
Axis 2.0 Version .95
Modified:
incubator/tuscany/java/samples/helloworld/helloworldaxis2/pom.xml
incubator/tuscany/java/samples/helloworld/helloworldaxis2/src/main/java/org/apache/tuscany/samples/helloworldaxis/HelloWorldServiceImplStub.java
incubator/tuscany/java/sca/binding.axis2/pom.xml
incubator/tuscany/java/sca/tools/pom.xml
incubator/tuscany/java/testing/tomcat/build.xml
incubator/tuscany/java/testing/tomcat/helloworldaxis2/pom.xml
Modified: incubator/tuscany/java/samples/helloworld/helloworldaxis2/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/helloworld/helloworldaxis2/pom.xml?rev=388972&r1=388971&r2=388972&view=diff
==============================================================================
--- incubator/tuscany/java/samples/helloworld/helloworldaxis2/pom.xml (original)
+++ incubator/tuscany/java/samples/helloworld/helloworldaxis2/pom.xml Sun Mar
26 13:53:43 2006
@@ -29,6 +29,7 @@
</description>
<version>SNAPSHOT</version>
+ <!--
<repositories>
<repository>
<id>jeremy</id>
@@ -38,84 +39,88 @@
</snapshots>
</repository>
</repositories>
+ -->
<dependencies>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-core</artifactId>
- <version>0.95-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-adb</artifactId>
- <version>0.95-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>0.95</version>
+ <scope>compile</scope>
+ </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-wsdl</artifactId>
- <version>0.95-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-common</artifactId>
- <version>0.95-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>axiom</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.12</version>
- </dependency>
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>2.8.2</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>policy</artifactId>
- <version>0.92-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>1.5.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>0.95</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>0.95</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>policy</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>2.8.2</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>0.95</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.12</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -124,4 +129,4 @@
</dependency>
</dependencies>
-</project>
+ </project>
Modified:
incubator/tuscany/java/samples/helloworld/helloworldaxis2/src/main/java/org/apache/tuscany/samples/helloworldaxis/HelloWorldServiceImplStub.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/helloworld/helloworldaxis2/src/main/java/org/apache/tuscany/samples/helloworldaxis/HelloWorldServiceImplStub.java?rev=388972&r1=388971&r2=388972&view=diff
==============================================================================
---
incubator/tuscany/java/samples/helloworld/helloworldaxis2/src/main/java/org/apache/tuscany/samples/helloworldaxis/HelloWorldServiceImplStub.java
(original)
+++
incubator/tuscany/java/samples/helloworld/helloworldaxis2/src/main/java/org/apache/tuscany/samples/helloworldaxis/HelloWorldServiceImplStub.java
Sun Mar 26 13:53:43 2006
@@ -7,7 +7,7 @@
*/
package org.apache.tuscany.samples.helloworldaxis;
-import org.apache.ws.commons.om.impl.llom.builder.StAXOMBuilder;
+import org.apache.ws.commons.om.impl.builder.StAXOMBuilder;
@@ -231,4 +231,4 @@
-
\ No newline at end of file
+
Modified: incubator/tuscany/java/sca/binding.axis2/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/binding.axis2/pom.xml?rev=388972&r1=388971&r2=388972&view=diff
==============================================================================
--- incubator/tuscany/java/sca/binding.axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/binding.axis2/pom.xml Sun Mar 26 13:53:43 2006
@@ -26,7 +26,7 @@
<description>Implementation of the SCA Web Services binding using
Axis2.</description>
<version>SNAPSHOT</version>
- <repositories>
+ <!-- repositories>
<repository>
<id>jeremy</id>
<url>http://people.apache.org/~jboynes/maven2</url>
@@ -34,7 +34,7 @@
<enabled>true</enabled>
</snapshots>
</repository>
- </repositories>
+ </repositories -->
<dependencies>
<dependency>
@@ -53,46 +53,39 @@
<!-- axis 2.0 -->
<dependency>
<groupId>axis2</groupId>
- <artifactId>axis2-core</artifactId>
- <version>0.95-SNAPSHOT</version>
+ <artifactId>axis2-kernel</artifactId>
+ <version>0.95</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-common</artifactId>
- <version>0.95-SNAPSHOT</version>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>0.95</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-wsdl</artifactId>
- <version>0.95-SNAPSHOT</version>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>0.95</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>ws-commons</groupId>
<artifactId>policy</artifactId>
- <version>0.92-SNAPSHOT</version>
+ <version>1.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
- <artifactId>axiom</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0</version>
@@ -111,7 +104,6 @@
<artifactId>axis-wsdl4j</artifactId>
<version>1.2</version>
</dependency>
-
<dependency>
<groupId>stax</groupId>
Modified: incubator/tuscany/java/sca/tools/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/pom.xml?rev=388972&r1=388971&r2=388972&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/pom.xml Sun Mar 26 13:53:43 2006
@@ -66,15 +66,15 @@
<dependency>
<groupId>axis2</groupId>
- <artifactId>axis2-core</artifactId>
- <version>0.94</version>
+ <artifactId>axis2-kernel</artifactId>
+ <version>0.95</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>0.94</version>
+ <version>0.95</version>
<scope>compile</scope>
</dependency>
@@ -97,6 +97,25 @@
<artifactId>log4j</artifactId>
<version>1.2.12</version>
<scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>policy</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>0.95</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>0.95</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/java/testing/tomcat/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/build.xml?rev=388972&r1=388971&r2=388972&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/build.xml (original)
+++ incubator/tuscany/java/testing/tomcat/build.xml Sun Mar 26 13:53:43 2006
@@ -47,7 +47,7 @@
<property name="tuscany.sdo.acceptance.groupId"
value='org/apache/tuscany' />
<property name="tuscany.sdo.acceptance.version" value='SNAPSHOT' />
- <property name="tuscany.acceptance.axis2.version"
value='0.95-SNAPSHOT' />
+ <property name="tuscany.acceptance.axis2.version" value='0.95' />
<property name="tuscany.acceptance.samples.dir" value='../../samples'
/>
<!-- property name="tuscany.maven.repos.dir"
value='${user.home}\.maven\repository' / -->
@@ -87,27 +87,27 @@
</patternset>
<patternset id="tuscany.acceptance.binding.axis2">
<include
name="**/${tuscany.acceptance.groupId}/tuscany-binding-axis2/${tuscany.acceptance.version}/tuscany-binding-axis2-${tuscany.acceptance.version}.jar"
/>
+ <include name="**/asm/asm/2.2/asm-2.2.jar" /> <!-- needed by
org.apache.tuscany.model.types.wsdl.impl.WSDLServiceContractImpl.generateJavaInterface(WSDLServiceContractImpl.java
-->
+ <include
name="**/axis2/axis2-kernel/${tuscany.acceptance.axis2.version}/axis2-kernel-${tuscany.acceptance.axis2.version}.jar"
/>
+ <include
name="**/ws-commons/axiom-api/0.95/axiom-api-0.95.jar" />
+ <include
name="**/ws-commons/axiom-impl/0.95/axiom-impl-0.95.jar" />
+ <include name="**/ws-commons/policy/1.0/policy-1.0.jar" />
+ <include
name="**/org/apache/ws/commons//XmlSchema/1.0/XmlSchema-1.0.jar" />
- <include name="**/axis/axis-wsdl4j/1.2/axis-wsdl4j-1.2.jar" />
- <include
name="**/axis2/axis2-core/${tuscany.acceptance.axis2.version}/axis2-core-${tuscany.acceptance.axis2.version}.jar"
/>
- <include
name="**/axis2/axis2-common/${tuscany.acceptance.axis2.version}/axis2-common-${tuscany.acceptance.axis2.version}.jar"
/>
- <include
name="**/axis2/axis2-wsdl/${tuscany.acceptance.axis2.version}/axis2-wsdl-${tuscany.acceptance.axis2.version}.jar"
/>
- <include
name="**/ws-commons/policy/0.92-SNAPSHOT/policy-0.92-SNAPSHOT.jar" />
- <include
name="**/ws-commons/XmlSchema/1.0-SNAPSHOT/XmlSchema-1.0-SNAPSHOT.jar" />
- <include
name="**/ws-commons/axiom/1.0-SNAPSHOT/axiom-1.0-SNAPSHOT.jar" />
-
-
- <include name="**/asm/asm/2.2/asm-2.2.jar" />
- <include
name="**/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" />
<include
name="**/commons-httpclient/commons-httpclient/3.0/commons-httpclient-3.0.jar"
/>
- <include
name="**/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" />
- <include name="**/log4j/log4j/1.2.12/log4j-1.2.12.jar" />
+ <include
name="**/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" />
+ <include name="**/axis/axis-wsdl4j/1.2/axis-wsdl4j-1.2.jar" />
<include name="**/stax/stax-api/1.0/stax-api-1.0.jar" />
<include name="**/woodstox/wstx-asl/2.8.2/wstx-asl-2.8.2.jar"
/>
+ <include name="**/log4j/log4j/1.2.12/log4j-1.2.12.jar" />
+
+ <!--
+ <include
name="**/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" />
+ -->
- <!--
+ <!-- Axis 1.0
<include name="**/axis/axis/1.2.1/axis-1.2.1.jar" />
<include
name="**/axis/axis-jaxrpc/1.2.1/axis-jaxrpc-1.2.1.jar" />
<include name="**/axis/axis-saaj/1.2.1/axis-saaj-1.2.1.jar" />
Modified: incubator/tuscany/java/testing/tomcat/helloworldaxis2/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/helloworldaxis2/pom.xml?rev=388972&r1=388971&r2=388972&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/helloworldaxis2/pom.xml (original)
+++ incubator/tuscany/java/testing/tomcat/helloworldaxis2/pom.xml Sun Mar 26
13:53:43 2006
@@ -35,12 +35,14 @@
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
+ <!--
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-common</artifactId>
<version>0.95-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
+ -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
