Copy 1.6 release to new 1.6.1 branch

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

4 files changed, 248 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..0ce45c6392
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	xmlns:s="http://store">
+	<import.java package="services" />
+    <import.java package="services.merger" />
+    <import.resource uri="uiservices/store.html"/> 
+    <deployable composite="s:store-enterprise" />
+</contribution>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/build.xml
new file mode 100644
index 0000000000..d76185d010
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/build.xml
@@ -0,0 +1,54 @@
+<!--
+ * 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 name="tutorial-store-enterprise" default="compile">
+
+    <target name="compile">
+        <mkdir dir="target/classes"/>
+        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+            <src path="."/>
+            <classpath>
+                <fileset refid="tuscany.jars"/>
+                <fileset refid="3rdparty.jars"/>
+            </classpath>
+        </javac>
+        <copy todir="target/classes">
+            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, target"/>
+        </copy>
+        <jar destfile="target/tutorial-store-enterprise.jar" basedir="target/classes">
+            <manifest>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="package" depends="compile"/>
+
+    <target name="clean">
+        <delete includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+
+    <fileset id="tuscany.jars" dir="../../../modules">
+        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
+    </fileset>
+    <fileset id="3rdparty.jars" dir="../../../lib">
+    </fileset>
+
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/pom.xml
new file mode 100644
index 0000000000..2e4e8d56ea
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/pom.xml
@@ -0,0 +1,80 @@
+<?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-tutorial-store</artifactId>
+        <version>1.6-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tutorial-store-enterprise</artifactId>
+    <name>Apache Tuscany SCA Store Tutorial Enterprise Online Store</name>
+
+    <repositories>
+       <repository>
+          <id>apache.incubator</id>
+          <url>http://people.apache.org/repo/m2-incubating-repository</url>
+       </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+       <finalName>${artifactId}</finalName>
+       <sourceDirectory>${basedir}</sourceDirectory>
+       <resources>
+          <resource>
+              <directory>${basedir}</directory>
+              <excludes>
+                  <exclude>**/*.java</exclude>
+                  <exclude>**/.*/**</exclude>
+                  <exclude>pom.xml</exclude>
+                  <exclude>build.xml</exclude>
+                  <exclude>target/**</exclude>
+              </excludes>
+          </resource>
+       </resources>
+       <plugins>
+            <plugin>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-maven-ant-generator</artifactId>
+                <version>1.6-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <pathToRootDir>../../..</pathToRootDir>
+                        </configuration>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+       </plugins>
+    </build>
+
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/store-enterprise.composite b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/store-enterprise.composite
new file mode 100644
index 0000000000..310284f176
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-enterprise/store-enterprise.composite
@@ -0,0 +1,88 @@
+<?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.    
+-->
+<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
+		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+		targetNamespace="http://store"
+		name="store-enterprise">
+		
+    <component name="StoreEnterprise">
+        <t:implementation.widget location="uiservices/store.html"/>
+        <service name="Widget">
+        	<t:binding.http uri="/ui"/> 
+        </service>
+		<reference name="catalog" target="StoreEnterpriseCatalog">
+		 	<t:binding.jsonrpc/>
+		 </reference>
+		 <reference name="shoppingCart" target="StoreEnterpriseShoppingCart/Cart">
+		 	<t:binding.atom/>
+		 </reference>
+		 <reference name="shoppingTotal" target="StoreEnterpriseShoppingCart/Total">
+		 	<t:binding.jsonrpc/>
+		 </reference>
+    </component>
+    
+	<component name="StoreEnterpriseCatalog">
+		<implementation.java class="services.merger.MergedCatalogImpl"/> 
+		<property name="currencyCode">USD</property>
+		<service name="Catalog">
+			<t:binding.jsonrpc/>
+   		</service>
+		<reference name="currencyConverter" target="StoreEnterpriseCurrencyConverter"/>	
+		<reference name="fruitsCatalog" target="StoreEnterpriseFruitsCatalog"/>
+		<reference name="vegetablesCatalog" target="StoreEnterpriseVegetablesCatalog"/> 
+		<!-- reference name="vegetablesCatalog" target="VegetablesCatalogWebService">
+			<binding.ws/>
+		</reference-->
+	</component>
+ 	
+	<component name="StoreEnterpriseFruitsCatalog">
+		<implementation.java class="services.FruitsCatalogImpl"/> 
+		<property name="currencyCode">USD</property>
+		<reference name="currencyConverter" target="StoreEnterpriseCurrencyConverter"/>	
+	</component> 
+    
+    <component name="StoreEnterpriseVegetablesCatalog">
+        <implementation.java class="services.VegetablesCatalogImpl"/>
+    </component>    
+ 	
+	<component name="StoreEnterpriseShoppingCart">
+		<implementation.java class="services.ShoppingCartImpl"/>
+		<service name="Cart">
+			<t:binding.atom uri="/ShoppingCart/Cart"/>
+		</service>    	
+		<service name="Total">
+			<t:binding.jsonrpc/>
+		</service>
+        <reference name="warehouse" multiplicity="0..1" >
+            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory"
+                         jndiURL="tcp://localhost:61619">
+                 <destination name="RequestQueue" create="always"/>
+                 <response>
+                     <destination name="ResponseQueue" create="always"/>
+                 </response>
+            </binding.jms>
+        </reference>
+	</component>
+    
+	<component name="StoreEnterpriseCurrencyConverter">
+		<implementation.java class="services.CurrencyConverterImpl"/>
+	</component>     
+
+</composite>