You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/12/20 21:47:20 UTC
svn commit: r489193 - in /incubator/tuscany/java:
sampleapps/bigbank/account/ sampleapps/bigbank/webclient/
sampleapps/das.pojo.service/service/ sampleapps/das.pojo.service/webclient/
samples/sca/calculator-ws/ samples/sca/greeterws-oneway/ samples/sca...
Author: jboynes
Date: Wed Dec 20 12:47:18 2006
New Revision: 489193
URL: http://svn.apache.org/viewvc?view=rev&rev=489193
Log:
regroup webapp modules
Added:
incubator/tuscany/java/sca/runtime/webapp/
incubator/tuscany/java/sca/runtime/webapp/plugin.war/
- copied from r489169, incubator/tuscany/java/sca/plugins/plugin.war/
incubator/tuscany/java/sca/runtime/webapp/plugin.war/LICENSE.txt
- copied unchanged from r489192, incubator/tuscany/java/sca/plugins/plugin.war/LICENSE.txt
incubator/tuscany/java/sca/runtime/webapp/plugin.war/NOTICE.txt
- copied unchanged from r489192, incubator/tuscany/java/sca/plugins/plugin.war/NOTICE.txt
incubator/tuscany/java/sca/runtime/webapp/plugin.war/pom.xml
- copied, changed from r489192, incubator/tuscany/java/sca/plugins/plugin.war/pom.xml
incubator/tuscany/java/sca/runtime/webapp/plugin.war/src/
- copied from r489192, incubator/tuscany/java/sca/plugins/plugin.war/src/
incubator/tuscany/java/sca/runtime/webapp/pom.xml (with props)
incubator/tuscany/java/sca/runtime/webapp/webapp-api/
- copied from r489170, incubator/tuscany/java/sca/runtime/webapp-api/
incubator/tuscany/java/sca/runtime/webapp/webapp-api/.ruleset
- copied unchanged from r489192, incubator/tuscany/java/sca/runtime/webapp-api/.ruleset
incubator/tuscany/java/sca/runtime/webapp/webapp-api/LICENSE.txt
- copied unchanged from r489192, incubator/tuscany/java/sca/runtime/webapp-api/LICENSE.txt
incubator/tuscany/java/sca/runtime/webapp/webapp-api/NOTICE.txt
- copied unchanged from r489192, incubator/tuscany/java/sca/runtime/webapp-api/NOTICE.txt
incubator/tuscany/java/sca/runtime/webapp/webapp-api/pom.xml
- copied, changed from r489192, incubator/tuscany/java/sca/runtime/webapp-api/pom.xml
incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/
- copied from r489192, incubator/tuscany/java/sca/runtime/webapp-api/src/
incubator/tuscany/java/sca/runtime/webapp/webapp-host/
- copied from r489169, incubator/tuscany/java/sca/runtime/webapp-host/
incubator/tuscany/java/sca/runtime/webapp/webapp-host/.ruleset
- copied unchanged from r489192, incubator/tuscany/java/sca/runtime/webapp-host/.ruleset
incubator/tuscany/java/sca/runtime/webapp/webapp-host/LICENSE.txt
- copied unchanged from r489192, incubator/tuscany/java/sca/runtime/webapp-host/LICENSE.txt
incubator/tuscany/java/sca/runtime/webapp/webapp-host/NOTICE.txt
- copied unchanged from r489192, incubator/tuscany/java/sca/runtime/webapp-host/NOTICE.txt
incubator/tuscany/java/sca/runtime/webapp/webapp-host/pom.xml
- copied, changed from r489192, incubator/tuscany/java/sca/runtime/webapp-host/pom.xml
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/
- copied from r489192, incubator/tuscany/java/sca/runtime/webapp-host/src/
Removed:
incubator/tuscany/java/sca/plugins/plugin.war/
incubator/tuscany/java/sca/runtime/webapp-api/
incubator/tuscany/java/sca/runtime/webapp-host/
Modified:
incubator/tuscany/java/sampleapps/bigbank/account/pom.xml
incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml
incubator/tuscany/java/sampleapps/das.pojo.service/service/pom.xml
incubator/tuscany/java/sampleapps/das.pojo.service/webclient/pom.xml
incubator/tuscany/java/samples/sca/calculator-ws/pom.xml
incubator/tuscany/java/samples/sca/greeterws-oneway/pom.xml
incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml
incubator/tuscany/java/samples/sca/helloworldws-async/pom.xml
incubator/tuscany/java/samples/sca/helloworldws/pom.xml
incubator/tuscany/java/samples/sca/helloworldwsOM/pom.xml
incubator/tuscany/java/samples/sca/loanappconversationWS/pom.xml
incubator/tuscany/java/samples/sca/spring/client/pom.xml
incubator/tuscany/java/samples/sca/spring/server/pom.xml
incubator/tuscany/java/samples/sca/webapp/pom.xml
incubator/tuscany/java/sca/plugins/pom.xml
incubator/tuscany/java/sca/runtime/pom.xml
incubator/tuscany/java/sca/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java
incubator/tuscany/java/sca/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/TuscanyWarMojo.java
incubator/tuscany/java/sca/services/containers/container.spring/pom.xml
Modified: incubator/tuscany/java/sampleapps/bigbank/account/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/pom.xml (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/pom.xml Wed Dec 20 12:47:18 2006
@@ -38,8 +38,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
<version>${scaKernelVersion}</version>
<scope>runtime</scope>
</dependency>
@@ -142,7 +142,7 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<version>${scaKernelVersion}</version>
<executions>
Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml Wed Dec 20 12:47:18 2006
@@ -65,8 +65,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
<version>${scaKernelVersion}</version>
<scope>runtime</scope>
</dependency>
@@ -131,7 +131,7 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<version>${scaKernelVersion}</version>
<executions>
Modified: incubator/tuscany/java/sampleapps/das.pojo.service/service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/das.pojo.service/service/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/sampleapps/das.pojo.service/service/pom.xml (original)
+++ incubator/tuscany/java/sampleapps/das.pojo.service/service/pom.xml Wed Dec 20 12:47:18 2006
@@ -34,8 +34,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: incubator/tuscany/java/sampleapps/das.pojo.service/webclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/das.pojo.service/webclient/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/sampleapps/das.pojo.service/webclient/pom.xml (original)
+++ incubator/tuscany/java/sampleapps/das.pojo.service/webclient/pom.xml Wed Dec 20 12:47:18 2006
@@ -69,7 +69,7 @@
<!-- <finalName>companyweb-service-client</finalName> -->
<plugins>
<plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<executions>
<execution>
Modified: incubator/tuscany/java/samples/sca/calculator-ws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/calculator-ws/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/samples/sca/calculator-ws/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/calculator-ws/pom.xml Wed Dec 20 12:47:18 2006
@@ -37,8 +37,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
</dependencies>
@@ -46,7 +46,7 @@
<finalName>calculator</finalName>
<plugins>
<plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<executions>
<execution>
Modified: incubator/tuscany/java/samples/sca/greeterws-oneway/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/greeterws-oneway/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/samples/sca/greeterws-oneway/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/greeterws-oneway/pom.xml Wed Dec 20 12:47:18 2006
@@ -84,13 +84,13 @@
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</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>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>webapp-host</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
@@ -120,7 +120,7 @@
<finalName>sample-greeterws-oneway-1.0-incubator-SNAPSHOT</finalName>
<plugins>
<plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<executions>
<execution>
Modified: incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml Wed Dec 20 12:47:18 2006
@@ -35,8 +35,8 @@
<artifactId>sca-api-r0.95</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
<dependency>
@@ -101,7 +101,7 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<executions>
<execution>
Modified: incubator/tuscany/java/samples/sca/helloworldws-async/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws-async/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws-async/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldws-async/pom.xml Wed Dec 20 12:47:18 2006
@@ -84,13 +84,13 @@
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</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>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>webapp-host</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
@@ -120,7 +120,7 @@
<finalName>sample-helloworldws-async-1.0-incubator-SNAPSHOT</finalName>
<plugins>
<plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<executions>
<execution>
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=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/pom.xml Wed Dec 20 12:47:18 2006
@@ -80,8 +80,8 @@
<!-- runtime is need for webapp integration to include jar -->
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
<version>${tuscanyVersion}</version>
<scope>runtime</scope>
</dependency>
@@ -101,7 +101,7 @@
<finalName>sample-helloworldws</finalName>
<plugins>
<plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<executions>
<execution>
Modified: incubator/tuscany/java/samples/sca/helloworldwsOM/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsOM/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldwsOM/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldwsOM/pom.xml Wed Dec 20 12:47:18 2006
@@ -58,8 +58,8 @@
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
@@ -83,4 +83,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/tuscany/java/samples/sca/loanappconversationWS/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/loanappconversationWS/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/samples/sca/loanappconversationWS/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/loanappconversationWS/pom.xml Wed Dec 20 12:47:18 2006
@@ -35,8 +35,8 @@
<artifactId>sca-api-r0.95</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
<version>${scaImplVersion}</version>
<scope>runtime</scope>
</dependency>
@@ -46,7 +46,7 @@
<finalName>${artifactId}</finalName>
<plugins>
<plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<version>${scaImplVersion}</version>
<executions>
Modified: incubator/tuscany/java/samples/sca/spring/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/spring/client/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/samples/sca/spring/client/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/spring/client/pom.xml Wed Dec 20 12:47:18 2006
@@ -49,14 +49,14 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</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>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>webapp-host</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
@@ -93,7 +93,7 @@
</resources>
<plugins>
<plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<executions>
<execution>
Modified: incubator/tuscany/java/samples/sca/spring/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/spring/server/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/samples/sca/spring/server/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/spring/server/pom.xml Wed Dec 20 12:47:18 2006
@@ -31,8 +31,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
<!-- runtime is need for webapp integration to include jar -->
@@ -71,7 +71,7 @@
<finalName>server</finalName>
<plugins>
<plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<executions>
<execution>
Modified: incubator/tuscany/java/samples/sca/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/webapp/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/samples/sca/webapp/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/webapp/pom.xml Wed Dec 20 12:47:18 2006
@@ -37,8 +37,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
</dependencies>
@@ -46,7 +46,7 @@
<finalName>sample-webapp</finalName>
<plugins>
<plugin>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<executions>
<execution>
Modified: incubator/tuscany/java/sca/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugins/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/sca/plugins/pom.xml (original)
+++ incubator/tuscany/java/sca/plugins/pom.xml Wed Dec 20 12:47:18 2006
@@ -57,7 +57,6 @@
</repositories>
<modules>
- <module>plugin.war</module>
<module>plugin.itest</module>
<module>plugin.wsdl2java</module>
<module>plugin.java2wsdl</module>
Modified: incubator/tuscany/java/sca/runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/sca/runtime/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/pom.xml Wed Dec 20 12:47:18 2006
@@ -32,9 +32,8 @@
<name>Tuscany SCA Runtime Hosts</name>
<modules>
- <module>webapp-api</module>
- <module>webapp-host</module>
<module>standalone</module>
+ <module>webapp</module>
</modules>
</project>
Copied: incubator/tuscany/java/sca/runtime/webapp/plugin.war/pom.xml (from r489192, incubator/tuscany/java/sca/plugins/plugin.war/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/plugin.war/pom.xml?view=diff&rev=489193&p1=incubator/tuscany/java/sca/plugins/plugin.war/pom.xml&r1=489192&p2=incubator/tuscany/java/sca/runtime/webapp/plugin.war/pom.xml&r2=489193
==============================================================================
--- incubator/tuscany/java/sca/plugins/plugin.war/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/webapp/plugin.war/pom.xml Wed Dec 20 12:47:18 2006
@@ -19,8 +19,8 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.plugins</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/tuscany/java/sca/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java Wed Dec 20 12:47:18 2006
@@ -115,7 +115,7 @@
private static class WebappHostDependency extends Dependency {
// TODO Decide on whether to get snapshot version rather than hardcoded version
private WebappHostDependency() {
- super("org.apache.tuscany.sca.runtime", "webapp-host", "1.0-incubator-SNAPSHOT");
+ super("org.apache.tuscany.sca.runtime.webapp", "webapp-host", "1.0-incubator-SNAPSHOT");
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/TuscanyWarMojo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/TuscanyWarMojo.java?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/TuscanyWarMojo.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/plugin.war/src/main/java/org/apache/tuscany/plugin/war/TuscanyWarMojo.java Wed Dec 20 12:47:18 2006
@@ -213,7 +213,7 @@
// if there is a runtime version specified and no bootLib dependancies,
// modify the bootLibs to have the runtime version.
if (runTimeVersion != null && bootLibs == Dependency.getDefaultBootLibs()) {
- Dependency dependancy = new Dependency("org.apache.tuscany.sca.runtime",
+ Dependency dependancy = new Dependency("org.apache.tuscany.sca.runtime.webapp",
"webapp-host", runTimeVersion);
bootLibs = new Dependency[] {dependancy};
}
Added: incubator/tuscany/java/sca/runtime/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/pom.xml?view=auto&rev=489193
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/pom.xml (added)
+++ incubator/tuscany/java/sca/runtime/webapp/pom.xml Wed Dec 20 12:47:18 2006
@@ -0,0 +1,40 @@
+<?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.
+-->
+<project>
+
+ <parent>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tuscany Webapp SCA Runtime</name>
+
+ <modules>
+ <module>webapp-api</module>
+ <module>webapp-host</module>
+ <module>plugin.war</module>
+ </modules>
+
+</project>
Propchange: incubator/tuscany/java/sca/runtime/webapp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/runtime/webapp/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/runtime/webapp/webapp-api/pom.xml (from r489192, incubator/tuscany/java/sca/runtime/webapp-api/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-api/pom.xml?view=diff&rev=489193&p1=incubator/tuscany/java/sca/runtime/webapp-api/pom.xml&r1=489192&p2=incubator/tuscany/java/sca/runtime/webapp/webapp-api/pom.xml&r2=489193
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp-api/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-api/pom.xml Wed Dec 20 12:47:18 2006
@@ -19,12 +19,12 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>webapp</artifactId>
+ <artifactId>webapp-api</artifactId>
<packaging>jar</packaging>
<name>Apache Tuscany Web Application Runtime</name>
<description>Integration code to run Tuscany in a Web application.</description>
Copied: incubator/tuscany/java/sca/runtime/webapp/webapp-host/pom.xml (from r489192, incubator/tuscany/java/sca/runtime/webapp-host/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/pom.xml?view=diff&rev=489193&p1=incubator/tuscany/java/sca/runtime/webapp-host/pom.xml&r1=489192&p2=incubator/tuscany/java/sca/runtime/webapp/webapp-host/pom.xml&r2=489193
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp-host/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/pom.xml Wed Dec 20 12:47:18 2006
@@ -19,8 +19,8 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -47,8 +47,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/java/sca/services/containers/container.spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/pom.xml?view=diff&rev=489193&r1=489192&r2=489193
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/pom.xml (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/pom.xml Wed Dec 20 12:47:18 2006
@@ -39,8 +39,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org