Moved tutorial-store under tutorials, adjusted poms and assembly.

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

20 files changed, 42 insertions, 45 deletions

diff --git a/java/sca/tutorials/store/assets/pom.xml b/java/sca/tutorials/store/assets/pom.xml
index 61d42bb271..4902105703 100644
--- a/java/sca/tutorials/store/assets/pom.xml
+++ b/java/sca/tutorials/store/assets/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-assets</artifactId>
-    <name>Apache Tuscany SCA Tutorial Reusable Assets</name>
+    <name>Apache Tuscany SCA Store Tutorial Reusable Assets</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/catalog-ejb/pom.xml b/java/sca/tutorials/store/catalog-ejb/pom.xml
index e0e22073f8..3636220631 100644
--- a/java/sca/tutorials/store/catalog-ejb/pom.xml
+++ b/java/sca/tutorials/store/catalog-ejb/pom.xml
@@ -18,20 +18,17 @@
     under the License.

 -->

 

-<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">

-

+<project>

     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-tutorial</artifactId>

+        <artifactId>tuscany-tutorial-store</artifactId>

         <version>1.4-SNAPSHOT</version>

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

     </parent>

 

     <artifactId>tutorial-catalog-ejb</artifactId>

-    <name>Apache Tuscany SCA Tutorial Catalog EJB</name>

+    <name>Apache Tuscany SCA Store Tutorial Catalog EJB</name>

     <packaging>jar</packaging>

 

     <dependencies>

diff --git a/java/sca/tutorials/store/catalog-mediation/pom.xml b/java/sca/tutorials/store/catalog-mediation/pom.xml
index 1b158d212a..504908a9ab 100644
--- a/java/sca/tutorials/store/catalog-mediation/pom.xml
+++ b/java/sca/tutorials/store/catalog-mediation/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-catalog-mediation</artifactId>
-    <name>Apache Tuscany SCA Tutorial Catalog Mediation</name>
+    <name>Apache Tuscany SCA Store Tutorial Catalog Mediation</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/catalog-webapp/pom.xml b/java/sca/tutorials/store/catalog-webapp/pom.xml
index 5baeb2daec..49319381ac 100644
--- a/java/sca/tutorials/store/catalog-webapp/pom.xml
+++ b/java/sca/tutorials/store/catalog-webapp/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-tutorial</artifactId>

+        <artifactId>tuscany-tutorial-store</artifactId>

         <version>1.4-SNAPSHOT</version>

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

     </parent>

     <artifactId>tutorial-catalog-webapp</artifactId>

-    <name>Apache Tuscany SCA Tutorial Catalog WAR Contribution</name>

+    <name>Apache Tuscany SCA Store Tutorial Catalog WAR Contribution</name>

     <packaging>war</packaging>

 

     <repositories>

diff --git a/java/sca/tutorials/store/domain/pom.xml b/java/sca/tutorials/store/domain/pom.xml
index 20c3b6d573..41ab070a0c 100644
--- a/java/sca/tutorials/store/domain/pom.xml
+++ b/java/sca/tutorials/store/domain/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-domain</artifactId>
-    <name>Apache Tuscany SCA Tutorial Domain</name>
+    <name>Apache Tuscany SCA Store Tutorial Domain</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/pom.xml b/java/sca/tutorials/store/pom.xml
index 58e7da92d2..fd44a6d3b3 100644
--- a/java/sca/tutorials/store/pom.xml
+++ b/java/sca/tutorials/store/pom.xml
@@ -21,13 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-tutorials</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>tuscany-tutorial</artifactId>
+    <artifactId>tuscany-tutorial-store</artifactId>
     <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Tutorial</name>
+    <name>Apache Tuscany SCA Store Tutorial</name>
 
     <profiles>
         <profile>
