Author: slaws
Date: Tue Dec 4 06:02:10 2007
New Revision: 600958
URL: http://svn.apache.org/viewvc?rev=600958&view=rev
Log:
Make the distributed app talk to the EJB deployed in Geronimo
Have the domain on port 9998 as Geronimo uses 9999
No SCA in Geronimo yet - that's the next step
Modified:
incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java
incubator/tuscany/java/sca/tutorial/store/launch/LaunchStoreDistributed.java
incubator/tuscany/java/sca/tutorial/store/launch/LaunchStoreMerger.java
incubator/tuscany/java/sca/tutorial/store/pom.xml
incubator/tuscany/java/sca/tutorial/store/store-distributed.composite
Modified: incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java?rev=600958&r1=600957&r2=600958&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java (original)
+++ incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java Tue Dec
4 06:02:10 2007
@@ -36,17 +36,17 @@
System.out.println("Starting ...");
SCADomainFactory domainFactory = SCADomainFactory.newInstance();
SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- SCADomain domain =
domainFactory.createSCADomain("http://localhost:9999";);
+ SCADomain domain =
domainFactory.createSCADomain("http://localhost:9998";);
System.out.println("Domain controller ready for big business !!!");
- SCANode catalogsNode =
nodeFactory.createSCANode("http://localhost:8200/cloud";,
"http://localhost:9999";);
+ SCANode catalogsNode =
nodeFactory.createSCANode("http://localhost:8200/cloud";,
"http://localhost:9998";);
URL catalogsContribution =
SCAContributionUtil.findContributionFromClass(LaunchCloud.class);
catalogsNode.addContribution("http://cloud";, catalogsContribution);
catalogsNode.addToDomainLevelComposite(new QName("http://cloud";,
"catalogs"));
catalogsNode.start();
System.out.println("catalogs.composite ready for big business !!!");
- SCANode currencyNode =
nodeFactory.createSCANode("http://localhost:8300/cloud";,
"http://localhost:9999";);
+ SCANode currencyNode =
nodeFactory.createSCANode("http://localhost:8300/cloud";,
"http://localhost:9998";);
URL currencyContribution =
SCAContributionUtil.findContributionFromClass(LaunchCloud.class);
currencyNode.addContribution("http://cloud";, currencyContribution);
currencyNode.addToDomainLevelComposite(new QName("http://cloud";,
"currency"));
Modified:
incubator/tuscany/java/sca/tutorial/store/launch/LaunchStoreDistributed.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store/launch/LaunchStoreDistributed.java?rev=600958&r1=600957&r2=600958&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tutorial/store/launch/LaunchStoreDistributed.java
(original)
+++
incubator/tuscany/java/sca/tutorial/store/launch/LaunchStoreDistributed.java
Tue Dec 4 06:02:10 2007
@@ -29,9 +29,13 @@
public class LaunchStoreDistributed {
public static void main(String[] args) throws Exception {
+ System.setProperty("java.naming.factory.initial",
"org.apache.openejb.client.RemoteInitialContextFactory");
+ System.setProperty("java.naming.provider.url",
"ejbd://localhost:4201");
+ System.setProperty("managed", "false");
+
System.out.println("Starting ...");
SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- SCANode node = nodeFactory.createSCANode("http://localhost:8101";,
"http://localhost:9999";);
+ SCANode node = nodeFactory.createSCANode("http://localhost:8101";,
"http://localhost:9998";);
URL contribution =
SCAContributionUtil.findContributionFromClass(LaunchStoreDistributed.class);
node.addContribution("http://store";, contribution);
Modified:
incubator/tuscany/java/sca/tutorial/store/launch/LaunchStoreMerger.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store/launch/LaunchStoreMerger.java?rev=600958&r1=600957&r2=600958&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/launch/LaunchStoreMerger.java
(original)
+++ incubator/tuscany/java/sca/tutorial/store/launch/LaunchStoreMerger.java Tue
Dec 4 06:02:10 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(null,
"http://localhost:9999";);
+ SCANode node = nodeFactory.createSCANode("http://localhost:8101";,
"http://localhost:9998";);
URL contribution =
SCAContributionUtil.findContributionFromClass(LaunchStoreMerger.class);
node.addContribution("http://store";, contribution);
Modified: incubator/tuscany/java/sca/tutorial/store/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store/pom.xml?rev=600958&r1=600957&r2=600958&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store/pom.xml Tue Dec 4 06:02:10 2007
@@ -92,6 +92,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ejb</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-http</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
Modified: incubator/tuscany/java/sca/tutorial/store/store-distributed.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store/store-distributed.composite?rev=600958&r1=600957&r2=600958&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/store-distributed.composite
(original)
+++ incubator/tuscany/java/sca/tutorial/store/store-distributed.composite Tue
Dec 4 06:02:10 2007
@@ -45,8 +45,12 @@
<t:binding.jsonrpc/>
<binding.ws uri="/CatalogWebService"/>
</service>
- <reference name="fruitsCatalog" target="JSEFruitsCatalog"/>
- <reference name="vegetablesCatalog"
target="CloudVegetablesCatalog"/>
+ <reference name="fruitsCatalog" target="CloudFruitsCatalog"/>
+ <!--reference name="fruitsCatalog"
target="JSEFruitsCatalog"/-->
+ <!--reference name="vegetablesCatalog"
target="CloudVegetablesCatalog"-->
+ <reference name="vegetablesCatalog">
+ <binding.ejb uri="VegetablesCatalogImplRemote"/>
+ </reference>
<reference name="currencyConverter"
target="CurrencyConverter"/>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
