You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2006/10/20 17:54:46 UTC
svn commit: r466159 - in
/incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async:
pom.xml src/main/resources/META-INF/sca/
src/main/webapp/WEB-INF/default.scdl src/main/webapp/WEB-INF/web.xml
Author: rineholt
Date: Fri Oct 20 08:54:45 2006
New Revision: 466159
URL: http://svn.apache.org/viewvc?view=rev&rev=466159
Log:
changes got lost
Added:
incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/default.scdl
- copied, changed from r466149, incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/sca/default.scdl
Removed:
incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/resources/META-INF/sca/
Modified:
incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml
incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/web.xml
Modified: incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml?view=diff&rev=466159&r1=466158&r2=466159
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/pom.xml Fri Oct 20 08:54:45 2006
@@ -46,19 +46,14 @@
<version>${scaVersion}</version>
<scope>compile</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
-
+<!--
<dependency>
<groupId>commonj</groupId>
<artifactId>sdo-api-r2.0.1</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</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>
+-->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -66,47 +61,33 @@
<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 -->
- </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>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</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</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>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ <version>${sdoVersion}</version>
+ <scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>SNAPSHOT</version>
- <scope>compile</scope>
+
+ <!-- java.xml.stream API -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>SNAPSHOT</version>
- <scope>runtime</scope>
+ <!-- StAX implementation -->
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.0.1</version>
+ <scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -131,6 +112,25 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <!-- Set to true to embed external jars for extensions in the WAR -->
+ <!-- Set to false to leave external jars for extensions to be resolved from maven repository -->
+ <loadExtensionDependencies>false</loadExtensionDependencies>
+
+ <extensions>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-sdo</artifactId>
+ <version>${scaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${scaVersion}</version>
+ </dependency>
+ </extensions>
+ </configuration>
+
</plugin>
</plugins>
<resources>
Copied: incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/default.scdl (from r466149, incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/sca/default.scdl)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/default.scdl?view=diff&rev=466159&p1=incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/sca/default.scdl&r1=466149&p2=incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/default.scdl&r2=466159
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/default.scdl Fri Oct 20 08:54:45 2006
@@ -20,7 +20,7 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
name="helloworldws">
- <dbsdo:import.sdo xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" location="wsdl/helloworld.wsdl" />
+ <dbsdo:import.sdo xmlns:dbsdo="http://incubator.apache.org/tuscany/xmlns/databinding/sdo/1.0-incubator-M2" location="wsdl/helloworld.wsdl" />
<service name="HelloWorldWebService" target="http:///foo">
<interface.wsdl xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
Modified: incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/web.xml?view=diff&rev=466159&r1=466158&r2=466159
==============================================================================
--- incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/tuscany/branches/sca-java-M2/samples/webapp/helloworldws-async/src/main/webapp/WEB-INF/web.xml Fri Oct 20 08:54:45 2006
@@ -23,15 +23,6 @@
<web-app>
<display-name>Tuscany HelloWorld Web Service Sample</display-name>
- <context-param>
- <param-name>tuscany.systemScdlPath</param-name>
- <param-value>/META-INF/tuscany/webapp.scdl</param-value>
- </context-param>
-
- <context-param>
- <param-name>tuscany.applicationScdlPath</param-name>
- <param-value>/META-INF/sca/default.scdl</param-value>
- </context-param>
<listener>
<listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org