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/12 19:09:20 UTC
svn commit: r506558 - in /incubator/tuscany/java/sca/core-samples: pom.xml
webapp/pom.xml webapp/webcalc/ webapp/webcalc/pom.xml
webapp/webcalc/src/main/webapp/WEB-INF/default.scdl
Author: jboynes
Date: Mon Feb 12 10:09:19 2007
New Revision: 506558
URL: http://svn.apache.org/viewvc?view=rev&rev=506558
Log:
migrate simple webapp calculator sample to 1.0 level
Added:
incubator/tuscany/java/sca/core-samples/webapp/webcalc/
- copied from r506549, incubator/tuscany/tags/java/sca-samples/1.0-incubator-M2/webapp/webapp/
Modified:
incubator/tuscany/java/sca/core-samples/pom.xml
incubator/tuscany/java/sca/core-samples/webapp/pom.xml
incubator/tuscany/java/sca/core-samples/webapp/webcalc/pom.xml
incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/default.scdl
Modified: incubator/tuscany/java/sca/core-samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/pom.xml?view=diff&rev=506558&r1=506557&r2=506558
==============================================================================
--- incubator/tuscany/java/sca/core-samples/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/pom.xml Mon Feb 12 10:09:19 2007
@@ -36,6 +36,10 @@
<module>webapp</module>
</modules>
+ <properties>
+ <kernelVersion>1.0-incubator-SNAPSHOT</kernelVersion>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
Modified: incubator/tuscany/java/sca/core-samples/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/webapp/pom.xml?view=diff&rev=506558&r1=506557&r2=506558
==============================================================================
--- incubator/tuscany/java/sca/core-samples/webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/webapp/pom.xml Mon Feb 12 10:09:19 2007
@@ -29,4 +29,19 @@
<packaging>pom</packaging>
<name>Apache Tuscany Core Samples Webapp</name>
<description>Sample projects that run in the webapp environment.</description>
+
+ <modules>
+ <module>webcalc</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
+ <version>${kernelVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: incubator/tuscany/java/sca/core-samples/webapp/webcalc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/webapp/webcalc/pom.xml?view=diff&rev=506558&r1=506549&r2=506558
==============================================================================
--- incubator/tuscany/java/sca/core-samples/webapp/webcalc/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/webapp/webcalc/pom.xml Mon Feb 12 10:09:19 2007
@@ -19,36 +19,35 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.samples</groupId>
- <artifactId>parent</artifactId>
- <version>1.0-incubator-M2</version>
+ <groupId>org.apache.tuscany.sca.core-samples</groupId>
+ <artifactId>webapp</artifactId>
+ <version>1.0-incubator-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>sample-webapp</artifactId>
+ <artifactId>webcalc</artifactId>
<packaging>war</packaging>
- <name>Apache Tuscany Simple WebApp Sample</name>
- <description>A sample WebApplication showing how to include a Tuscany runtime.</description>
+ <name>Apache Tuscany WebApp Calculator Sample</name>
+ <description>A sample using an SCA composite a web application.</description>
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.samples</groupId>
- <artifactId>sample-calculator</artifactId>
- <version>${scaImplVersion}</version>
+ <groupId>org.apache.tuscany.sca.core-samples</groupId>
+ <artifactId>calculator</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>webapp</artifactId>
- <version>${scaImplVersion}</version>
+ <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+ <artifactId>webapp-api</artifactId>
</dependency>
</dependencies>
<build>
<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>
+ <version>${kernelVersion}</version>
<executions>
<execution>
<id>tuscany-war</id>
Modified: incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/default.scdl?view=diff&rev=506558&r1=506549&r2=506558
==============================================================================
--- incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/default.scdl (original)
+++ incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/default.scdl Mon Feb 12 10:09:19 2007
@@ -20,7 +20,7 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
name="CalculatorComposite">
- <component name="CalculatorServiceComponent">
- <implementation.composite name="CalculatorComposite" jarLocation="lib/sample-calculator-1.0-incubator-M2.jar"/>
+ <component name="CalculatorComponent">
+ <implementation.composite name="CalculatorComposite" jarLocation="lib/calculator-1.0-incubator-SNAPSHOT.jar"/>
</component>
</composite>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org