Author: jsdelfino
Date: Sun Mar 23 23:19:03 2008
New Revision: 640325
URL: http://svn.apache.org/viewvc?rev=640325&view=rev
Log:
Merged changes from trunk SVN revision r640322. 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/branches/sca-java-1.2/tutorial/catalog-webapp/ (props
changed)
- copied from r640322, incubator/tuscany/java/sca/tutorial/catalog-webapp/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-webapp/catalog-web.composite
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/catalog-webapp/catalog-web.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-webapp/pom.xml
- copied, changed from r640322,
incubator/tuscany/java/sca/tutorial/catalog-webapp/pom.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-webapp/webapp/
- copied from r640322,
incubator/tuscany/java/sca/tutorial/catalog-webapp/webapp/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-webapp/webapp/META-INF/
- copied from r640322,
incubator/tuscany/java/sca/tutorial/catalog-webapp/webapp/META-INF/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-webapp/webapp/META-INF/sca-contribution.xml
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/catalog-webapp/webapp/META-INF/sca-contribution.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-webapp/webapp/WEB-INF/
- copied from r640322,
incubator/tuscany/java/sca/tutorial/catalog-webapp/webapp/WEB-INF/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-webapp/webapp/WEB-INF/web.xml
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/catalog-webapp/webapp/WEB-INF/web.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-webapp/webapp/catalog.jsp
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/catalog-webapp/webapp/catalog.jsp
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/launch/LaunchTutorialDomainManager.java
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchTutorialDomainManager.java
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/ (props
changed)
- copied from r640322, incubator/tuscany/java/sca/tutorial/jee-services/
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/Tutorial-distributed-scenario.pdf
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/Tutorial-distributed-scenario.pdf
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/
(props changed)
- copied from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/pom.xml
- copied, changed from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/pom.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/src/
- copied from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/src/
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/src/main/
- copied from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/src/main/
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/src/main/java/
- copied from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/src/main/java/
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/src/main/java/client/
- copied from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/src/main/java/client/
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/src/main/java/client/Client.java
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/src/main/java/client/Client.java
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/src/main/java/services/
- copied from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/src/main/java/services/
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/src/main/java/services/ejb/
- copied from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/src/main/java/services/ejb/
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/src/main/java/services/ejb/CatalogEJB.java
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/src/main/java/services/ejb/CatalogEJB.java
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/src/main/java/services/ejb/Vegetable.java
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/src/main/java/services/ejb/Vegetable.java
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBImpl.java
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBImpl.java
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/src/main/resources/
- copied from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/src/main/resources/
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/src/main/resources/META-INF/
- copied from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-jee/
(props changed)
- copied from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-jee/
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-jee/CatalogEJB.componentType
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-jee/CatalogEJB.componentType
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-jee/catalog-jee.composite
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-jee/catalog-jee.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-jee/pom.xml
- copied, changed from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-jee/pom.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/pom.xml
- copied, changed from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/pom.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/tutorial-distributed-README
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/tutorial-distributed-README
incubator/tuscany/branches/sca-java-1.2/tutorial/web-services/ (props
changed)
- copied from r640322, incubator/tuscany/java/sca/tutorial/web-services/
incubator/tuscany/branches/sca-java-1.2/tutorial/web-services/META-INF/
- copied from r640322,
incubator/tuscany/java/sca/tutorial/web-services/META-INF/
incubator/tuscany/branches/sca-java-1.2/tutorial/web-services/META-INF/sca-contribution.xml
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/web-services/META-INF/sca-contribution.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/web-services/catalogs.composite
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/web-services/catalogs.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/web-services/currency.composite
- copied unchanged from r640322,
incubator/tuscany/java/sca/tutorial/web-services/currency.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/web-services/pom.xml
- copied, changed from r640322,
incubator/tuscany/java/sca/tutorial/web-services/pom.xml
Removed:
incubator/tuscany/branches/sca-java-1.2/tutorial/cloud/
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/launch/LaunchTutorialDomainAdmin.java
incubator/tuscany/branches/sca-java-1.2/tutorial/nodes-jee/
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/assets/tutorial.html
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogsNode.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CurrencyNode.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/domain.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreDBNode.java
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/workspace.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/pom.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/store-db/store-db.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/store-eu/store-eu.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/store-merger/store-merger.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/store-supplier/store-supplier.composite
Modified: incubator/tuscany/branches/sca-java-1.2/tutorial/assets/tutorial.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/assets/tutorial.html?rev=640325&r1=640324&r2=640325&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tutorial/assets/tutorial.html
(original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/assets/tutorial.html Sun
Mar 23 23:19:03 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>
Propchange: incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 23 23:19:03 2008
@@ -0,0 +1,18 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+derby.log
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+build.xml
Copied: incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-webapp/pom.xml
(from r640322, incubator/tuscany/java/sca/tutorial/catalog-webapp/pom.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-webapp/pom.xml?p2=incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-webapp/pom.xml&p1=incubator/tuscany/java/sca/tutorial/catalog-webapp/pom.xml&r1=640322&r2=640325&rev=640325&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/catalog-webapp/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-webapp/pom.xml Sun
Mar 23 23:19:03 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-tutorial</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tutorial-catalog-webapp</artifactId>
@@ -40,27 +40,27 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node2-api</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tutorial-assets</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node2-launcher</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-ant-generator</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
<executions>
<execution>
<goals>
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogsNode.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogsNode.composite?rev=640325&r1=640324&r2=640325&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogsNode.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogsNode.composite
Sun Mar 23 23:19:03 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/branches/sca-java-1.2/tutorial/domain/cloud/CurrencyNode.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CurrencyNode.composite?rev=640325&r1=640324&r2=640325&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CurrencyNode.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CurrencyNode.composite
Sun Mar 23 23:19:03 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/branches/sca-java-1.2/tutorial/domain/domain.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/domain.composite?rev=640325&r1=640324&r2=640325&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tutorial/domain/domain.composite
(original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/domain/domain.composite
Sun Mar 23 23:19:03 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/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreDBNode.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreDBNode.java?rev=640325&r1=640324&r2=640325&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreDBNode.java
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/launch/LaunchStoreDBNode.java
Sun Mar 23 23:19:03 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"});
Modified: incubator/tuscany/branches/sca-java-1.2/tutorial/domain/workspace.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/workspace.xml?rev=640325&r1=640324&r2=640325&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tutorial/domain/workspace.xml
(original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/domain/workspace.xml Sun
Mar 23 23:19:03 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>
Propchange: incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 23 23:19:03 2008
@@ -0,0 +1,17 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+build.xml
+work
+derby.log
+
Propchange:
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 23 23:19:03 2008
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Copied:
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/pom.xml
(from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/pom.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/pom.xml?p2=incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/pom.xml&p1=incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/pom.xml&r1=640322&r2=640325&rev=640325&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/jee-services/catalog-ejb/pom.xml
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-ejb/pom.xml
Sun Mar 23 23:19:03 2008
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-tutorial</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Propchange:
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-jee/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 23 23:19:03 2008
@@ -0,0 +1,17 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+build.xml
+work
+derby.log
+
Copied:
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-jee/pom.xml
(from r640322,
incubator/tuscany/java/sca/tutorial/jee-services/catalog-jee/pom.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-jee/pom.xml?p2=incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-jee/pom.xml&p1=incubator/tuscany/java/sca/tutorial/jee-services/catalog-jee/pom.xml&r1=640322&r2=640325&rev=640325&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/jee-services/catalog-jee/pom.xml
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/catalog-jee/pom.xml
Sun Mar 23 23:19:03 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-tutorial</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tutorial-catalog-jee</artifactId>
@@ -57,7 +57,7 @@
<plugin>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-ant-generator</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
<executions>
<execution>
<goals>
Copied: incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/pom.xml
(from r640322, incubator/tuscany/java/sca/tutorial/jee-services/pom.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/pom.xml?p2=incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/pom.xml&p1=incubator/tuscany/java/sca/tutorial/jee-services/pom.xml&r1=640322&r2=640325&rev=640325&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/jee-services/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/jee-services/pom.xml Sun
Mar 23 23:19:03 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tutorial-jee-services</artifactId>
Modified: incubator/tuscany/branches/sca-java-1.2/tutorial/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/pom.xml?rev=640325&r1=640324&r2=640325&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tutorial/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/pom.xml Sun Mar 23
23:19:03 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/branches/sca-java-1.2/tutorial/store-db/store-db.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/store-db/store-db.composite?rev=640325&r1=640324&r2=640325&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/store-db/store-db.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/store-db/store-db.composite
Sun Mar 23 23:19:03 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/branches/sca-java-1.2/tutorial/store-eu/store-eu.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/store-eu/store-eu.composite?rev=640325&r1=640324&r2=640325&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/store-eu/store-eu.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/store-eu/store-eu.composite
Sun Mar 23 23:19:03 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/branches/sca-java-1.2/tutorial/store-merger/store-merger.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/store-merger/store-merger.composite?rev=640325&r1=640324&r2=640325&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/store-merger/store-merger.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/store-merger/store-merger.composite
Sun Mar 23 23:19:03 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/branches/sca-java-1.2/tutorial/store-supplier/store-supplier.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/store-supplier/store-supplier.composite?rev=640325&r1=640324&r2=640325&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/store-supplier/store-supplier.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/store-supplier/store-supplier.composite
Sun Mar 23 23:19:03 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"/>
Propchange: incubator/tuscany/branches/sca-java-1.2/tutorial/web-services/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 23 23:19:03 2008
@@ -0,0 +1,17 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+build.xml
+
Copied: incubator/tuscany/branches/sca-java-1.2/tutorial/web-services/pom.xml
(from r640322, incubator/tuscany/java/sca/tutorial/web-services/pom.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/web-services/pom.xml?p2=incubator/tuscany/branches/sca-java-1.2/tutorial/web-services/pom.xml&p1=incubator/tuscany/java/sca/tutorial/web-services/pom.xml&r1=640322&r2=640325&rev=640325&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/web-services/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/web-services/pom.xml Sun
Mar 23 23:19:03 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-tutorial</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tutorial-web-services</artifactId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-ant-generator</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
<executions>
<execution>
<goals>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
