Author: jsdelfino
Date: Tue Jan  8 17:20:18 2008
New Revision: 610252

URL: http://svn.apache.org/viewvc?rev=610252&view=rev
Log:
Some cleanup.  Starting to move the distributed store files to its own module.

Removed:
    incubator/tuscany/java/sca/tutorial/store/launch/LaunchStoreDistributed.java
    incubator/tuscany/java/sca/tutorial/store/store-distributed.composite
Modified:
    incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java
    
incubator/tuscany/java/sca/tutorial/store-merger/launch/LaunchStoreMerger.java
    incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java

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=610252&r1=610251&r2=610252&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java (original)
+++ incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java Tue Jan  
8 17:20:18 2008
@@ -42,27 +42,16 @@
         
         URL cloudContribution = new File("./target/classes").toURL();
         URL assetsContribution = new File("../assets/target/classes").toURL();
-        URL derbyContribution = new File(System.getProperty("user.home") + 
"/.m2/repository/org/apache/derby/derby/10.1.2.1/derby-10.1.2.1.jar").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();
         
         SCANode catalogsNode = 
nodeFactory.createSCANode("http://localhost:8200/cloud";, 
"http://localhost:9998";);
-        catalogsNode.addContribution("http://org/apache/derby";, 
derbyContribution);
-        
catalogsNode.addContribution("http://org/apache/tuscany/sca/implementation-data-api";,
 dataAPIContribution);
         catalogsNode.addContribution("http://assets";, assetsContribution);
         catalogsNode.addContribution("http://cloud";, cloudContribution);
         catalogsNode.addToDomainLevelComposite(new QName("http://cloud";, 
"catalogs"));
-        
-        // the ejb component simply provides the meta data required to locate 
the 
-        // EJB running in Geronimo
-//        catalogsNode.addToDomainLevelComposite(new QName("http://store";, 
"catalog-jee"));
         //FIXME looks like we can't start/stop individual nodes anymore
         //catalogsNode.start();
-        
         System.out.println("catalogs.composite ready for big business !!!");
         
         SCANode currencyNode = 
nodeFactory.createSCANode("http://localhost:8300/cloud";, 
"http://localhost:9998";);
-        currencyNode.addContribution("http://org/apache/derby";, 
derbyContribution);
-        
currencyNode.addContribution("http://org/apache/tuscany/implementation-data-api";,
 dataAPIContribution);
         currencyNode.addContribution("http://assets";, assetsContribution);
         currencyNode.addContribution("http://cloud";, cloudContribution);
         currencyNode.addToDomainLevelComposite(new QName("http://cloud";, 
"currency"));

Modified: 
incubator/tuscany/java/sca/tutorial/store-merger/launch/LaunchStoreMerger.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-merger/launch/LaunchStoreMerger.java?rev=610252&r1=610251&r2=610252&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tutorial/store-merger/launch/LaunchStoreMerger.java 
(original)
+++ 
incubator/tuscany/java/sca/tutorial/store-merger/launch/LaunchStoreMerger.java 
Tue Jan  8 17:20:18 2008
@@ -33,16 +33,17 @@
         
         URL storeMergerContribution = 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";);
-        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();
         
         
node.addContribution("http://org/apache/tuscany/sca/implementation-data-api";, 
dataAPIContribution);
         node.addContribution("http://assets";, assetsContribution);
         node.addContribution("http://store";, storeMergerContribution);
         
         node.addToDomainLevelComposite(new QName("http://store";, 
"store-merger"));
+        //FIXME looks like we can't start/stop individual nodes anymore
         node.getDomain().start();
 
         System.out.println("store-merger.composite ready for big business 
!!!");

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=610252&r1=610251&r2=610252&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java (original)
+++ incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java Tue Jan  
8 17:20:18 2008
@@ -33,17 +33,17 @@
         
         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";);
-        URL derbyContribution = new File(System.getProperty("user.home") + 
"/.m2/repository/org/apache/derby/derby/10.1.2.1/derby-10.1.2.1.jar").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();
         
         
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 !!!");



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to