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 2007/02/21 21:45:39 UTC
svn commit: r510191 - in /incubator/tuscany/java/sca/runtime: ./ itest/
itest/plugin/ itest/smoketest/ services/ services/discovery/
services/discovery/bonjour/ services/discovery/installjxta/
services/discovery/jxta/ services/management/ services/mana...
Author: jboynes
Date: Wed Feb 21 12:45:37 2007
New Revision: 510191
URL: http://svn.apache.org/viewvc?view=rev&rev=510191
Log:
update runtime module to new parent/kernel version
Modified:
incubator/tuscany/java/sca/runtime/itest/plugin/pom.xml
incubator/tuscany/java/sca/runtime/itest/pom.xml
incubator/tuscany/java/sca/runtime/itest/smoketest/pom.xml
incubator/tuscany/java/sca/runtime/pom.xml
incubator/tuscany/java/sca/runtime/services/discovery/bonjour/pom.xml
incubator/tuscany/java/sca/runtime/services/discovery/installjxta/pom.xml
incubator/tuscany/java/sca/runtime/services/discovery/jxta/pom.xml
incubator/tuscany/java/sca/runtime/services/discovery/pom.xml
incubator/tuscany/java/sca/runtime/services/management/jmx/pom.xml
incubator/tuscany/java/sca/runtime/services/management/pom.xml
incubator/tuscany/java/sca/runtime/services/maven/pom.xml
incubator/tuscany/java/sca/runtime/services/pom.xml
incubator/tuscany/java/sca/runtime/standalone/assembly/pom.xml
incubator/tuscany/java/sca/runtime/standalone/launcher/pom.xml
incubator/tuscany/java/sca/runtime/standalone/pom.xml
incubator/tuscany/java/sca/runtime/standalone/server.shutdown/pom.xml
incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml
incubator/tuscany/java/sca/runtime/standalone/smoketest/pom.xml
incubator/tuscany/java/sca/runtime/standalone/standalone-api/pom.xml
incubator/tuscany/java/sca/runtime/standalone/standalone-host/pom.xml
incubator/tuscany/java/sca/runtime/webapp/plugin.war/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/pom.xml
incubator/tuscany/java/sca/runtime/webapp/smoketest/pom.xml
incubator/tuscany/java/sca/runtime/webapp/smoketest/src/test/java/org/apache/tuscany/sca/runtime/webapp/smoketest/SmokeTestContext.java
incubator/tuscany/java/sca/runtime/webapp/webapp-api/pom.xml
incubator/tuscany/java/sca/runtime/webapp/webapp-host/pom.xml
Modified: incubator/tuscany/java/sca/runtime/itest/plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/plugin/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/plugin/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/itest/plugin/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,12 +19,13 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>parent</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>sca</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-itest-plugin</artifactId>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Tuscany Integration Test Plugin</name>
<description>A plugin for Apache Maven that simplifies integration testing of SCA components.</description>
@@ -54,31 +55,26 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>core</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <artifactId>tuscany-core</artifactId>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
+ <scope>compile</scope>
</dependency>
- <!-- [rfeng] A big hack to resolve servlet-api -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/incubator.apache.org/tuscany/plugins/tuscany-itest-plugin</url>
- </site>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/incubator.apache.org/tuscany/plugins/tuscany-itest-plugin</url>
+ </site>
</distributionManagement>
<reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
</reporting>
</project>
Modified: incubator/tuscany/java/sca/runtime/itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/itest/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,11 +19,13 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>parent</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>runtime</artifactId>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>itest</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany Integration Test Runtime</name>
Modified: incubator/tuscany/java/sca/runtime/itest/smoketest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/smoketest/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/smoketest/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/itest/smoketest/pom.xml Wed Feb 21 12:45:37 2007
@@ -21,11 +21,11 @@
<parent>
<groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>itest</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.sca.runtime.itest</groupId>
- <artifactId>smoketest</artifactId>
+ <artifactId>itest-smoketest</artifactId>
<name>Apache Tuscany Integration Test Smoketest</name>
<description>Smoketest for the ITest plugin</description>
@@ -33,9 +33,8 @@
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r1.0</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -44,7 +43,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.tuscany.sca</groupId>
+ <groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-itest-plugin</artifactId>
<executions>
<execution>
Modified: incubator/tuscany/java/sca/runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/pom.xml Wed Feb 21 12:45:37 2007
@@ -18,18 +18,120 @@
* under the License.
-->
<project>
-
<parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>parent</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>sca</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
</parent>
-
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>runtime</artifactId>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Tuscany SCA Runtime Environments</name>
+ <description>Parent POM for all runtime environments</description>
+
+ <properties>
+ <!-- version the SCA API that we implement -->
+ <scaSpecVersion>1.0</scaSpecVersion>
+
+ <!-- version the Apache Tuscany kernel that the runtimes work with -->
+ <kernelVersion>1.0-alpha-incubating-SNAPSHOT</kernelVersion>
+ </properties>
+
+ <!-- definition of repositories where the parent pom can be found -->
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>apache.incubator</id>
+ <name>Apache Incubator Repository</name>
+ <url>http://people.apache.org/repo/m2-incubating-repository/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- org.osoa.sca API -->
+ <dependency>
+ <groupId>org.osoa</groupId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Apache Tuscany kernel artifacts -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-api</artifactId>
+ <version>${kernelVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-host-api</artifactId>
+ <version>${kernelVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-spi</artifactId>
+ <version>${kernelVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-core</artifactId>
+ <version>${kernelVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- StAX implementation -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.0</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- junit version -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- EasyMock version -->
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<modules>
<module>services</module>
@@ -37,5 +139,20 @@
<module>webapp</module>
<module>itest</module>
</modules>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+
+ <pluginManagement>
+ <plugins>
+ <!-- version 2.2 or later needed to support parsing of Java5 source code -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
Modified: incubator/tuscany/java/sca/runtime/services/discovery/bonjour/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/discovery/bonjour/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/discovery/bonjour/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/services/discovery/bonjour/pom.xml Wed Feb 21 12:45:37 2007
@@ -18,15 +18,14 @@
* under the License.
-->
<project>
-
<parent>
- <groupId>org.apache.tuscany.sca.runtime.services.discovery</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.services</groupId>
<artifactId>discovery</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.services.discovery</groupId>
<artifactId>discovery-bonjour</artifactId>
- <packaging>jar</packaging>
<name>Apache Tuscany Zeroconf Discovery</name>
<description>Apache Tuscany Zeroconf Discovery</description>
@@ -34,9 +33,8 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-spi</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/tuscany/java/sca/runtime/services/discovery/installjxta/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/discovery/installjxta/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/discovery/installjxta/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/services/discovery/installjxta/pom.xml Wed Feb 21 12:45:37 2007
@@ -18,13 +18,13 @@
* under the License.
-->
<project>
-
<parent>
- <groupId>org.apache.tuscany.sca.runtime.services.discovery</groupId>
- <artifactId>discovery</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca.runtime.services</groupId>
+ <artifactId>discovery</artifactId>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.services.discovery</groupId>
<artifactId>install-jxta</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany Install JXTA</name>
@@ -36,8 +36,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
- <execution>
- <id>install-jxta</id>
+ <execution>
+ <id>install-jxta</id>
<phase>validate</phase>
<goals>
<goal>run</goal>
@@ -51,8 +51,8 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
-
+
</project>
Modified: incubator/tuscany/java/sca/runtime/services/discovery/jxta/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/discovery/jxta/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/discovery/jxta/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/services/discovery/jxta/pom.xml Wed Feb 21 12:45:37 2007
@@ -20,39 +20,38 @@
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.services.discovery</groupId>
- <artifactId>discovery</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca.runtime.services</groupId>
+ <artifactId>discovery</artifactId>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.services.discovery</groupId>
<artifactId>discovery-jxta</artifactId>
<packaging>jar</packaging>
<name>Apache Tuscany JXTA Discovery</name>
<description>Apache Tuscany JXTA Discovery</description>
- <dependencies>
-
+ <dependencies>
+
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-spi</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk14</artifactId>
<version>124</version>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>org.jxta.platform</groupId>
<artifactId>jxta</artifactId>
<version>2.4.1</version>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -63,14 +62,13 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
-
+
</dependencies>
-
+
</project>
Modified: incubator/tuscany/java/sca/runtime/services/discovery/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/discovery/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/discovery/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/services/discovery/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,12 +19,12 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.services</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>services</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.sca.runtime.services.discovery</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.services</groupId>
<artifactId>discovery</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany SCA Discovery Services</name>
Modified: incubator/tuscany/java/sca/runtime/services/management/jmx/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/management/jmx/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/management/jmx/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/services/management/jmx/pom.xml Wed Feb 21 12:45:37 2007
@@ -20,11 +20,12 @@
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.services.management</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.services</groupId>
<artifactId>management</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.services.management</groupId>
<artifactId>management-jmx</artifactId>
<packaging>jar</packaging>
<name>Apache Tuscany JMX Management</name>
@@ -34,8 +35,6 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-spi</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/tuscany/java/sca/runtime/services/management/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/management/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/management/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/services/management/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,12 +19,12 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.services</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>services</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.sca.runtime.services.management</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.services</groupId>
<artifactId>management</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany SCA Management Services</name>
Modified: incubator/tuscany/java/sca/runtime/services/maven/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/maven/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/maven/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/services/maven/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,11 +19,12 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.services</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>services</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.services</groupId>
<artifactId>maven</artifactId>
<name>Apache Tuscany Maven Service</name>
<description>Tuscany Maven Service</description>
@@ -32,14 +33,6 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-spi</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-api</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: incubator/tuscany/java/sca/runtime/services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/services/pom.xml Wed Feb 21 12:45:37 2007
@@ -20,13 +20,13 @@
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>parent</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>runtime</artifactId>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.sca.runtime.services</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>services</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany Runtime Services</name>
Modified: incubator/tuscany/java/sca/runtime/standalone/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/assembly/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/assembly/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/assembly/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,11 +19,12 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>standalone</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>assembly</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany SCA Standalone Assembly</name>
@@ -33,18 +34,12 @@
<dependency>
<groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>launcher</artifactId>
- <version>${sca.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>standalone-host</artifactId>
- <version>${sca.version}</version>
- </dependency>
- <dependency> <!-- needed for axis even on client side-->
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>runtime</scope>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/runtime/standalone/launcher/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/launcher/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/launcher/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/launcher/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,11 +19,12 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>standalone</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>launcher</artifactId>
<name>Apache Tuscany SCA Application Launcher</name>
<description>Standalone executable jar that can be used to launch a SCA application.</description>
@@ -36,15 +37,9 @@
<dependency>
<groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>standalone-api</artifactId>
- <version>${sca.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/tuscany/java/sca/runtime/standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/pom.xml Wed Feb 21 12:45:37 2007
@@ -20,13 +20,13 @@
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>parent</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>runtime</artifactId>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>standalone</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany Standalone SCA Runtime</name>
@@ -37,7 +37,6 @@
<module>standalone-host</module>
<module>server.start</module>
<module>server.shutdown</module>
- <module>plugin.standalone</module>
<module>assembly</module>
<module>smoketest</module>
</modules>
Modified: incubator/tuscany/java/sca/runtime/standalone/server.shutdown/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/server.shutdown/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/server.shutdown/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/server.shutdown/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,26 +19,24 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>standalone</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>server.shutdown</artifactId>
<name>Apache Tuscany Standalone Server Shutdown</name>
<description>Standalone executable jar that can be used to shutdown the tuscany server.</description>
- <!--
- This library will typically be added to the application's classpath and so should
- should have as few dependencies as possible and nothing from the Tuscany runtime.
- -->
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>standalone-api</artifactId>
- <version>${sca.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,11 +19,12 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>standalone</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>server.start</artifactId>
<name>Apache Tuscany Standalone Server Start</name>
<description>Standalone executable jar that can be used to start the tuscany server.</description>
@@ -36,15 +37,16 @@
<dependency>
<groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>standalone-api</artifactId>
- <version>${sca.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.runtime.services.management</groupId>
<artifactId>management-jmx</artifactId>
- <version>${sca.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/tuscany/java/sca/runtime/standalone/smoketest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/smoketest/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/smoketest/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/smoketest/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,11 +19,12 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>standalone</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>smoketest</artifactId>
<name>Apache Tuscany SCA Standalone Smoketest</name>
<description>Module to smoketest the standalone runtime.</description>
@@ -35,9 +36,9 @@
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r1.0</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -66,7 +67,7 @@
<artifactItem>
<groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>assembly</artifactId>
- <version>${sca.version}</version>
+ <version>${project.version}</version>
<classifier>bin</classifier>
<type>zip</type>
<overWrite>true</overWrite>
Modified: incubator/tuscany/java/sca/runtime/standalone/standalone-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/standalone-api/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/standalone-api/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/standalone-api/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,11 +19,12 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>standalone</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>standalone-api</artifactId>
<packaging>jar</packaging>
<name>Apache Tuscany Standalone Runtime</name>
@@ -33,8 +34,6 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-host-api</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
</dependency>
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/runtime/standalone/standalone-host/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/standalone-host/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/standalone-host/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/standalone-host/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,11 +19,12 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>standalone</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>standalone-host</artifactId>
<packaging>jar</packaging>
<name>Apache Tuscany Standalone Runtime Host</name>
@@ -32,20 +33,17 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>core</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
+ <artifactId>tuscany-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>standalone-api</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.runtime.services</groupId>
<artifactId>maven</artifactId>
- <version>${sca.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/runtime/webapp/plugin.war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/plugin.war/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/plugin.war/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/webapp/plugin.war/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,12 +19,13 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>parent</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>sca</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-war-plugin</artifactId>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Tuscany War Plugin</name>
<description>A plugin for Apache Maven that adds a Tuscany runtime to a war.</description>
@@ -48,18 +49,18 @@
</dependencies>
<distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/incubator.apache.org/tuscany/plugins/tuscany-war-plugin</url>
- </site>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/incubator.apache.org/tuscany/plugins/tuscany-war-plugin</url>
+ </site>
</distributionManagement>
<reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
+ </plugins>
</reporting>
</project>
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=510191&r1=510190&r2=510191
==============================================================================
--- 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 Feb 21 12:45:37 2007
@@ -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", "webapp-host", "1.0-incubator-SNAPSHOT");
+ super("org.apache.tuscany.sca.runtime.webapp", "webapp-host", "1.0-alpha-incubating-SNAPSHOT");
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/webapp/pom.xml Wed Feb 21 12:45:37 2007
@@ -18,15 +18,14 @@
* under the License.
-->
<project>
-
<parent>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>parent</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>runtime</artifactId>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany Webapp SCA Runtime</name>
@@ -38,4 +37,14 @@
<module>smoketest</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: incubator/tuscany/java/sca/runtime/webapp/smoketest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/smoketest/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/smoketest/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/webapp/smoketest/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,12 +19,13 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>smoketest</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-smoketest</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany WebApp Smoketest</name>
@@ -38,8 +39,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -51,7 +50,7 @@
<finalName>${artifactId}</finalName>
<plugins>
<plugin>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<version>${project.version}</version>
<executions>
Modified: incubator/tuscany/java/sca/runtime/webapp/smoketest/src/test/java/org/apache/tuscany/sca/runtime/webapp/smoketest/SmokeTestContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/smoketest/src/test/java/org/apache/tuscany/sca/runtime/webapp/smoketest/SmokeTestContext.java?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/smoketest/src/test/java/org/apache/tuscany/sca/runtime/webapp/smoketest/SmokeTestContext.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/smoketest/src/test/java/org/apache/tuscany/sca/runtime/webapp/smoketest/SmokeTestContext.java Wed Feb 21 12:45:37 2007
@@ -53,6 +53,6 @@
protected void setUp() throws Exception {
super.setUp();
- base = new URL("http://localhost:8088/smoketest/");
+ base = new URL("http://localhost:8088/webapp-smoketest/");
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-api/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-api/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-api/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,11 +19,12 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>webapp-api</artifactId>
<packaging>jar</packaging>
<name>Apache Tuscany Web Application Runtime</name>
@@ -38,11 +39,8 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-host-api</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
</dependency>
- <!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/pom.xml?view=diff&rev=510191&r1=510190&r2=510191
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/pom.xml Wed Feb 21 12:45:37 2007
@@ -19,11 +19,12 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-alpha-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>webapp-host</artifactId>
<packaging>jar</packaging>
<name>Apache Tuscany Web Application Host</name>
@@ -37,23 +38,22 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>core</artifactId>
+ <artifactId>tuscany-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.runtime.services</groupId>
<artifactId>maven</artifactId>
- <version>${sca.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
<artifactId>webapp-api</artifactId>
- <version>${sca.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
- <!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org