Author: jsdelfino
Date: Wed Jan  2 16:03:47 2008
New Revision: 608288

URL: http://svn.apache.org/viewvc?rev=608288&view=rev
Log:
Added necessary imports/exports to sca-contribution.xml files. Added calls to 
implementation-data-api.jar and derby.jar as contributions.

Modified:
    incubator/tuscany/java/sca/tutorial/assets/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java
    incubator/tuscany/java/sca/tutorial/store/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java

Modified: 
incubator/tuscany/java/sca/tutorial/assets/META-INF/sca-contribution.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/assets/META-INF/sca-contribution.xml?rev=608288&r1=608287&r2=608288&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/assets/META-INF/sca-contribution.xml 
(original)
+++ incubator/tuscany/java/sca/tutorial/assets/META-INF/sca-contribution.xml 
Wed Jan  2 16:03:47 2008
@@ -19,5 +19,8 @@
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
     targetNamespace="http://assets";>
-  <export.java package="services"/>
+   <export.java package="services"/>
+   <export.java package="services.merger"/>
+   <export.java package="services.db"/>
+   <import.java 
package="org.apache.tuscany.sca.implementation.data.collection"/>
 </contribution>

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=608288&r1=608287&r2=608288&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java (original)
+++ incubator/tuscany/java/sca/tutorial/cloud/launch/LaunchCloud.java Wed Jan  
2 16:03:47 2008
@@ -40,10 +40,14 @@
         System.out.println("Domain controller ready for big business !!!");
         
         
-        URL cloudContribution = new File(new File(".") + 
"/target/classes").toURL();
-        URL assetsContribution = new File(new File("../assets") + 
"/target/classes").toURL();
+        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.1-incubating-SNAPSHOT/tuscany-implementation-data-api-1.1-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/implementation-data-api";,
 dataAPIContribution);
         catalogsNode.addContribution("http://assets";, assetsContribution);
         catalogsNode.addContribution("http://cloud";, cloudContribution);
         catalogsNode.addToDomainLevelComposite(new QName("http://cloud";, 
"catalogs"));
@@ -54,8 +58,10 @@
         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);
-        catalogsNode.addContribution("http://assets";, assetsContribution);
         currencyNode.addToDomainLevelComposite(new QName("http://cloud";, 
"currency"));
         currencyNode.start();
         System.out.println("currency.composite ready for big business !!!");   
 

Modified: 
incubator/tuscany/java/sca/tutorial/store/META-INF/sca-contribution.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store/META-INF/sca-contribution.xml?rev=608288&r1=608287&r2=608288&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/META-INF/sca-contribution.xml 
(original)
+++ incubator/tuscany/java/sca/tutorial/store/META-INF/sca-contribution.xml Wed 
Jan  2 16:03:47 2008
@@ -22,4 +22,5 @@
               xmlns:s="http://store";>
    <deployable composite="s:store"/>
    <import.java package="services"/>
+   <import.java package="services.merger"/>
 </contribution>

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=608288&r1=608287&r2=608288&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java (original)
+++ incubator/tuscany/java/sca/tutorial/store/launch/LaunchStore.java Wed Jan  
2 16:03:47 2008
@@ -26,20 +26,23 @@
 
 import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.util.SCAContributionUtil;
 
 public class LaunchStore {
     public static void main(String[] args) throws Exception {
         System.out.println("Starting ...");
         
-        URL storeContribution = new URL(new File(".").getAbsolutePath() + 
"/target/classes");
-        URL assetsContribution = new URL(new 
File("../assets").getAbsolutePath() + "/target/classes");
+        URL storeContribution = new File("./target/classes").toURL();
+        URL assetsContribution = new File("../assets/target/classes").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.1-incubating-SNAPSHOT/tuscany-implementation-data-api-1.1-incubating-SNAPSHOT.jar").toURL();
         
-        node.addContribution("http://store";, storeContribution);
+        node.addContribution("http://org/apache/derby";, derbyContribution);
+        
node.addContribution("http://org/apache/tuscany/implementation-data-api";, 
dataAPIContribution);
         node.addContribution("http://assets";, assetsContribution);
+        node.addContribution("http://store";, storeContribution);
         
         node.addToDomainLevelComposite(new QName("http://store";, "store"));
         node.start();



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

Reply via email to