You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/03/18 22:10:05 UTC

svn commit: r755736 - in /tuscany/java/sca/modules/node-impl-osgi: ./ src/test/java/calculator/dosgi/test/ src/test/java/hello/ src/test/resources/

Author: rfeng
Date: Wed Mar 18 21:10:05 2009
New Revision: 755736

URL: http://svn.apache.org/viewvc?rev=755736&view=rev
Log:
Access the equinox jars from a temporary maven repo @http://people.apache.org/~rfeng/repo/maven2

Removed:
    tuscany/java/sca/modules/node-impl-osgi/src/test/java/hello/
    tuscany/java/sca/modules/node-impl-osgi/src/test/resources/HelloWorld.composite
Modified:
    tuscany/java/sca/modules/node-impl-osgi/pom.xml
    tuscany/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
    tuscany/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java

Modified: tuscany/java/sca/modules/node-impl-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/pom.xml?rev=755736&r1=755735&r2=755736&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl-osgi/pom.xml (original)
+++ tuscany/java/sca/modules/node-impl-osgi/pom.xml Wed Mar 18 21:10:05 2009
@@ -29,20 +29,54 @@
 
     <artifactId>tuscany-node-impl-osgi</artifactId>
     <name>Apache Tuscany SCA OSGi Node Implementation</name>
+    
+    <repositories>
+        <repository>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <id>rfeng.repo</id>
+            <name>A Temporary Maven 2.x Repository for Equinox 3.4.2</name>
+            <url>http://people.apache.org/~rfeng/repo/maven2/</url>
+            <layout>default</layout>
+        </repository>
+    </repositories>
 
     <dependencies>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
+            <version>3.4.0-v20080605-1900</version>
+            <!-- 
             <version>3.3.0-v20070530</version>
+             -->
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.osgi</groupId>
             <artifactId>services</artifactId>
+            <version>3.1.200-v20071203</version>
+            <!-- 
             <version>3.1.200-v20070605</version>
+             -->
             <scope>test</scope>
         </dependency>         
+        
+        <!-- Equinox Declarative Services -->
+        <dependency>
+            <groupId>org.eclipse.equinox</groupId>
+            <artifactId>ds</artifactId>
+            <version>1.0.0-v20080427-0830</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.eclipse.equinox</groupId>
+            <artifactId>util</artifactId>
+            <version>1.0.0-v20080414</version>
+            <scope>test</scope>
+        </dependency>
+                
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>

Modified: tuscany/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java?rev=755736&r1=755735&r2=755736&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java (original)
+++ tuscany/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java Wed Mar 18 21:10:05 2009
@@ -19,7 +19,6 @@
 
 package calculator.dosgi.test;
 
-import java.io.File;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -80,13 +79,6 @@
             }
             Set<URL> bundles = new HashSet<URL>();
 
-            File plugins = new File("target/test-classes/plugins");
-            for (File f : plugins.listFiles()) {
-                if (f.isFile()) {
-                    bundles.add(f.toURI().toURL());
-                }
-            }
-
             if (client == null || client.booleanValue()) {
                 System.out.println("Generating calculator.dosgi bundle...");
                 bundles.add(OSGiTestBundles.createBundle("target/test-classes/calculator-bundle.jar",

Modified: tuscany/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java?rev=755736&r1=755735&r2=755736&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java (original)
+++ tuscany/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java Wed Mar 18 21:10:05 2009
@@ -19,7 +19,6 @@
 
 package calculator.dosgi.test;
 
-import java.io.File;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -62,13 +61,6 @@
     public static void setUpBeforeClass() throws Exception {
         Set<URL> bundles = new HashSet<URL>();
 
-        File plugins = new File("target/test-classes/plugins");
-        for (File f : plugins.listFiles()) {
-            if (f.isFile()) {
-                bundles.add(f.toURI().toURL());
-            }
-        }
-
         bundles.add(OSGiTestBundles.createBundle("target/test-classes/calculator-bundle.jar",
                                                  "calculator/dosgi/META-INF/MANIFEST.MF",
                                                  new String[][] {
@@ -103,10 +95,14 @@
                                                  DivideService.class,
                                                  DivideServiceImpl.class));
         try {
-            host = new EquinoxHost(bundles);
+            host = new EquinoxHost();
             BundleContext context = host.start();
+            for (URL loc : bundles) {
+                host.installBundle(loc, null);
+            }
             for (Bundle b : context.getBundles()) {
                 if (b.getSymbolicName().equals("org.eclipse.equinox.ds")) {
+                    System.out.println(string(b, false));
                     b.start();
                     System.out.println(string(b, false));
                 }