Author: jsdelfino
Date: Thu Dec 13 17:35:30 2007
New Revision: 604077
URL: http://svn.apache.org/viewvc?rev=604077&view=rev
Log:
Starting to improve the structure of the tutorial modules.
Added:
incubator/tuscany/java/sca/tutorial/store-db/
- copied from r604055, incubator/tuscany/java/sca/tutorial/store/
incubator/tuscany/java/sca/tutorial/store-merger/
- copied from r604055, incubator/tuscany/java/sca/tutorial/store/
incubator/tuscany/java/sca/tutorial/store-supplier/
- copied from r604055, incubator/tuscany/java/sca/tutorial/store/
incubator/tuscany/java/sca/tutorial/store-supplier/launch/LaunchStoreSupplier.java
(with props)
incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite
(with props)
Removed:
incubator/tuscany/java/sca/tutorial/store-db/launch/LaunchStore.java
incubator/tuscany/java/sca/tutorial/store-db/launch/LaunchStoreDistributed.java
incubator/tuscany/java/sca/tutorial/store-db/launch/LaunchStoreMerger.java
incubator/tuscany/java/sca/tutorial/store-db/store-distributed.composite
incubator/tuscany/java/sca/tutorial/store-db/store-merger.composite
incubator/tuscany/java/sca/tutorial/store-db/store.composite
incubator/tuscany/java/sca/tutorial/store-merger/launch/LaunchStore.java
incubator/tuscany/java/sca/tutorial/store-merger/launch/LaunchStoreDB.java
incubator/tuscany/java/sca/tutorial/store-merger/launch/LaunchStoreDistributed.java
incubator/tuscany/java/sca/tutorial/store-merger/store-db.composite
incubator/tuscany/java/sca/tutorial/store-merger/store-distributed.composite
incubator/tuscany/java/sca/tutorial/store-merger/store.composite
incubator/tuscany/java/sca/tutorial/store-supplier/launch/LaunchStore.java
incubator/tuscany/java/sca/tutorial/store-supplier/launch/LaunchStoreDB.java
incubator/tuscany/java/sca/tutorial/store-supplier/launch/LaunchStoreDistributed.java
incubator/tuscany/java/sca/tutorial/store-supplier/launch/LaunchStoreMerger.java
incubator/tuscany/java/sca/tutorial/store-supplier/store-db.composite
incubator/tuscany/java/sca/tutorial/store-supplier/store-distributed.composite
incubator/tuscany/java/sca/tutorial/store-supplier/store-merger.composite
incubator/tuscany/java/sca/tutorial/store-supplier/store.composite
incubator/tuscany/java/sca/tutorial/store/launch/LaunchStoreDB.java
incubator/tuscany/java/sca/tutorial/store/launch/LaunchStoreMerger.java
incubator/tuscany/java/sca/tutorial/store/store-db.composite
incubator/tuscany/java/sca/tutorial/store/store-merger.composite
Modified:
incubator/tuscany/java/sca/tutorial/assets/tutorial.html
incubator/tuscany/java/sca/tutorial/pom.xml
incubator/tuscany/java/sca/tutorial/store-db/pom.xml
incubator/tuscany/java/sca/tutorial/store-db/store-db.composite
incubator/tuscany/java/sca/tutorial/store-eu/pom.xml
incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite
incubator/tuscany/java/sca/tutorial/store-merger/launch/LaunchStoreMerger.java
incubator/tuscany/java/sca/tutorial/store-merger/pom.xml
incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite
incubator/tuscany/java/sca/tutorial/store-supplier/pom.xml
incubator/tuscany/java/sca/tutorial/store/pom.xml
Modified: incubator/tuscany/java/sca/tutorial/assets/tutorial.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/assets/tutorial.html?rev=604077&r1=604076&r2=604077&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/assets/tutorial.html (original)
+++ incubator/tuscany/java/sca/tutorial/assets/tutorial.html Thu Dec 13
17:35:30 2007
@@ -24,10 +24,11 @@
<body>
<h1>Apache Tuscany - Online Store Tutorial
<h2><a href="http://localhost:8100/ui/store.html";>Online Store - Fruits</a>
-<h2><a href="http://localhost:8200/CloudVegetablesCatalog?wsdl";>Vegetables
Catalog Service</a>
+<h2><a href="http://localhost:8200/CloudVegetablesCatalog?wsdl";>Vegetables
Catalog Web Service</a>
<h2><a href="http://localhost:8101/ui/store.html";>Merger - Fruits and
Vegetables</a>
-<h2><a href="http://localhost:8101/CatalogWebService?wsdl";>Merged Catalog
Service</a>
<h2><a href="http://localhost:8102/ui/store.html";>Online Store - Cart
Database</a>
-<h2><a href="http://localhost:8103/ui/store.html";>EU Online Store</a>
+<h2><a href="http://localhost:8103/ui/store.html";>Online Store - Supplier</a>
+<h2><a href="http://localhost:8103/CatalogWebService?wsdl";>Merged Catalog Web
Service</a>
+<h2><a href="http://localhost:8104/ui/store.html";>EU Online Store</a>
</body>
</html>
Modified: incubator/tuscany/java/sca/tutorial/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/pom.xml?rev=604077&r1=604076&r2=604077&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/pom.xml Thu Dec 13 17:35:30 2007
@@ -36,15 +36,20 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
+ <!--
+ <module>amazon</module>
+ -->
<module>assets</module>
- <module>cloud</module>
<module>catalog-ejb</module>
<module>catalog-jee</module>
<module>catalog-jse</module>
+ <module>cloud</module>
<module>store</module>
+ <module>store-db</module>
<module>store-eu</module>
+ <module>store-merger</module>
+ <module>store-supplier</module>
<module>www-cloud</module>
- <module>amazon</module>
</modules>
</profile>
Modified: incubator/tuscany/java/sca/tutorial/store-db/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-db/pom.xml?rev=604077&r1=604055&r2=604077&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-db/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store-db/pom.xml Thu Dec 13 17:35:30
2007
@@ -25,8 +25,8 @@
<version>1.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tutorial-store</artifactId>
- <name>Apache Tuscany SCA Tutorial Online Store</name>
+ <artifactId>tutorial-store-db</artifactId>
+ <name>Apache Tuscany SCA Tutorial Online Store Using DB</name>
<repositories>
<repository>
@@ -135,7 +135,7 @@
<executions>
<execution>
<configuration>
- <mainClass>launch.LaunchStore</mainClass>
+ <mainClass>launch.LaunchStoreDB</mainClass>
</configuration>
<goals>
<goal>generate</goal>
Modified: incubator/tuscany/java/sca/tutorial/store-db/store-db.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-db/store-db.composite?rev=604077&r1=604055&r2=604077&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-db/store-db.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store-db/store-db.composite Thu Dec 13
17:35:30 2007
@@ -43,7 +43,6 @@
<property name="currencyCode">USD</property>
<service name="Catalog">
<t:binding.jsonrpc/>
- <binding.ws uri="/CatalogWebService"/>
</service>
<reference name="fruitsCatalog" target="FruitsCatalog"/>
<reference name="vegetablesCatalog"
target="CloudVegetablesCatalog"/>
Modified: incubator/tuscany/java/sca/tutorial/store-eu/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-eu/pom.xml?rev=604077&r1=604076&r2=604077&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-eu/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store-eu/pom.xml Thu Dec 13 17:35:30
2007
@@ -127,7 +127,7 @@
<executions>
<execution>
<configuration>
- <mainClass>launch.LaunchStore</mainClass>
+ <mainClass>launch.LaunchEUStore</mainClass>
</configuration>
<goals>
<goal>generate</goal>
Modified: incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite?rev=604077&r1=604076&r2=604077&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite Thu Dec 13
17:35:30 2007
@@ -25,7 +25,7 @@
<component name="Store">
<t:implementation.widget location="uiservices/store.html"/>
<service name="Widget">
- <t:binding.http uri="http://localhost:8103/ui"/>
+ <t:binding.http uri="http://localhost:8104/ui"/>
</service>
<reference name="catalog" target="Catalog">
<t:binding.jsonrpc/>
@@ -43,7 +43,7 @@
<property name="currencyCode">EUR</property>
<service name="Catalog">
<t:binding.jsonrpc/>
- <binding.ws uri="/CatalogWebService"/>
+ <binding.ws
uri="http://localhost:8104/CatalogWebService"/>
</service>
<reference name="fruitsCatalog" target="CloudFruitsCatalog"/>
<reference name="vegetablesCatalog"
target="CloudVegetablesCatalog"/>
Modified:
incubator/tuscany/java/sca/tutorial/store-merger/launch/LaunchStoreMerger.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-merger/launch/LaunchStoreMerger.java?rev=604077&r1=604055&r2=604077&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tutorial/store-merger/launch/LaunchStoreMerger.java
(original)
+++
incubator/tuscany/java/sca/tutorial/store-merger/launch/LaunchStoreMerger.java
Thu Dec 13 17:35:30 2007
@@ -31,7 +31,7 @@
public static void main(String[] args) throws Exception {
System.out.println("Starting ...");
SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- SCANode node = nodeFactory.createSCANode("http://localhost:8101";,
"http://localhost:9998";);
+ SCANode node = nodeFactory.createSCANode(null,
"http://localhost:9998";);
URL contribution =
SCAContributionUtil.findContributionFromClass(LaunchStoreMerger.class);
node.addContribution("http://store";, contribution);
Modified: incubator/tuscany/java/sca/tutorial/store-merger/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-merger/pom.xml?rev=604077&r1=604055&r2=604077&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-merger/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store-merger/pom.xml Thu Dec 13
17:35:30 2007
@@ -25,8 +25,8 @@
<version>1.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tutorial-store</artifactId>
- <name>Apache Tuscany SCA Tutorial Online Store</name>
+ <artifactId>tutorial-store-merger</artifactId>
+ <name>Apache Tuscany SCA Tutorial Merger Online Store</name>
<repositories>
<repository>
@@ -135,7 +135,7 @@
<executions>
<execution>
<configuration>
- <mainClass>launch.LaunchStore</mainClass>
+ <mainClass>launch.LaunchStoreMerger</mainClass>
</configuration>
<goals>
<goal>generate</goal>
Modified:
incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite?rev=604077&r1=604055&r2=604077&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite
(original)
+++ incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite Thu
Dec 13 17:35:30 2007
@@ -25,7 +25,7 @@
<component name="Store">
<t:implementation.widget location="uiservices/store.html"/>
<service name="Widget">
- <t:binding.http uri="/ui"/>
+ <t:binding.http uri="http://localhost:8101/ui"/>
</service>
<reference name="catalog" target="Catalog">
<t:binding.jsonrpc/>
@@ -43,7 +43,6 @@
<property name="currencyCode">USD</property>
<service name="Catalog">
<t:binding.jsonrpc/>
- <binding.ws uri="/CatalogWebService"/>
</service>
<reference name="fruitsCatalog" target="FruitsCatalog"/>
<reference name="vegetablesCatalog"
target="CloudVegetablesCatalog"/>
Added:
incubator/tuscany/java/sca/tutorial/store-supplier/launch/LaunchStoreSupplier.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-supplier/launch/LaunchStoreSupplier.java?rev=604077&view=auto
==============================================================================
---
incubator/tuscany/java/sca/tutorial/store-supplier/launch/LaunchStoreSupplier.java
(added)
+++
incubator/tuscany/java/sca/tutorial/store-supplier/launch/LaunchStoreSupplier.java
Thu Dec 13 17:35:30 2007
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+package launch;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.util.SCAContributionUtil;
+
+public class LaunchStoreSupplier {
+ public static void main(String[] args) throws Exception {
+ System.out.println("Starting ...");
+ SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ SCANode node = nodeFactory.createSCANode(null,
"http://localhost:9998";);
+
+ URL contribution =
SCAContributionUtil.findContributionFromClass(LaunchStoreSupplier.class);
+ node.addContribution("http://store";, contribution);
+
+ node.addToDomainLevelComposite(new QName("http://store";,
"store-supplier"));
+ node.start();
+
+ System.out.println("store-supplier.composite ready for big business
!!!");
+ System.in.read();
+
+ System.out.println("Stopping ...");
+ node.stop();
+ node.destroy();
+ System.out.println();
+ }
+}
Propchange:
incubator/tuscany/java/sca/tutorial/store-supplier/launch/LaunchStoreSupplier.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/tutorial/store-supplier/launch/LaunchStoreSupplier.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/tutorial/store-supplier/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-supplier/pom.xml?rev=604077&r1=604055&r2=604077&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-supplier/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store-supplier/pom.xml Thu Dec 13
17:35:30 2007
@@ -25,8 +25,8 @@
<version>1.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tutorial-store</artifactId>
- <name>Apache Tuscany SCA Tutorial Online Store</name>
+ <artifactId>tutorial-store-supplier</artifactId>
+ <name>Apache Tuscany SCA Tutorial Supplier Online Store</name>
<repositories>
<repository>
@@ -135,7 +135,7 @@
<executions>
<execution>
<configuration>
- <mainClass>launch.LaunchStore</mainClass>
+ <mainClass>launch.LaunchStoreSupplier</mainClass>
</configuration>
<goals>
<goal>generate</goal>
Added:
incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite?rev=604077&view=auto
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite
(added)
+++ incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite
Thu Dec 13 17:35:30 2007
@@ -0,0 +1,74 @@
+<?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="Store">
+ <t:implementation.widget location="uiservices/store.html"/>
+ <service name="Widget">
+ <t:binding.http uri="http://localhost:8103/ui"/>
+ </service>
+ <reference name="catalog" target="Catalog">
+ <t:binding.jsonrpc/>
+ </reference>
+ <reference name="shoppingCart" target="ShoppingCart/Cart">
+ <t:binding.atom/>
+ </reference>
+ <reference name="shoppingTotal" target="ShoppingCart/Total">
+ <t:binding.jsonrpc/>
+ </reference>
+ </component>
+
+ <component name="Catalog">
+ <implementation.java
class="services.merger.MergedCatalogImpl"/>
+ <property name="currencyCode">USD</property>
+ <service name="Catalog">
+ <t:binding.jsonrpc/>
+ <binding.ws
uri="http://localhost:8103/CatalogWebService"/>
+ </service>
+ <reference name="fruitsCatalog" target="FruitsCatalog"/>
+ <reference name="vegetablesCatalog"
target="CloudVegetablesCatalog"/>
+ <reference name="currencyConverter"
target="CurrencyConverter"/>
+ </component>
+
+ <component name="FruitsCatalog">
+ <implementation.java class="services.FruitsCatalogImpl"/>
+ <property name="currencyCode">USD</property>
+ <reference name="currencyConverter"
target="CurrencyConverter"/>
+ </component>
+
+ <component name="ShoppingCart">
+ <implementation.java class="services.db.ShoppingCartTableImpl"/>
+ <property name="database">cart-db</property>
+ <service name="Cart">
+ <t:binding.atom/>
+ </service>
+ <service name="Total">
+ <t:binding.jsonrpc/>
+ </service>
+ </component>
+
+ <component name="CurrencyConverter">
+ <implementation.java class="services.CurrencyConverterImpl"/>
+ </component>
+
+</composite>
Propchange:
incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/tutorial/store/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store/pom.xml?rev=604077&r1=604076&r2=604077&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store/pom.xml Thu Dec 13 17:35:30 2007
@@ -143,40 +143,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sql-maven-plugin</artifactId>
- <version>1.0</version>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.2.1</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>
- <delimiter>;</delimiter>
- <srcFiles>
-
<srcFile>${basedir}/../assets/services/db/cart.sql</srcFile>
- </srcFiles>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
