svn commit: r694837 - in /tuscany/java/sca/samples/calculator-rcp: META-INF/MANIFEST.MF src/main/java/calculator/rcp/Activator.java

[rf...@apache.org]

Author: rfeng
Date: Fri Sep 12 16:07:20 2008
New Revision: 694837

URL: http://svn.apache.org/viewvc?rev=694837&view=rev
Log:
Update the RCP sample

Modified:
    tuscany/java/sca/samples/calculator-rcp/META-INF/MANIFEST.MF
    tuscany/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java

Modified: tuscany/java/sca/samples/calculator-rcp/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rcp/META-INF/MANIFEST.MF?rev=694837&r1=694836&r2=694837&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-rcp/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/samples/calculator-rcp/META-INF/MANIFEST.MF Fri Sep 12 16:07:20 2008
@@ -9,7 +9,9 @@
  org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Import-Package: org.osoa.sca;version="1.4.0",
+Import-Package: org.apache.tuscany.sca.extensibility.equinox;version="1.4.0",
+ org.apache.tuscany.sca.node;version="1.4.0",
+ org.osoa.sca;version="1.4.0",
  org.osoa.sca.annotations;version="1.4.0"
 Bundle-ClassPath: .,
  cglib-nodep-2.1_3.jar,

Modified: tuscany/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java?rev=694837&r1=694836&r2=694837&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java (original)
+++ tuscany/java/sca/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java Fri Sep 12 16:07:20 2008
@@ -18,6 +18,12 @@
  */
 package calculator.rcp;
 
+import java.io.File;
+
+import org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoverer;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -33,6 +39,8 @@
     // The shared instance
     private static Activator plugin;
 
+    private SCANode node;
+
     /**
      * The constructor
      */
@@ -46,6 +54,10 @@
     public void start(BundleContext context) throws Exception {
         super.start(context);
         plugin = this;
+        Class<?> cls = EquinoxServiceDiscoverer.class;
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        node = factory.createSCANode("Calculator.composite", new SCAContribution("c1", new File("target/classes").toURI().toString()));
+        node.start();
     }
 
     /*
@@ -55,6 +67,9 @@
     public void stop(BundleContext context) throws Exception {
         plugin = null;
         super.stop(context);
+        if (node != null) {
+            node.stop();
+        }
     }
 
     /**