Copied: tuscany/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java (from r696168, tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java) URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java?p2=tuscany/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java&p1=tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java&r1=696168&r2=696924&rev=696924&view=diff ============================================================================== (empty)
Copied: tuscany/branches/sca-equinox/samples/calculator-equinox/src/main/resources/Calculator.composite (from r696168, tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/resources/Calculator.composite) URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-equinox/src/main/resources/Calculator.composite?p2=tuscany/branches/sca-equinox/samples/calculator-equinox/src/main/resources/Calculator.composite&p1=tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/resources/Calculator.composite&r1=696168&r2=696924&rev=696924&view=diff ============================================================================== (empty) Copied: tuscany/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java (from r696168, tuscany/branches/sca-equinox/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java) URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java?p2=tuscany/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java&p1=tuscany/branches/sca-equinox/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java&r1=696168&r2=696924&rev=696924&view=diff ============================================================================== (empty) Modified: tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml?rev=696924&r1=696923&r2=696924&view=diff ============================================================================== --- tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml (original) +++ tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml Thu Sep 18 22:31:14 2008 @@ -25,7 +25,7 @@ <version>1.4-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>sample.calculator.rcp</artifactId> + <artifactId>sample-calculator-rcp</artifactId> <name>Apache Tuscany SCA Calculator RCP Sample</name> <repositories> <repository> @@ -34,6 +34,7 @@ </url> </repository> </repositories> + <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> @@ -70,13 +71,79 @@ <version>1.4-SNAPSHOT</version> <scope>compile</scope> </dependency> - <!-- + <dependency> <groupId>org.eclipse</groupId> <artifactId>ui</artifactId> <version>3.3.0-I20070614-0800</version> + <exclusions> + <exclusion> + <groupId>org.eclipse</groupId> + <artifactId>swt</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse</groupId> + <artifactId>runtime</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse</groupId> + <artifactId>help</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse</groupId> + <artifactId>swt</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse</groupId> + <artifactId>jface</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.core</groupId> + <artifactId>expressions</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.core</groupId> + <artifactId>databinding</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jface</groupId> + <artifactId>databinding</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.eclipse.swt.win32.win32</groupId> + <artifactId>x86</artifactId> + <version>3.3.0-v3346</version> </dependency> - --> + + <dependency> + <groupId>org.eclipse</groupId> + <artifactId>jface</artifactId> + <version>3.3.0-I20070606-0010</version> + <exclusions> + <exclusion> + <groupId>org.eclipse</groupId> + <artifactId>swt</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.core</groupId> + <artifactId>commands</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.equinox</groupId> + <artifactId>common</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.eclipse.core</groupId> + <artifactId>commands</artifactId> + <version>3.3.0-I20070605-0010</version> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -90,6 +157,7 @@ <scope>test</scope> </dependency> </dependencies> + <build> <finalName>${artifactId}</finalName> <plugins> @@ -108,8 +176,6 @@ <classpathContainers> <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER </classpathContainer> - <classpathContainer>org.eclipse.pde.core.requiredPlugins - </classpathContainer> </classpathContainers> </configuration> </plugin> @@ -123,4 +189,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> Modified: tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java?rev=696924&r1=696923&r2=696924&view=diff ============================================================================== --- tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java (original) +++ tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java Thu Sep 18 22:31:14 2008 @@ -21,9 +21,9 @@ 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.apache.tuscany.sca.node.equinox.launcher.Contribution; +import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -39,6 +39,7 @@ // The shared instance private static Activator plugin; + private NodeLauncher launcher; private SCANode node; /** @@ -54,9 +55,8 @@ 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())); + launcher = NodeLauncher.newInstance(); + node = launcher.createNode("Calculator.composite", new Contribution("c1", new File("target/classes").toURI().toString())); node.start(); } @@ -70,6 +70,9 @@ if (node != null) { node.stop(); } + if (launcher != null) { + launcher.destroy(); + } } /**
