Update pom relationships to reflect the new samples.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1151265 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 35 insertions, 54 deletions

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml
index a9dd4eaa68..250a7d5e67 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml
@@ -20,13 +20,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 	<modelVersion>4.0.0</modelVersion>

 	<parent>

-		<groupId>org.apache.tuscany.sca</groupId>

-		<artifactId>tuscany-samples</artifactId>

+		<groupId>org.apache.tuscany.sca.samples</groupId>

+		<artifactId>tuscany-samples-binding-comet</artifactId>

 		<version>2.0-SNAPSHOT</version>

-		<relativePath>../../../pom.xml</relativePath>

+		<relativePath>../pom.xml</relativePath>

 	</parent>

 

-	<groupId>org.apache.tuscany.sca</groupId>

 	<artifactId>sample-binding-comet-autocomplete-webapp</artifactId>

 	<packaging>war</packaging>

 	<version>2.0-SNAPSHOT</version>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/pom.xml
index 26b81e507c..8e40af3955 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/pom.xml
@@ -20,13 +20,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 	<modelVersion>4.0.0</modelVersion>

 	<parent>

-		<groupId>org.apache.tuscany.sca</groupId>

-		<artifactId>tuscany-samples</artifactId>

+		<groupId>org.apache.tuscany.sca.samples</groupId>

+		<artifactId>tuscany-samples-binding-comet</artifactId>

 		<version>2.0-SNAPSHOT</version>

-		<relativePath>../../../pom.xml</relativePath>

+		<relativePath>../pom.xml</relativePath>

 	</parent>

 

-	<groupId>org.apache.tuscany.sca</groupId>

 	<artifactId>sample-binding-comet-chat-webapp</artifactId>

 	<packaging>war</packaging>

 	<version>2.0-SNAPSHOT</version>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml
index 46513a29fa..c4436f41d9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml
@@ -20,11 +20,12 @@
 <project>

     <modelVersion>4.0.0</modelVersion>

     <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

+        <groupId>org.apache.tuscany.sca.samples</groupId>

         <artifactId>tuscany-samples-learning-more</artifactId>

         <version>2.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

+
     <artifactId>tuscany-samples-binding-comet</artifactId>

     <packaging>pom</packaging>

     <name>Apache Tuscany SCA Sample binding.comet</name>

@@ -36,8 +37,8 @@
                 <activeByDefault>true</activeByDefault>

             </activation>

             <modules>

-                <module>single-response-webapp</module>
-                <module>multiple-response-webapp</module>
+                <module>autocomplete-webapp</module>
+                <module>weather-webapp</module>
                 <module>pubsub-webapp</module>
                 <module>chat-webapp</module>
             </modules>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/pom.xml
index 3ff9dec58f..48eb1d1737 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/pom.xml
@@ -20,13 +20,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 	<modelVersion>4.0.0</modelVersion>

 	<parent>

-		<groupId>org.apache.tuscany.sca</groupId>

-		<artifactId>tuscany-samples</artifactId>

+		<groupId>org.apache.tuscany.sca.samples</groupId>

+		<artifactId>tuscany-samples-binding-comet</artifactId>

 		<version>2.0-SNAPSHOT</version>

-		<relativePath>../../../pom.xml</relativePath>

+		<relativePath>../pom.xml</relativePath>

 	</parent>

 

-	<groupId>org.apache.tuscany.sca</groupId>

 	<artifactId>sample-binding-comet-pubsub-webapp</artifactId>

 	<packaging>war</packaging>

 	<version>2.0-SNAPSHOT</version>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
index 758eba379d..4cd9f2fb3c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
@@ -20,13 +20,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 	<modelVersion>4.0.0</modelVersion>

 	<parent>

-		<groupId>org.apache.tuscany.sca</groupId>

-		<artifactId>tuscany-samples</artifactId>

+		<groupId>org.apache.tuscany.sca.samples</groupId>

+		<artifactId>tuscany-samples-binding-comet</artifactId>

 		<version>2.0-SNAPSHOT</version>

-		<relativePath>../../../pom.xml</relativePath>

+		<relativePath>../pom.xml</relativePath>

 	</parent>

 

-	<groupId>org.apache.tuscany.sca</groupId>

 	<artifactId>sample-binding-comet-weather-webapp</artifactId>

 	<packaging>war</packaging>

 	<version>2.0-SNAPSHOT</version>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml
index 0768489aa4..672e9244f5 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml
@@ -21,13 +21,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 	<modelVersion>4.0.0</modelVersion>

 	<parent>

-		<groupId>org.apache.tuscany.sca</groupId>

-		<artifactId>tuscany-samples</artifactId>

+		<groupId>org.apache.tuscany.sca.samples</groupId>

+		<artifactId>tuscany-samples-binding-websocket</artifactId>

 		<version>2.0-SNAPSHOT</version>

-		<relativePath>../../../pom.xml</relativePath>

+		<relativePath>../pom.xml</relativePath>

 	</parent>

 

