You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2006/10/09 23:04:28 UTC
svn commit: r454511 - in /incubator/tuscany/java: samples/sca/
samples/sca/helloworldws/ sca/ sca/services/bindings/binding.axis2/
sca/services/databinding/databinding-axiom/ sca/services/idl/wsdl/ sca/tools/
Author: rfeng
Date: Mon Oct 9 14:04:27 2006
New Revision: 454511
URL: http://svn.apache.org/viewvc?view=rev&rev=454511
Log:
Adjust pom.xml to reflect the changes made by WSCOMMONS-108
neethi - org.apache.ws.commons.neethi
xmlschema - org.apache.ws.commons.schema
axiom - org.apache.ws.commons.axiom
axis2 - org.apache.axis2
Modified:
incubator/tuscany/java/samples/sca/helloworldws/pom.xml
incubator/tuscany/java/samples/sca/pom.xml
incubator/tuscany/java/sca/pom.xml
incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml
incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml
incubator/tuscany/java/sca/services/idl/wsdl/pom.xml
incubator/tuscany/java/sca/tools/pom.xml
Modified: incubator/tuscany/java/samples/sca/helloworldws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/pom.xml?view=diff&rev=454511&r1=454510&r2=454511
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/pom.xml Mon Oct 9 14:04:27 2006
@@ -1,21 +1,21 @@
<?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.
+ * 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>
<parent>
@@ -37,79 +37,66 @@
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r0.95</artifactId>
- <version>1.0-incubator-M2-SNAPSHOT</version>
+ <version>${tuscanyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-api</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope> <!-- runtime is need for webapp integration to include jar -->
+ <version>${tuscanyVersion}</version>
+ <scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>commonj</groupId>
<artifactId>sdo-api-r2.0.1</artifactId>
- <version>1.0-incubator-M2-SNAPSHOT</version>
+ <version>${tuscanyVersion}</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>core</artifactId>
- <version>${pom.version}</version>
- <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.tuscany.sca.services.bindings</groupId>
- <artifactId>axis2</artifactId>
- <version>${pom.version}</version>
- <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>1.1</version>
+ <scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-axiom</artifactId>
- <version>${pom.version}</version>
- <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
- </dependency>
+
+ <!-- runtime is need for webapp integration to include jar -->
<dependency>
<groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
- <version>${pom.version}</version>
- <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp-host</artifactId>
- <version>${pom.version}</version>
- <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>1.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>1.1</version>
- <scope>runtime</scope>
- </dependency>
+ <version>${tuscanyVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.5.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
-
+
</dependencies>
-
+
<build>
<finalName>sample-helloworldws-1.0-incubator-M2-SNAPSHOT</finalName>
<plugins>
@@ -124,7 +111,31 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <extensions>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${tuscanyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.idl</groupId>
+ <artifactId>wsdl</artifactId>
+ <version>${tuscanyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-axiom</artifactId>
+ <version>${tuscanyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-sdo</artifactId>
+ <version>${tuscanyVersion}</version>
+ </dependency>
+ </extensions>
+ </configuration>
</plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: incubator/tuscany/java/samples/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/pom.xml?view=diff&rev=454511&r1=454510&r2=454511
==============================================================================
--- incubator/tuscany/java/samples/sca/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/pom.xml Mon Oct 9 14:04:27 2006
@@ -67,6 +67,8 @@
<module>echo.databinding</module>
<module>helloworldwsclient</module>
<module>helloworldws</module>
+ <module>helloworldwsclient-async</module>
+ <module>helloworldws-async</module>
<module>helloworldJavaScript</module>
<module>eagerinit</module>
<module>local.wire</module>
Modified: incubator/tuscany/java/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/pom.xml?view=diff&rev=454511&r1=454510&r2=454511
==============================================================================
--- incubator/tuscany/java/sca/pom.xml (original)
+++ incubator/tuscany/java/sca/pom.xml Mon Oct 9 14:04:27 2006
@@ -134,7 +134,7 @@
<!-- Axis2 Implementation -->
<dependency>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
<version>${axis2Version}</version>
<scope>compile</scope>
@@ -154,19 +154,6 @@
<scope>compile</scope>
</dependency>
- <!-- SNAPSHOT version of AXIOM -->
- <dependency>
- <groupId>org.apache.ws.commons</groupId>
- <artifactId>axiom-api</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
-
-
<!-- Woden implementation -->
<dependency>
<groupId>incubator-woden</groupId>
@@ -184,7 +171,7 @@
<!-- XmlSchema implementation -->
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
<version>SNAPSHOT</version>
<scope>compile</scope>
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml?view=diff&rev=454511&r1=454510&r2=454511
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/pom.xml Mon Oct 9 14:04:27 2006
@@ -56,18 +56,18 @@
<!-- axis 2.0 SNAPSHOT -->
<dependency>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
<version>SNAPSHOT</version>
</dependency>
@@ -90,14 +90,14 @@
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.neethi</groupId>
<artifactId>neethi</artifactId>
<version>SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
</dependency>
Modified: incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml?view=diff&rev=454511&r1=454510&r2=454511
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-axiom/pom.xml Mon Oct 9 14:04:27 2006
@@ -48,7 +48,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
</dependency>
@@ -57,7 +57,7 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
<scope>test</scope>
</dependency>
Modified: incubator/tuscany/java/sca/services/idl/wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/idl/wsdl/pom.xml?view=diff&rev=454511&r1=454510&r2=454511
==============================================================================
--- incubator/tuscany/java/sca/services/idl/wsdl/pom.xml (original)
+++ incubator/tuscany/java/sca/services/idl/wsdl/pom.xml Mon Oct 9 14:04:27 2006
@@ -37,7 +37,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
</dependency>
Modified: incubator/tuscany/java/sca/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/pom.xml?view=diff&rev=454511&r1=454510&r2=454511
==============================================================================
--- incubator/tuscany/java/sca/tools/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/pom.xml Mon Oct 9 14:04:27 2006
@@ -57,13 +57,13 @@
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.neethi</groupId>
<artifactId>neethi</artifactId>
<version>SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
</dependency>
<dependency>
@@ -76,19 +76,19 @@
</dependency>
<dependency>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
<version>SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
<version>SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
<version>SNAPSHOT</version>
<scope>compile</scope>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org