You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/03/24 07:09:59 UTC
svn commit: r640322 - in /incubator/tuscany/java/sca/tutorial: ./ assets/
catalog-webapp/ cloud/ domain/ domain/cloud/ domain/launch/ jee-services/
jee-services/catalog-webapp/ nodes-jee/ store-db/ store-eu/ store-merger/
store-supplier/ web-services/ ...
Author: jsdelfino
Date: Sun Mar 23 23:09:57 2008
New Revision: 640322
URL: http://svn.apache.org/viewvc?rev=640322&view=rev
Log:
Preparing fix for TUSCANY-2117. Moved catalog-webapp directly under tutorial, renamed nodes-jee to jee-services, renamed cloud to web-services. Minor change, renamed LaunchTutorialDomainAdmin to LaunchTutorialDomainManager.
Added:
incubator/tuscany/java/sca/tutorial/catalog-webapp/
- copied from r640318, incubator/tuscany/java/sca/tutorial/nodes-jee/catalog-webapp/
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialDomainManager.java
- copied, changed from r640318, incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialDomainAdmin.java
incubator/tuscany/java/sca/tutorial/jee-services/
- copied from r640318, incubator/tuscany/java/sca/tutorial/nodes-jee/
incubator/tuscany/java/sca/tutorial/web-services/
- copied from r640318, incubator/tuscany/java/sca/tutorial/cloud/
Removed:
incubator/tuscany/java/sca/tutorial/cloud/
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialDomainAdmin.java
incubator/tuscany/java/sca/tutorial/jee-services/catalog-webapp/
incubator/tuscany/java/sca/tutorial/nodes-jee/
incubator/tuscany/java/sca/tutorial/web-services/CatalogEJB.componentType.off
incubator/tuscany/java/sca/tutorial/web-services/catalog-jee.composite.off
Modified:
incubator/tuscany/java/sca/tutorial/assets/tutorial.html
incubator/tuscany/java/sca/tutorial/catalog-webapp/catalog-web.composite
incubator/tuscany/java/sca/tutorial/domain/cloud/CatalogsNode.composite
incubator/tuscany/java/sca/tutorial/domain/cloud/CurrencyNode.composite
incubator/tuscany/java/sca/tutorial/domain/domain.composite
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreDBNode.java
incubator/tuscany/java/sca/tutorial/domain/workspace.xml
incubator/tuscany/java/sca/tutorial/jee-services/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/web-services/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/tutorial/web-services/catalogs.composite
incubator/tuscany/java/sca/tutorial/web-services/currency.composite
incubator/tuscany/java/sca/tutorial/web-services/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=640322&r1=640321&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/assets/tutorial.html (original)
+++ incubator/tuscany/java/sca/tutorial/assets/tutorial.html Sun Mar 23 23:09:57 2008
@@ -25,7 +25,7 @@
<h1>Apache Tuscany - Online Store Tutorial
<h2><a href="http://localhost:9990/ui/home">Online Store - SCA Domain</a>
<h2><a href="http://localhost:8100/ui/store.html">Online Store - Fruits</a>
-<h2><a href="http://localhost:8200/CloudVegetablesCatalog?wsdl">Vegetables Catalog Web Service</a>
+<h2><a href="http://localhost:8200/VegetablesCatalogWebService?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:8102/ui/store.html">Online Store - Cart Database</a>
<h2><a href="http://localhost:8103/ui/store.html">Online Store - Supplier</a>
Modified: incubator/tuscany/java/sca/tutorial/catalog-webapp/catalog-web.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/catalog-webapp/catalog-web.composite?rev=640322&r1=640318&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/catalog-webapp/catalog-web.composite (original)
+++ incubator/tuscany/java/sca/tutorial/catalog-webapp/catalog-web.composite Sun Mar 23 23:09:57 2008
@@ -27,7 +27,7 @@
<binding.ws/>
</service>
<property name="currencyCode">USD</property>
- <reference name="currencyConverter" target="CloudCurrencyConverter">
+ <reference name="currencyConverter" target="CurrencyConverterWebService">
<binding.ws/>
</reference>
</component>
@@ -35,7 +35,7 @@
<component name="LocalFruitsCatalog">
<implementation.java class="services.FruitsCatalogImpl"/>
<property name="currencyCode">USD</property>
- <reference name="currencyConverter" target="CloudCurrencyConverter">
+ <reference name="currencyConverter" target="CurrencyConverterWebService">
<binding.ws/>
</reference>
</component>
Modified: incubator/tuscany/java/sca/tutorial/domain/cloud/CatalogsNode.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/cloud/CatalogsNode.composite?rev=640322&r1=640321&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/cloud/CatalogsNode.composite (original)
+++ incubator/tuscany/java/sca/tutorial/domain/cloud/CatalogsNode.composite Sun Mar 23 23:09:57 2008
@@ -20,11 +20,11 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscany.apache.org/cloud"
- xmlns:c="http://cloud"
+ xmlns:c="http://services"
name="CatalogsNode">
<component name="CatalogsNode">
- <t:implementation.node uri="cloud" composite="c:catalogs"/>
+ <t:implementation.node uri="web-services" composite="c:catalogs"/>
<service name="Node">
<binding.ws uri="http://localhost:8200"/>
</service>
Modified: incubator/tuscany/java/sca/tutorial/domain/cloud/CurrencyNode.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/cloud/CurrencyNode.composite?rev=640322&r1=640321&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/cloud/CurrencyNode.composite (original)
+++ incubator/tuscany/java/sca/tutorial/domain/cloud/CurrencyNode.composite Sun Mar 23 23:09:57 2008
@@ -20,11 +20,11 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscany.apache.org/cloud"
- xmlns:c="http://cloud"
+ xmlns:c="http://services"
name="CurrencyNode">
<component name="CurrencyNode">
- <t:implementation.node uri="cloud" composite="c:currency"/>
+ <t:implementation.node uri="web-services" composite="c:currency"/>
<service name="Node">
<binding.ws uri="http://localhost:8201"/>
</service>
Modified: incubator/tuscany/java/sca/tutorial/domain/domain.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/domain.composite?rev=640322&r1=640321&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/domain.composite (original)
+++ incubator/tuscany/java/sca/tutorial/domain/domain.composite Sun Mar 23 23:09:57 2008
@@ -25,7 +25,7 @@
<include name="ns2:store-db" uri="store-db" xmlns:ns2="http://store"/>
<include name="ns2:store-supplier" uri="store-supplier" xmlns:ns2="http://store"/>
<include name="ns2:store-eu" uri="store-eu" xmlns:ns2="http://store"/>
- <include name="ns2:catalogs" uri="cloud" xmlns:ns2="http://cloud"/>
- <include name="ns2:currency" uri="cloud" xmlns:ns2="http://cloud"/>
+ <include name="ns2:catalogs" uri="web-services" xmlns:ns2="http://services"/>
+ <include name="ns2:currency" uri="web-services" xmlns:ns2="http://services"/>
<include name="ns2:catalog-web" uri="catalog-webapp" xmlns:ns2="http://catalog"/>
</composite>
Modified: incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreDBNode.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreDBNode.java?rev=640322&r1=640321&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreDBNode.java (original)
+++ incubator/tuscany/java/sca/tutorial/domain/launch/LaunchStoreDBNode.java Sun Mar 23 23:09:57 2008
@@ -21,7 +21,6 @@
import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-
public class LaunchStoreDBNode {
public static void main(String[] args) throws Exception {
NodeLauncher.main(new String[] {"http://localhost:9990/node-image/StoreDBNode"});
Copied: incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialDomainManager.java (from r640318, incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialDomainAdmin.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialDomainManager.java?p2=incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialDomainManager.java&p1=incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialDomainAdmin.java&r1=640318&r2=640322&rev=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialDomainAdmin.java (original)
+++ incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialDomainManager.java Sun Mar 23 23:09:57 2008
@@ -20,11 +20,11 @@
package launch;
/**
- * Launches the domain admin from this module.
+ * Launches the domain manager from this module.
*
* @version $Rev$ $Date$
*/
-public class LaunchTutorialDomainAdmin {
+public class LaunchTutorialDomainManager {
public static void main(String[] args) throws Exception {
org.apache.tuscany.sca.node.launcher.DomainNodeLauncher.main(args);
Modified: incubator/tuscany/java/sca/tutorial/domain/workspace.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/workspace.xml?rev=640322&r1=640321&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/workspace.xml (original)
+++ incubator/tuscany/java/sca/tutorial/domain/workspace.xml Sun Mar 23 23:09:57 2008
@@ -19,12 +19,12 @@
-->
<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
<contribution location="file:../assets/target/tutorial-assets.jar" uri="assets"/>
- <contribution location="file:../cloud/target/tutorial-cloud.jar" uri="cloud"/>
<contribution location="file:../store/target/tutorial-store.jar" uri="store"/>
<contribution location="file:../store-merger/target/tutorial-store-merger.jar" uri="store-merger"/>
<contribution location="file:../store-db/target/tutorial-store-db.jar" uri="store-db"/>
<contribution location="file:../store-supplier/target/tutorial-store-supplier.jar" uri="store-supplier"/>
<contribution location="file:../store-eu/target/tutorial-store-eu.jar" uri="store-eu"/>
- <contribution location="file:../nodes-jee/catalog-webapp/target/tutorial-catalog-webapp.war" uri="catalog-webapp"/>
+ <contribution location="file:../web-services/target/tutorial-web-services.jar" uri="web-services"/>
+ <contribution location="file:../catalog-webapp/target/tutorial-catalog-webapp.war" uri="catalog-webapp"/>
<contribution location="file:../domain/cloud" uri="http://tuscany.apache.org/cloud"/>
</workspace>
Modified: incubator/tuscany/java/sca/tutorial/jee-services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/jee-services/pom.xml?rev=640322&r1=640318&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/jee-services/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/jee-services/pom.xml Sun Mar 23 23:09:57 2008
@@ -25,9 +25,9 @@
<version>2.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tutorial-nodes-jee</artifactId>
+ <artifactId>tutorial-jee-services</artifactId>
<packaging>pom</packaging>
- <name>Apache Tuscany SCA Tutorial JEE Nodes</name>
+ <name>Apache Tuscany SCA Tutorial JEE Services</name>
<profiles>
<profile>
@@ -38,7 +38,6 @@
<modules>
<module>catalog-ejb</module>
<module>catalog-jee</module>
- <module>catalog-webapp</module>
</modules>
</profile>
Modified: incubator/tuscany/java/sca/tutorial/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/pom.xml?rev=640322&r1=640321&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/pom.xml Sun Mar 23 23:09:57 2008
@@ -36,15 +36,18 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>assets</module>
- <module>cloud</module>
<module>domain</module>
- <module>nodes-jee</module>
+ <module>assets</module>
<module>store</module>
- <module>store-db</module>
- <module>store-eu</module>
<module>store-merger</module>
+ <module>store-db</module>
<module>store-supplier</module>
+ <module>store-eu</module>
+ <module>web-services</module>
+ <module>catalog-webapp</module>
+ <!--
+ <module>jee-services</module>
+ -->
</modules>
</profile>
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=640322&r1=640321&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-db/store-db.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store-db/store-db.composite Sun Mar 23 23:09:57 2008
@@ -45,7 +45,7 @@
<t:binding.jsonrpc/>
</service>
<reference name="fruitsCatalog" target="StoreDBFruitsCatalog"/>
- <reference name="vegetablesCatalog" target="CloudVegetablesCatalog">
+ <reference name="vegetablesCatalog" target="VegetablesCatalogWebService">
<binding.ws/>
</reference>
<reference name="currencyConverter" target="StoreDBCurrencyConverter"/>
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=640322&r1=640321&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store-eu/store-eu.composite Sun Mar 23 23:09:57 2008
@@ -45,13 +45,13 @@
<t:binding.jsonrpc/>
<binding.ws uri="/CatalogWebService"/>
</service>
- <reference name="fruitsCatalog" target="CloudFruitsCatalog">
+ <reference name="fruitsCatalog" target="FruitsCatalogWebService">
<binding.ws/>
</reference>
- <reference name="vegetablesCatalog" target="CloudVegetablesCatalog">
+ <reference name="vegetablesCatalog" target="VegetablesCatalogWebService">
<binding.ws/>
</reference>
- <reference name="currencyConverter" target="CloudCurrencyConverter">
+ <reference name="currencyConverter" target="CurrencyConverterWebService">
<binding.ws/>
</reference>
</component>
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=640322&r1=640321&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store-merger/store-merger.composite Sun Mar 23 23:09:57 2008
@@ -45,7 +45,7 @@
<t:binding.jsonrpc/>
</service>
<reference name="fruitsCatalog" target="StoreMergerFruitsCatalog"/>
- <reference name="vegetablesCatalog" target="CloudVegetablesCatalog">
+ <reference name="vegetablesCatalog" target="VegetablesCatalogWebService">
<binding.ws/>
</reference>
<reference name="currencyConverter" target="StoreMergerCurrencyConverter"/>
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=640322&r1=640321&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store-supplier/store-supplier.composite Sun Mar 23 23:09:57 2008
@@ -46,7 +46,7 @@
<binding.ws uri="/CatalogWebService"/>
</service>
<reference name="fruitsCatalog" target="StoreSupplierFruitsCatalog"/>
- <reference name="vegetablesCatalog" target="CloudVegetablesCatalog">
+ <reference name="vegetablesCatalog" target="VegetablesCatalogWebService">
<binding.ws/>
</reference>
<reference name="currencyConverter" target="StoreSupplierCurrencyConverter"/>
Modified: incubator/tuscany/java/sca/tutorial/web-services/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/web-services/META-INF/sca-contribution.xml?rev=640322&r1=640318&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/web-services/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/tutorial/web-services/META-INF/sca-contribution.xml Sun Mar 23 23:09:57 2008
@@ -18,7 +18,7 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:c="http://cloud">
+ xmlns:c="http://services">
<import.java package="services"/>
<deployable composite="c:catalogs"/>
<deployable composite="c:currency"/>
Modified: incubator/tuscany/java/sca/tutorial/web-services/catalogs.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/web-services/catalogs.composite?rev=640322&r1=640318&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/web-services/catalogs.composite (original)
+++ incubator/tuscany/java/sca/tutorial/web-services/catalogs.composite Sun Mar 23 23:09:57 2008
@@ -19,21 +19,21 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://cloud"
+ targetNamespace="http://services"
name="catalogs">
- <component name="CloudFruitsCatalog">
+ <component name="FruitsCatalogWebService">
<implementation.java class="services.FruitsCatalogImpl"/>
<service name="Catalog">
<binding.ws/>
</service>
<property name="currencyCode">USD</property>
- <reference name="currencyConverter" target="CloudCurrencyConverter">
+ <reference name="currencyConverter" target="CurrencyConverterWebService">
<binding.ws/>
</reference>
</component>
- <component name="CloudVegetablesCatalog">
+ <component name="VegetablesCatalogWebService">
<implementation.java class="services.VegetablesCatalogImpl"/>
<service name="Catalog">
<binding.ws/>
Modified: incubator/tuscany/java/sca/tutorial/web-services/currency.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/web-services/currency.composite?rev=640322&r1=640318&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/web-services/currency.composite (original)
+++ incubator/tuscany/java/sca/tutorial/web-services/currency.composite Sun Mar 23 23:09:57 2008
@@ -19,10 +19,10 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://cloud"
+ targetNamespace="http://services"
name="currency">
- <component name="CloudCurrencyConverter">
+ <component name="CurrencyConverterWebService">
<implementation.java class="services.CurrencyConverterImpl"/>
<service name="CurrencyConverter">
<binding.ws/>
Modified: incubator/tuscany/java/sca/tutorial/web-services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/web-services/pom.xml?rev=640322&r1=640318&r2=640322&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/web-services/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/web-services/pom.xml Sun Mar 23 23:09:57 2008
@@ -25,8 +25,8 @@
<version>2.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tutorial-cloud</artifactId>
- <name>Apache Tuscany SCA Tutorial Service Cloud</name>
+ <artifactId>tutorial-web-services</artifactId>
+ <name>Apache Tuscany SCA Tutorial Web Services</name>
<repositories>
<repository>
@@ -64,9 +64,6 @@
<version>2.0-incubating-SNAPSHOT</version>
<executions>
<execution>
- <configuration>
- <mainClass>launch.LaunchCloud</mainClass>
- </configuration>
<goals>
<goal>generate</goal>
</goals>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org