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 22:00:38 UTC

svn commit: r510205 - in /incubator/tuscany/java/sca/core-samples: common/calculator/pom.xml common/pom.xml pom.xml standalone/calculator/pom.xml standalone/loanapplication/pom.xml standalone/pom.xml webapp/pom.xml webapp/webcalc/pom.xml

Author: jboynes
Date: Wed Feb 21 13:00:37 2007
New Revision: 510205

URL: http://svn.apache.org/viewvc?view=rev&rev=510205
Log:
update core-samples module to new parent/kernel version

Modified:
    incubator/tuscany/java/sca/core-samples/common/calculator/pom.xml
    incubator/tuscany/java/sca/core-samples/common/pom.xml
    incubator/tuscany/java/sca/core-samples/pom.xml
    incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml
    incubator/tuscany/java/sca/core-samples/standalone/loanapplication/pom.xml
    incubator/tuscany/java/sca/core-samples/standalone/pom.xml
    incubator/tuscany/java/sca/core-samples/webapp/pom.xml
    incubator/tuscany/java/sca/core-samples/webapp/webcalc/pom.xml

Modified: incubator/tuscany/java/sca/core-samples/common/calculator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/common/calculator/pom.xml?view=diff&rev=510205&r1=510204&r2=510205
==============================================================================
--- incubator/tuscany/java/sca/core-samples/common/calculator/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/common/calculator/pom.xml Wed Feb 21 13:00:37 2007
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.core-samples</groupId>
         <artifactId>common</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.core-samples.common</groupId>
@@ -42,12 +42,11 @@
     </dependencies>
 
     <build>
-        <!-- requires install as this sample is also used by the webapp sample -->
         <defaultGoal>install</defaultGoal>
 
         <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/core-samples/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/common/pom.xml?view=diff&rev=510205&r1=510204&r2=510205
==============================================================================
--- incubator/tuscany/java/sca/core-samples/common/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/common/pom.xml Wed Feb 21 13:00:37 2007
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>core-samples</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.core-samples</groupId>

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=510205&r1=510204&r2=510205
==============================================================================
--- incubator/tuscany/java/sca/core-samples/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/pom.xml Wed Feb 21 13:00:37 2007
@@ -19,36 +19,32 @@
 -->
 <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</groupId>
     <artifactId>core-samples</artifactId>
-    <version>1.0-incubator-SNAPSHOT</version>
+    <version>1.0-alpha-incubating-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Tuscany Core Samples</name>
     <description>Sample projects that illustrate core concepts for SCA and Tuscany.</description>
 
-    <modules>
-        <module>common</module>
-<!--
-        <module>standalone</module>
--->
-        <module>webapp</module>
-    </modules>
-
     <properties>
-        <kernelVersion>1.0-incubator-SNAPSHOT</kernelVersion>
+        <!-- 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>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.osoa</groupId>
-                <artifactId>sca-api-r1.0</artifactId>
-                <version>1.0-incubator-SNAPSHOT</version>
+                <artifactId>sca-api-r${scaSpecVersion}</artifactId>
+                <version>1.0-alpha-incubating-SNAPSHOT</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>

Modified: incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml?view=diff&rev=510205&r1=510204&r2=510205
==============================================================================
--- incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml Wed Feb 21 13:00:37 2007
@@ -21,9 +21,10 @@
     <parent>
         <groupId>org.apache.tuscany.sca.core-samples</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.core-samples.standalone</groupId>
     <artifactId>calc</artifactId>
     <packaging>jar</packaging>
     <name>Apache Tuscany Calculator Client Sample</name>

Modified: incubator/tuscany/java/sca/core-samples/standalone/loanapplication/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/standalone/loanapplication/pom.xml?view=diff&rev=510205&r1=510204&r2=510205
==============================================================================
--- incubator/tuscany/java/sca/core-samples/standalone/loanapplication/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/standalone/loanapplication/pom.xml Wed Feb 21 13:00:37 2007
@@ -21,9 +21,10 @@
     <parent>
         <groupId>org.apache.tuscany.sca.core-samples</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.core-samples.standalone</groupId>
     <artifactId>loan-application</artifactId>
     <packaging>jar</packaging>
     <name>Apache Tuscany Loan Application Client Sample</name>

Modified: incubator/tuscany/java/sca/core-samples/standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/standalone/pom.xml?view=diff&rev=510205&r1=510204&r2=510205
==============================================================================
--- incubator/tuscany/java/sca/core-samples/standalone/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/standalone/pom.xml Wed Feb 21 13:00:37 2007
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>core-samples</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.core-samples</groupId>
@@ -30,7 +30,4 @@
     <name>Apache Tuscany Core Samples Standalone</name>
     <description>Sample projects that run in the standalone environment.</description>
 
-    <modules>
-        <module>calculator</module>
-    </modules>
 </project>

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=510205&r1=510204&r2=510205
==============================================================================
--- incubator/tuscany/java/sca/core-samples/webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/webapp/pom.xml Wed Feb 21 13:00:37 2007
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>core-samples</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.core-samples</groupId>
@@ -30,10 +30,6 @@
     <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>
@@ -44,4 +40,24 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.tuscany</groupId>
+                    <artifactId>tuscany-war-plugin</artifactId>
+                    <version>${kernelVersion}</version>
+                    <executions>
+                        <execution>
+                            <id>tuscany-war</id>
+                            <goals>
+                                <goal>tuscany-war</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </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=510205&r1=510204&r2=510205
==============================================================================
--- incubator/tuscany/java/sca/core-samples/webapp/webcalc/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/webapp/webcalc/pom.xml Wed Feb 21 13:00:37 2007
@@ -21,9 +21,10 @@
     <parent>
         <groupId>org.apache.tuscany.sca.core-samples</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.core-samples.webapp</groupId>
     <artifactId>webcalc</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany WebApp Calculator Sample</name>
@@ -45,17 +46,8 @@
         <finalName>${artifactId}</finalName>
         <plugins>
             <plugin>
-                <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
+                <groupId>org.apache.tuscany</groupId>
                 <artifactId>tuscany-war-plugin</artifactId>
-                <version>${kernelVersion}</version>
-                <executions>
-                    <execution>
-                        <id>tuscany-war</id>
-                        <goals>
-                            <goal>tuscany-war</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org