-	<groupId>org.apache.tuscany.sca</groupId>

 	<artifactId>sample-binding-websocket-autocomplete-webapp</artifactId>

 	<packaging>war</packaging>

 	<version>2.0-SNAPSHOT</version>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/pom.xml
index bfa9082d99..1c56719b64 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/pom.xml
@@ -20,13 +20,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 	<modelVersion>4.0.0</modelVersion>

 	<parent>

-		<groupId>org.apache.tuscany.sca</groupId>

-		<artifactId>tuscany-samples</artifactId>

+		<groupId>org.apache.tuscany.sca.samples</groupId>

+		<artifactId>tuscany-samples-binding-websocket</artifactId>

 		<version>2.0-SNAPSHOT</version>

-		<relativePath>../../../pom.xml</relativePath>

+		<relativePath>../pom.xml</relativePath>

 	</parent>

 

-	<groupId>org.apache.tuscany.sca</groupId>

 	<artifactId>sample-binding-websocket-chat-webapp</artifactId>

 	<packaging>war</packaging>

 	<version>2.0-SNAPSHOT</version>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pom.xml
index 4d306a561a..640cf6fdec 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pom.xml
@@ -20,11 +20,12 @@
 <project>

     <modelVersion>4.0.0</modelVersion>

     <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

+        <groupId>org.apache.tuscany.sca.samples</groupId>

         <artifactId>tuscany-samples-learning-more</artifactId>

         <version>2.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

+
     <artifactId>tuscany-samples-binding-websocket</artifactId>

     <packaging>pom</packaging>

     <name>Apache Tuscany SCA Sample binding.websocket</name>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml
index 8005884b2d..13f7bd7958 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml
@@ -20,13 +20,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 	<modelVersion>4.0.0</modelVersion>

 	<parent>

-		<groupId>org.apache.tuscany.sca</groupId>

-		<artifactId>tuscany-samples</artifactId>

+		<groupId>org.apache.tuscany.sca.samples</groupId>

+		<artifactId>tuscany-samples-binding-websocket</artifactId>

 		<version>2.0-SNAPSHOT</version>

-		<relativePath>../../../pom.xml</relativePath>

+		<relativePath>../pom.xml</relativePath>

 	</parent>

 

-	<groupId>org.apache.tuscany.sca</groupId>

 	<artifactId>sample-binding-websocket-pubsub-webapp</artifactId>

 	<packaging>war</packaging>

 	<version>2.0-SNAPSHOT</version>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/pom.xml
index e0ee64c55a..291b673caf 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/pom.xml
@@ -20,13 +20,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 	<modelVersion>4.0.0</modelVersion>

 	<parent>

-		<groupId>org.apache.tuscany.sca</groupId>

-		<artifactId>tuscany-samples</artifactId>

+		<groupId>org.apache.tuscany.sca.samples</groupId>

+		<artifactId>tuscany-samples-binding-websocket</artifactId>

 		<version>2.0-SNAPSHOT</version>

-		<relativePath>../../../pom.xml</relativePath>

+		<relativePath>../pom.xml</relativePath>

 	</parent>

 

-	<groupId>org.apache.tuscany.sca</groupId>

 	<artifactId>sample-binding-websocket-weather-webapp</artifactId>

 	<packaging>war</packaging>

 	<version>2.0-SNAPSHOT</version>

diff --git a/sca-java-2.x/trunk/samples/learning-more/pom.xml b/sca-java-2.x/trunk/samples/learning-more/pom.xml
index 1b11cf0e30..2546e7ef49 100644
--- a/sca-java-2.x/trunk/samples/learning-more/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/pom.xml
@@ -20,12 +20,12 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
+        <groupId>org.apache.tuscany.sca.samples</groupId>
         <artifactId>tuscany-samples</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <groupId>org.apache.tuscany.sca</groupId>
+    
     <artifactId>tuscany-samples-learning-more</artifactId>
     <version>2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
@@ -38,22 +38,8 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>binding-jms</module>
-                <module>binding-rmi</module>
-                <module>binding-sca</module>
-                <module>binding-ws</module>
-                <!-- module>binding-comet</module -->
-                <module>binding-jsonrpc</module>
-                <module>implementation-bpel</module>
-                <module>implementation-composite</module>
-                <module>implementation-java</module>
-                <module>implementation-script</module>
-                <module>implementation-spring</module>
-                <module>implementation-osgi</module>
-                <module>implementation-web</module>
-                <module>distributed-osgi</module>
-                <module>sca-client</module>
-                <module>async</module>
+                <module>binding-comet</module>
+                <module>binding-websocket</module>
             </modules>
         </profile>
     </profiles>    
diff --git a/sca-java-2.x/trunk/samples/pom.xml b/sca-java-2.x/trunk/samples/pom.xml
index 737c3a5f5f..2f0417e09c 100644
--- a/sca-java-2.x/trunk/samples/pom.xml
+++ b/sca-java-2.x/trunk/samples/pom.xml
@@ -34,6 +34,7 @@
     <modules>
         <module>getting-started</module>
         <module>running-tuscany</module>
+	<module>learning-more</module>
     </modules>
 
 </project>