From 4ef0430519e276c2bdecea75f7a0f42f49f0cf30 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 11 Nov 2009 23:08:37 +0000
Subject: Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835132 13f79535-47bb-0310-9956-ffa450edef68
---
 .../store-supplier/META-INF/sca-contribution.xml   |  27 -----
 .../tutorials/store/store-supplier/pom.xml         | 129 ---------------------
 .../store/store-supplier/store-supplier.composite  |  77 ------------
 3 files changed, 233 deletions(-)
 delete mode 100644 branches/sca-java-1.5/tutorials/store/store-supplier/META-INF/sca-contribution.xml
 delete mode 100644 branches/sca-java-1.5/tutorials/store/store-supplier/pom.xml
 delete mode 100644 branches/sca-java-1.5/tutorials/store/store-supplier/store-supplier.composite

(limited to 'branches/sca-java-1.5/tutorials/store/store-supplier')

diff --git a/branches/sca-java-1.5/tutorials/store/store-supplier/META-INF/sca-contribution.xml b/branches/sca-java-1.5/tutorials/store/store-supplier/META-INF/sca-contribution.xml
deleted file mode 100644
index a75087aca1..0000000000
--- a/branches/sca-java-1.5/tutorials/store/store-supplier/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.java package="services.db"/>
-   <import.resource uri="uiservices/store.html"/>   
-   <deployable composite="s:store-supplier"/>
-</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.5/tutorials/store/store-supplier/pom.xml b/branches/sca-java-1.5/tutorials/store/store-supplier/pom.xml
deleted file mode 100644
index 7fa433df82..0000000000
--- a/branches/sca-java-1.5/tutorials/store/store-supplier/pom.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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.5-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-supplier</artifactId>
-    <name>Apache Tuscany SCA Store Tutorial Supplier 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.5-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.5-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <pathToRootDir>../../..</pathToRootDir>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sql-maven-plugin</artifactId>
-                <version>1.3</version> 
-
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.derby</groupId>
-                        <artifactId>derby</artifactId>
-                        <version>10.3.1.4</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>create-db</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                            <url>jdbc:derby:${basedir}/target/cart-db;create=true</url>
-                            <autocommit>true</autocommit>
-                            <onError>continue</onError>
-                            <onConnectionError>skip</onConnectionError>
-                            <delimiter>;</delimiter>
-                            <srcFiles>
-                                <srcFile>${basedir}/../assets/services/db/cart.sql</srcFile>
-                            </srcFiles>
-                        </configuration>
-                    </execution>
-                    
-                    <!-- Shutdown DB in order to be able to run unit tests -->
-                    <execution>
-                    	<id>shutdown-database-sothat-test-can-run</id>
-                    	<phase>process-test-resources</phase>
-                    	<goals>
-                    		<goal>execute</goal>
-                    	</goals>
-                    	<configuration>
-                    	    <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                    		<url>jdbc:derby:${basedir}/target/cart-db;shutdown=true</url>
-                    		<skipOnConnectionError>true</skipOnConnectionError>
-                    	</configuration>
-                    </execution>
-                </executions>
-            </plugin>	
-       </plugins>
-    </build>
-
-</project>
diff --git a/branches/sca-java-1.5/tutorials/store/store-supplier/store-supplier.composite b/branches/sca-java-1.5/tutorials/store/store-supplier/store-supplier.composite
deleted file mode 100644
index 525bc889cb..0000000000
--- a/branches/sca-java-1.5/tutorials/store/store-supplier/store-supplier.composite
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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-supplier">
-		
-    <component name="StoreSupplier">
-        <t:implementation.widget location="uiservices/store.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/ui"/> 
-        </service>
-		<reference name="catalog" target="StoreSupplierCatalog">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-		 <reference name="shoppingCart" target="StoreSupplierShoppingCart/Cart">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="shoppingTotal" target="StoreSupplierShoppingCart/Total">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-    
-	<component name="StoreSupplierCatalog">
-		<implementation.java class="services.merger.MergedCatalogImpl"/> 
-		<property name="currencyCode">USD</property>
-		<service name="Catalog">
-			<t:binding.jsonrpc/>
-			<binding.ws uri="/CatalogWebService"/>
-   		</service>
-		<reference name="fruitsCatalog" target="StoreSupplierFruitsCatalog"/>	
-		<reference name="vegetablesCatalog" target="VegetablesCatalogWebService">
-			<binding.ws/>
-		</reference>	
-		<reference name="currencyConverter" target="StoreSupplierCurrencyConverter"/>	
-	</component>
- 	
-	<component name="StoreSupplierFruitsCatalog">
-		<implementation.java class="services.FruitsCatalogImpl"/> 
-		<property name="currencyCode">USD</property>
-		<reference name="currencyConverter" target="StoreSupplierCurrencyConverter"/>	
-	</component> 
- 	
-	<component name="StoreSupplierShoppingCart">
-		<implementation.java class="services.db.ShoppingCartTableImpl"/>
-		<property name="database">../store-supplier/target/cart-db</property>
-		<service name="Cart">
-			<t:binding.atom uri="/ShoppingCart/Cart"/>
-		</service>    	
-		<service name="Total">
-			<t:binding.jsonrpc/>
-			<binding.ws uri="/ShoppinCartTotalWebService"/>
-		</service>
-	</component>
-    
-	<component name="StoreSupplierCurrencyConverter">
-		<implementation.java class="services.CurrencyConverterImpl"/>
-	</component>     
-
-</composite>
-- 
cgit v1.2.3