Author: jsdelfino
Date: Thu Mar 27 10:25:43 2008
New Revision: 641909
URL: http://svn.apache.org/viewvc?rev=641909&view=rev
Log:
Merged changes from trunk SVN revision r641905. Fix for TUSCANY-2160.
Integrated sample EJB module in the tutorial.
Added:
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/ (props
changed)
- copied from r641905, incubator/tuscany/java/sca/tutorial/catalog-ejb/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/pom.xml
- copied, changed from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/pom.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/
- copied from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/
- copied from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/java/
- copied from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/java/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/java/client/
- copied from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/java/client/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/java/client/Client.java
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/java/client/Client.java
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/java/services/
- copied from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/java/services/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/java/services/ejb/
- copied from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/java/services/ejb/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJB.java
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJB.java
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/java/services/ejb/Vegetable.java
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/java/services/ejb/Vegetable.java
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBImpl.java
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBImpl.java
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/resources/
- copied from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/resources/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/resources/META-INF/
- copied from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/resources/catalog-ejb.composite
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/catalog-ejb/src/main/resources/catalog-ejb.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/
(props changed)
- copied from r641905,
incubator/tuscany/java/sca/tutorial/catalog-mediation/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/META-INF/
- copied from r641905,
incubator/tuscany/java/sca/tutorial/catalog-mediation/META-INF/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/META-INF/sca-contribution.xml
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/catalog-mediation/META-INF/sca-contribution.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/catalog-mediation.composite
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/catalog-mediation/catalog-mediation.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/pom.xml
- copied, changed from r641905,
incubator/tuscany/java/sca/tutorial/catalog-mediation/pom.xml
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/services/
- copied from r641905,
incubator/tuscany/java/sca/tutorial/catalog-mediation/services/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/services/ejb/
- copied from r641905,
incubator/tuscany/java/sca/tutorial/catalog-mediation/services/ejb/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/services/ejb/CatalogEJB.java
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/catalog-mediation/services/ejb/CatalogEJB.java
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/services/ejb/Vegetable.java
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/catalog-mediation/services/ejb/Vegetable.java
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/services/mediation/
- copied from r641905,
incubator/tuscany/java/sca/tutorial/catalog-mediation/services/mediation/
incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogEJBNode.composite
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/domain/cloud/CatalogEJBNode.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogMediationNode.composite
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/domain/cloud/CatalogMediationNode.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/launch/LaunchCatalogMediationNode.java
- copied unchanged from r641905,
incubator/tuscany/java/sca/tutorial/domain/launch/LaunchCatalogMediationNode.java
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/domain.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/pom.xml
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-merger/store-merger.composite
Propchange: incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 27 10:25:43 2008
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Copied: incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/pom.xml
(from r641905, incubator/tuscany/java/sca/tutorial/catalog-ejb/pom.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/pom.xml?p2=incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/pom.xml&p1=incubator/tuscany/java/sca/tutorial/catalog-ejb/pom.xml&r1=641905&r2=641909&rev=641909&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/catalog-ejb/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/pom.xml Thu
Mar 27 10:25:43 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/catalog-mediation/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 27 10:25:43 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/catalog-mediation/pom.xml
(from r641905, incubator/tuscany/java/sca/tutorial/catalog-mediation/pom.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/pom.xml?p2=incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/pom.xml&p1=incubator/tuscany/java/sca/tutorial/catalog-mediation/pom.xml&r1=641905&r2=641909&rev=641909&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/catalog-mediation/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-mediation/pom.xml
Thu Mar 27 10:25:43 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-mediation</artifactId>
@@ -39,13 +39,13 @@
<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>tutorial-catalog-ejb</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
@@ -75,7 +75,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.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud.composite?rev=641909&r1=641908&r2=641909&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud.composite
(original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud.composite Thu
Mar 27 10:25:43 2008
@@ -28,4 +28,6 @@
<include name="ns2:StoreSupplierNode" uri="http://tuscany.apache.org/cloud";
xmlns:ns2="http://tuscany.apache.org/cloud"/>
<include name="ns2:StoreEUNode" uri="http://tuscany.apache.org/cloud";
xmlns:ns2="http://tuscany.apache.org/cloud"/>
<include name="ns2:CatalogWebAppNode" uri="http://tuscany.apache.org/cloud";
xmlns:ns2="http://tuscany.apache.org/cloud"/>
+ <include name="ns2:CatalogMediationNode"
uri="http://tuscany.apache.org/cloud";
xmlns:ns2="http://tuscany.apache.org/cloud"/>
+ <include name="ns2:CatalogEJBNode" uri="http://tuscany.apache.org/cloud";
xmlns:ns2="http://tuscany.apache.org/cloud"/>
</composite>
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=641909&r1=641908&r2=641909&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
Thu Mar 27 10:25:43 2008
@@ -28,4 +28,6 @@
<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"/>
+ <include name="ns2:catalog-mediation" uri="catalog-mediation"
xmlns:ns2="http://catalog"/>
+ <include name="ns2:catalog-ejb" uri="catalog-ejb"
xmlns:ns2="http://catalog"/>
</composite>
Modified: incubator/tuscany/branches/sca-java-1.2/tutorial/domain/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/pom.xml?rev=641909&r1=641908&r2=641909&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tutorial/domain/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/domain/pom.xml Thu Mar 27
10:25:43 2008
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-ejb</artifactId>
+ <artifactId>tuscany-implementation-ejb-xml</artifactId>
<version>1.2-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
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=641909&r1=641908&r2=641909&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 Thu
Mar 27 10:25:43 2008
@@ -26,5 +26,7 @@
<contribution location="file:../store-eu/target/tutorial-store-eu.jar"
uri="store-eu"/>
<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:../catalog-mediation/target/tutorial-catalog-mediation.jar"
uri="catalog-mediation"/>
+ <contribution location="file:../catalog-ejb/target/tutorial-catalog-ejb.jar"
uri="catalog-ejb"/>
<contribution location="file:../domain/cloud"
uri="http://tuscany.apache.org/cloud"/>
</workspace>
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=641909&r1=641908&r2=641909&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tutorial/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/pom.xml Thu Mar 27
10:25:43 2008
@@ -45,6 +45,8 @@
<module>store-eu</module>
<module>web-services</module>
<module>catalog-webapp</module>
+ <module>catalog-ejb</module>
+ <module>catalog-mediation</module>
</modules>
</profile>
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=641909&r1=641908&r2=641909&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
Thu Mar 27 10:25:43 2008
@@ -44,11 +44,12 @@
<service name="Catalog">
<t:binding.jsonrpc/>
</service>
- <reference name="fruitsCatalog"
target="StoreMergerFruitsCatalog"/>
+ <reference name="currencyConverter"
target="StoreMergerCurrencyConverter"/>
+ <reference name="fruitsCatalog"
target="StoreMergerFruitsCatalog"/>
+ <!-- <reference name="vegetablesCatalog"
target="MediatedVegetablesCatalog"> -->
<reference name="vegetablesCatalog"
target="VegetablesCatalogWebService">
<binding.ws/>
- </reference>
- <reference name="currencyConverter"
target="StoreMergerCurrencyConverter"/>
+ </reference>
</component>
<component name="StoreMergerFruitsCatalog">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
