TUSCANY-3677 fix up poms to match getting started reorg

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

6 files changed, 100 insertions, 14 deletions

diff --git a/sca-java-2.x/trunk/samples/getting-started/pom.xml b/sca-java-2.x/trunk/samples/getting-started/pom.xml
index 51afb53031..b8d9e11fcd 100644
--- a/sca-java-2.x/trunk/samples/getting-started/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/pom.xml
@@ -37,8 +37,8 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>contributions</module>
-                <module>webapps</module>
+                <module>contribution-helloworld</module>
+                <module>helloworld-webapp</module>
             </modules>
         </profile>
     </profiles>    
diff --git a/sca-java-2.x/trunk/samples/getting-started/contributions/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml
index f4ef307a0d..53ede3e358 100644
--- a/sca-java-2.x/trunk/samples/getting-started/contributions/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml
@@ -25,9 +25,9 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>tuscany-samples-getting-started</artifactId>
+    <artifactId>tuscany-samples-implememtation-bpel</artifactId>
     <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Getting Started Samples</name>
+    <name>Apache Tuscany SCA Implementation BPEL Samples</name>
 
     <profiles>
         <profile>
@@ -36,10 +36,8 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>helloworld</module>
-                <module>helloworld-scaclient</module>    
-                <module>helloworld-bpel</module>
-                <module>helloworld-spring</module>   
+                <module>contribution-helloworld-bpel</module>
+                <module>helloworld-bpel-webapp</module>
             </modules>
         </profile>
     </profiles>    
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/pom.xml
new file mode 100644
index 0000000000..f19bdfc99c
--- /dev/null
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/pom.xml
@@ -0,0 +1,44 @@
+<?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>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-samples-implememtation-composite</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Implementation Composite Samples</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>helloworld-recursive</module>
+                <module>helloworld-recursive-ws</module>
+            </modules>
+        </profile>
+    </profiles>    
+</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml
new file mode 100644
index 0000000000..0cc184cbb4
--- /dev/null
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml
@@ -0,0 +1,44 @@
+<?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>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-samples-implememtation-spring</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Implementation Spring Samples</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>contribution-helloworld-spring</module>
+                <module>helloworld-spring-webapp</module>
+            </modules>
+        </profile>
+    </profiles>    
+</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/pom.xml
index f715c8eb23..30904804a6 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/pom.xml
@@ -25,9 +25,9 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>tuscany-samples-getting-started-webapps</artifactId>
+    <artifactId>tuscany-samples-implementation-webapp</artifactId>
     <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Getting Started Sample Web Applications</name>
+    <name>Apache Tuscany SCA Sample Web Applications</name>
 
     <profiles>
         <profile>
@@ -36,15 +36,12 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>helloworld</module>
-                <module>helloworld-bpel</module>
                 <module>helloworld-jaxrs</module>
                 <module>helloworld-jms</module>
                 <module>helloworld-js-client</module>
                 <module>helloworld-jsf</module>
                 <module>helloworld-jsp</module>
                 <module>helloworld-servlet</module>
-                <module>helloworld-spring</module>
                 <module>helloworld-stripes</module>
             </modules>
         </profile>
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 a18967ee4d..ee54a73360 100644
--- a/sca-java-2.x/trunk/samples/learning-more/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/pom.xml
@@ -43,11 +43,14 @@
                 <module>binding-ws</module>
                 <module>binding-comet</module>
                 <module>binding-jsonrpc</module>
+                <module>implementation-bpel</module>
+                <module>implementation-composite</module>
                 <module>implementation-extension</module>
                 <module>implementation-java</module>
                 <module>implementation-script</module>
-                <module>distributed-osgi</module>
+                <module>implementation-spring</module>
                 <module>implementation-osgi</module>
+                <module>implementation-webapp</module>
                 <module>sca-client</module>
                 <module>async</module>
                 <module>maven-osgi-junit</module>