diff --git a/java/sca/tutorials/store/store-client/pom.xml b/java/sca/tutorials/store/store-client/pom.xml
index 0e180fce00..b7155ee8cd 100644
--- a/java/sca/tutorials/store/store-client/pom.xml
+++ b/java/sca/tutorials/store/store-client/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-client</artifactId>
-    <name>Apache Tuscany SCA Tutorial Online Store Client</name>
+    <name>Apache Tuscany SCA Store Tutorial Online Store Client</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/store-db/pom.xml b/java/sca/tutorials/store/store-db/pom.xml
index 814f8272cb..b3ec4949ab 100644
--- a/java/sca/tutorials/store/store-db/pom.xml
+++ b/java/sca/tutorials/store/store-db/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-db</artifactId>
-    <name>Apache Tuscany SCA Tutorial Online Store Using DB</name>
+    <name>Apache Tuscany SCA Store Tutorial Online Store Using DB</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/store-eu/pom.xml b/java/sca/tutorials/store/store-eu/pom.xml
index 42290746d1..b689c888e6 100644
--- a/java/sca/tutorials/store/store-eu/pom.xml
+++ b/java/sca/tutorials/store/store-eu/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-eu</artifactId>
-    <name>Apache Tuscany SCA Tutorial EU Online Store</name>
+    <name>Apache Tuscany SCA Store Tutorial EU Online Store</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/store-market/pom.xml b/java/sca/tutorials/store/store-market/pom.xml
index 68a11f06e7..50a931ead3 100644
--- a/java/sca/tutorials/store/store-market/pom.xml
+++ b/java/sca/tutorials/store/store-market/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-market</artifactId>
-    <name>Apache Tuscany SCA Tutorial Marketplace Online Store</name>
+    <name>Apache Tuscany SCA Store Tutorial Marketplace Online Store</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/store-mashup/pom.xml b/java/sca/tutorials/store/store-mashup/pom.xml
index 190f833496..475620e99f 100644
--- a/java/sca/tutorials/store/store-mashup/pom.xml
+++ b/java/sca/tutorials/store/store-mashup/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-mashup</artifactId>
-    <name>Apache Tuscany SCA Tutorial Online Store Mashup</name>
+    <name>Apache Tuscany SCA Store Tutorial Online Store Mashup</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/store-merger/pom.xml b/java/sca/tutorials/store/store-merger/pom.xml
index 22a3d99186..5a0b6f6dec 100644
--- a/java/sca/tutorials/store/store-merger/pom.xml
+++ b/java/sca/tutorials/store/store-merger/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-merger</artifactId>
-    <name>Apache Tuscany SCA Tutorial Merger Online Store</name>
+    <name>Apache Tuscany SCA Store Tutorial Merger Online Store</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/store-supplier/pom.xml b/java/sca/tutorials/store/store-supplier/pom.xml
index e842bc6f41..cc0cfdd630 100644
--- a/java/sca/tutorials/store/store-supplier/pom.xml
+++ b/java/sca/tutorials/store/store-supplier/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-supplier</artifactId>
-    <name>Apache Tuscany SCA Tutorial Supplier Online Store</name>
+    <name>Apache Tuscany SCA Store Tutorial Supplier Online Store</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/store-test/pom.xml b/java/sca/tutorials/store/store-test/pom.xml
index bac736d5bd..057d3713d8 100644
--- a/java/sca/tutorials/store/store-test/pom.xml
+++ b/java/sca/tutorials/store/store-test/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-test</artifactId>
-    <name>Apache Tuscany SCA Tutorial Integration Test</name>
+    <name>Apache Tuscany SCA Store Tutorial Integration Test</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/store/pom.xml b/java/sca/tutorials/store/store/pom.xml
index 70a2ea2304..232b9901f7 100644
--- a/java/sca/tutorials/store/store/pom.xml
+++ b/java/sca/tutorials/store/store/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store</artifactId>
-    <name>Apache Tuscany SCA Tutorial Online Store</name>
+    <name>Apache Tuscany SCA Store Tutorial Online Store</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/web-services/pom.xml b/java/sca/tutorials/store/web-services/pom.xml
index 9f325ba0f8..43cc88510e 100644
--- a/java/sca/tutorials/store/web-services/pom.xml
+++ b/java/sca/tutorials/store/web-services/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-web-services</artifactId>
-    <name>Apache Tuscany SCA Tutorial Web Services</name>
+    <name>Apache Tuscany SCA Store Tutorial Web Services</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/www-services/cart-amazon/pom.xml b/java/sca/tutorials/store/www-services/cart-amazon/pom.xml
index 3e5d5983ed..9b4b725746 100644
--- a/java/sca/tutorials/store/www-services/cart-amazon/pom.xml
+++ b/java/sca/tutorials/store/www-services/cart-amazon/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-tutorial</artifactId>

+        <artifactId>tuscany-tutorial-store</artifactId>

         <version>1.4-SNAPSHOT</version>

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

     </parent>

     <artifactId>tutorial-cart-amazon</artifactId>

-    <name>Apache Tuscany SCA Tutorial Amazon Cart</name>

+    <name>Apache Tuscany SCA Store Tutorial Amazon Cart</name>

 

     <dependencies>

 

diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/pom.xml b/java/sca/tutorials/store/www-services/catalog-amazon/pom.xml
index d585f4c771..c333abafd3 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/pom.xml
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/pom.xml
@@ -21,13 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-catalog-amazon</artifactId>
     <packaging>jar</packaging>
-    <name>Apache Tuscany SCA Tutorial Amazon Catalog</name>
+    <name>Apache Tuscany SCA Store Tutorial Amazon Catalog</name>
 
     <dependencies>
         <dependency>
diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/store-db/pom.xml b/java/sca/tutorials/store/www-services/catalog-amazon/store-db/pom.xml
index 1b9b08b236..a03234ec3f 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/store-db/pom.xml
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/store-db/pom.xml
@@ -21,12 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-db</artifactId>
-    <name>Apache Tuscany SCA Tutorial Catalog Database</name>
+    <name>Apache Tuscany SCA Store Tutorial Catalog Database</name>
 
     <repositories>
        <repository>
diff --git a/java/sca/tutorials/store/www-services/pom.xml b/java/sca/tutorials/store/www-services/pom.xml
index b0de297828..967cf33a79 100644
--- a/java/sca/tutorials/store/www-services/pom.xml
+++ b/java/sca/tutorials/store/www-services/pom.xml
@@ -21,13 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <artifactId>tuscany-tutorial-store</artifactId>
         <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-www-services</artifactId>
     <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Tutorial External Web Services</name>
+    <name>Apache Tuscany SCA Store Tutorial External Web Services</name>
 
     <profiles>
         <profile>