Author: jsdelfino
Date: Sat Mar 8 16:11:48 2008
New Revision: 635122
URL: http://svn.apache.org/viewvc?rev=635122&view=rev
Log:
Added a module to the tutorial to host the domain configuration. Fixed some of
the bindings as they were not properly declared as binding.ws. Added sample
launchers.
Added:
incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCatalogs.java
(with props)
incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCurrency.java
(with props)
incubator/tuscany/java/sca/tutorial/domain/
- copied from r634808, incubator/tuscany/java/sca/tutorial/nodes/
incubator/tuscany/java/sca/tutorial/domain/cloud.composite (with props)
incubator/tuscany/java/sca/tutorial/domain/contributions/
incubator/tuscany/java/sca/tutorial/domain/domain.composite (with props)
incubator/tuscany/java/sca/tutorial/domain/launch/
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialAdmin.java
(with props)
incubator/tuscany/java/sca/tutorial/domain/workspace.xml (with props)
Removed:
incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java
incubator/tuscany/java/sca/tutorial/domain/META-INF/
incubator/tuscany/java/sca/tutorial/domain/backend-nodes.composite
incubator/tuscany/java/sca/tutorial/domain/frontend-eu-node.composite
incubator/tuscany/java/sca/tutorial/domain/frontend-us-node.composite
incubator/tuscany/java/sca/tutorial/domain/merger-nodes.composite
incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore2.java
Modified:
incubator/tuscany/java/sca/tutorial/cloud/catalogs.composite
incubator/tuscany/java/sca/tutorial/cloud/currency.composite
incubator/tuscany/java/sca/tutorial/cloud/pom.xml
incubator/tuscany/java/sca/tutorial/domain/pom.xml
incubator/tuscany/java/sca/tutorial/pom.xml
incubator/tuscany/java/sca/tutorial/store-db/store-db.composite
incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite
incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite
incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite
incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java
Modified: incubator/tuscany/java/sca/tutorial/cloud/catalogs.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/cloud/catalogs.composite?rev=635122&r1=635121&r2=635122&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/cloud/catalogs.composite (original)
+++ incubator/tuscany/java/sca/tutorial/cloud/catalogs.composite Sat Mar 8
16:11:48 2008
@@ -25,16 +25,18 @@
<component name="CloudFruitsCatalog">
<implementation.java class="services.FruitsCatalogImpl"/>
<service name="Catalog">
- <binding.sca
uri="http://localhost:8200/CloudFruitsCatalog"/>
+ <binding.ws
uri="http://localhost:8200/CloudFruitsCatalog"/>
</service>
<property name="currencyCode">USD</property>
- <reference name="currencyConverter"
target="CloudCurrencyConverter"/>
+ <reference name="currencyConverter"
target="CloudCurrencyConverter">
+ <binding.ws/>
+ </reference>
</component>
<component name="CloudVegetablesCatalog">
<implementation.java class="services.VegetablesCatalogImpl"/>
<service name="Catalog">
- <binding.sca
uri="http://localhost:8200/CloudVegetablesCatalog"/>
+ <binding.ws
uri="http://localhost:8200/CloudVegetablesCatalog"/>
</service>
</component>
Modified: incubator/tuscany/java/sca/tutorial/cloud/currency.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/cloud/currency.composite?rev=635122&r1=635121&r2=635122&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/cloud/currency.composite (original)
+++ incubator/tuscany/java/sca/tutorial/cloud/currency.composite Sat Mar 8
16:11:48 2008
@@ -25,7 +25,7 @@
<component name="CloudCurrencyConverter">
<implementation.java class="services.CurrencyConverterImpl"/>
<service name="CurrencyConverter">
- <binding.sca
uri="http://localhost:8201/CloudCurrencyConverter"/>
+ <binding.ws
uri="http://localhost:8201/CloudCurrencyConverter"/>
</service>
</component>
Added: incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCatalogs.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCatalogs.java?rev=635122&view=auto
==============================================================================
--- incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCatalogs.java (added)
+++ incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCatalogs.java Sat
Mar 8 16:11:48 2008
@@ -0,0 +1,28 @@
+/*
+ * 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 org.apache.tuscany.sca.node.launch.SCANode2Launcher;
+
+public class LaunchCatalogs {
+ public static void main(String[] args) throws Exception {
+ SCANode2Launcher.main(new String[]
{"http://localhost:9990/package/?composite=composite:cloud;http://cloud;catalogs"});
+ }
+}
Propchange: incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCatalogs.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCatalogs.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCurrency.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCurrency.java?rev=635122&view=auto
==============================================================================
--- incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCurrency.java (added)
+++ incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCurrency.java Sat
Mar 8 16:11:48 2008
@@ -0,0 +1,28 @@
+/*
+ * 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 org.apache.tuscany.sca.node.launch.SCANode2Launcher;
+
+public class LaunchCurrency {
+ public static void main(String[] args) throws Exception {
+ SCANode2Launcher.main(new String[]
{"http://localhost:9990/package/?composite=composite:cloud;http://cloud;currency"});
+ }
+}
Propchange: incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCurrency.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCurrency.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/tutorial/cloud/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/cloud/pom.xml?rev=635122&r1=635121&r2=635122&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/cloud/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/cloud/pom.xml Sat Mar 8 16:11:48 2008
@@ -51,7 +51,20 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node2-api</artifactId>
+ <version>1.2-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
+ <version>1.2-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node2-impl</artifactId>
<version>1.2-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Added: incubator/tuscany/java/sca/tutorial/domain/cloud.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/cloud.composite?rev=635122&view=auto
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/cloud.composite (added)
+++ incubator/tuscany/java/sca/tutorial/domain/cloud.composite Sat Mar 8
16:11:48 2008
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite name="cloud.composite"
+ targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0";
+ xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0";>
+ <include name="ns2:backend-nodes" uri="nodes" xmlns:ns2="http://nodes"/>
+ <include name="ns2:frontend-us-node" uri="nodes" xmlns:ns2="http://nodes"/>
+ <include name="ns2:merger-nodes" uri="nodes" xmlns:ns2="http://nodes"/>
+ <include name="ns2:frontend-eu-node" uri="nodes" xmlns:ns2="http://nodes"/>
+</composite>
Propchange: incubator/tuscany/java/sca/tutorial/domain/cloud.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/tutorial/domain/cloud.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/tutorial/domain/domain.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/domain.composite?rev=635122&view=auto
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/domain.composite (added)
+++ incubator/tuscany/java/sca/tutorial/domain/domain.composite Sat Mar 8
16:11:48 2008
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite name="domain.composite"
+ targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0";
+ xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0";>
+ <include name="ns2:store" uri="store" xmlns:ns2="http://store"/>
+ <include name="ns2:catalogs" uri="cloud" xmlns:ns2="http://cloud"/>
+ <include name="ns2:currency" uri="cloud" xmlns:ns2="http://cloud"/>
+</composite>
Propchange: incubator/tuscany/java/sca/tutorial/domain/domain.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/tutorial/domain/domain.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialAdmin.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialAdmin.java?rev=635122&view=auto
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialAdmin.java
(added)
+++ incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialAdmin.java
Sat Mar 8 16:11:48 2008
@@ -0,0 +1,33 @@
+/*
+ * 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;
+
+/**
+ * Launches the domain admin from this module.
+ *
+ * @version $Rev$ $Date$
+ */
+public class LaunchTutorialAdmin {
+
+ public static void main(String[] args) {
+
org.apache.tuscany.sca.workspace.admin.launch.LaunchDomainAdmin.main(args);
+ }
+
+}
Propchange:
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialAdmin.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialAdmin.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/tutorial/domain/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/pom.xml?rev=635122&r1=634808&r2=635122&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/domain/pom.xml Sat Mar 8 16:11:48 2008
@@ -25,8 +25,8 @@
<version>1.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tutorial-nodes</artifactId>
- <name>Apache Tuscany SCA Tutorial Nodes</name>
+ <artifactId>tutorial-domain</artifactId>
+ <name>Apache Tuscany SCA Tutorial Domain</name>
<repositories>
<repository>
@@ -36,6 +36,11 @@
</repositories>
<dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-workspace-admin</artifactId>
+ <version>1.2-incubating-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
Added: incubator/tuscany/java/sca/tutorial/domain/workspace.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/workspace.xml?rev=635122&view=auto
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/workspace.xml (added)
+++ incubator/tuscany/java/sca/tutorial/domain/workspace.xml Sat Mar 8
16:11:48 2008
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0";>
+ <contribution
location="http://localhost:9990/files/file:../assets/target/tutorial-assets.jar";
uri="assets"/>
+ <contribution
location="http://localhost:9990/files/file:../store/target/tutorial-store.jar";
uri="store"/>
+ <contribution
location="http://localhost:9990/files/file:../cloud/target/tutorial-cloud.jar";
uri="cloud"/>
+ <contribution
location="http://localhost:9990/files/file:../nodes/target/tutorial-nodes.jar";
uri="nodes"/>
+</workspace>
Propchange: incubator/tuscany/java/sca/tutorial/domain/workspace.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/tutorial/domain/workspace.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/tutorial/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/pom.xml?rev=635122&r1=635121&r2=635122&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/pom.xml Sat Mar 8 16:11:48 2008
@@ -44,6 +44,7 @@
<module>catalog-jee</module>
<module>catalog-webapp</module>
<module>cloud</module>
+ <module>domain</module>
<module>nodes</module>
<module>store</module>
<module>store-db</module>
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=635122&r1=635121&r2=635122&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-db/store-db.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store-db/store-db.composite Sat Mar 8
16:11:48 2008
@@ -45,7 +45,9 @@
<t:binding.jsonrpc uri="http://localhost:8102/Catalog"/>
</service>
<reference name="fruitsCatalog" target="FruitsCatalog"/>
- <reference name="vegetablesCatalog"
target="CloudVegetablesCatalog"/>
+ <reference name="vegetablesCatalog"
target="CloudVegetablesCatalog">
+ <binding.ws/>
+ </reference>
<reference name="currencyConverter"
target="CurrencyConverter"/>
</component>
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=635122&r1=635121&r2=635122&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite Sat Mar 8
16:11:48 2008
@@ -45,9 +45,15 @@
<t:binding.jsonrpc/>
<binding.ws
uri="http://localhost:8104/CatalogWebService"/>
</service>
- <reference name="fruitsCatalog" target="CloudFruitsCatalog"/>
- <reference name="vegetablesCatalog"
target="CloudVegetablesCatalog"/>
- <reference name="currencyConverter"
target="CloudCurrencyConverter"/>
+ <reference name="fruitsCatalog" target="CloudFruitsCatalog">
+ <binding.ws/>
+ </reference>
+ <reference name="vegetablesCatalog"
target="CloudVegetablesCatalog">
+ <binding.ws/>
+ </reference>
+ <reference name="currencyConverter"
target="CloudCurrencyConverter">
+ <binding.ws/>
+ </reference>
</component>
<component name="ShoppingCart">
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=635122&r1=635121&r2=635122&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite
(original)
+++ incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite Sat
Mar 8 16:11:48 2008
@@ -45,7 +45,9 @@
<t:binding.jsonrpc uri="http://localhost:8101/Catalog"/>
</service>
<reference name="fruitsCatalog" target="FruitsCatalog"/>
- <reference name="vegetablesCatalog"
target="CloudVegetablesCatalog"/>
+ <reference name="vegetablesCatalog"
target="CloudVegetablesCatalog">
+ <binding.ws/>
+ </reference>
<reference name="currencyConverter"
target="CurrencyConverter"/>
</component>
Modified:
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=635122&r1=635121&r2=635122&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite
(original)
+++ incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite
Sat Mar 8 16:11:48 2008
@@ -46,7 +46,9 @@
<binding.ws
uri="http://localhost:8103/CatalogWebService"/>
</service>
<reference name="fruitsCatalog" target="FruitsCatalog"/>
- <reference name="vegetablesCatalog"
target="CloudVegetablesCatalog"/>
+ <reference name="vegetablesCatalog"
target="CloudVegetablesCatalog">
+ <binding.ws/>
+ </reference>
<reference name="currencyConverter"
target="CurrencyConverter"/>
</component>
Modified: incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java?rev=635122&r1=635121&r2=635122&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java (original)
+++ incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java Sat Mar
8 16:11:48 2008
@@ -19,40 +19,10 @@
package launch;
-import java.io.File;
-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.launch.SCANode2Launcher;
public class LaunchStore {
public static void main(String[] args) throws Exception {
- System.out.println("Starting ...");
-
- URL storeContribution = new File("./target/classes").toURL();
- URL assetsContribution = new File("../assets/target/classes").toURL();
- URL dataAPIContribution = new File(System.getProperty("user.home") +
"/.m2/repository/org/apache/tuscany/sca/tuscany-implementation-data-api/1.2-incubating-SNAPSHOT/tuscany-implementation-data-api-1.2-incubating-SNAPSHOT.jar").toURL();
-
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- SCANode node = nodeFactory.createSCANode(null,
"http://localhost:9998";);
-
-
node.addContribution("http://org/apache/tuscany/sca/implementation-data-api";,
dataAPIContribution);
- node.addContribution("http://assets";, assetsContribution);
- node.addContribution("http://store";, storeContribution);
-
- node.addToDomainLevelComposite(new QName("http://store";, "store"));
- //FIXME looks like we can't start/stop individual nodes anymore
- node.getDomain().start();
-
- System.out.println("store.composite ready for big business !!!");
- System.in.read();
-
- System.out.println("Stopping ...");
- //FIXME looks like we can't start/stop individual nodes anymore
- node.getDomain().stop();
- node.destroy();
- System.out.println();
+ SCANode2Launcher.main(new String[]
{"http://localhost:9990/package/?composite=composite:store;http://store;store"});
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
