svn commit: r882545 - /tuscany/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java

[slaws]

Author: slaws
Date: Fri Nov 20 13:39:36 2009
New Revision: 882545

URL: http://svn.apache.org/viewvc?rev=882545&view=rev
Log:
Don't search for META-INF/services in the 1.x bundle I've been playing with. 

Modified:
    
tuscany/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java

Modified: 
tuscany/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java?rev=882545&r1=882544&r2=882545&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
 (original)
+++ 
tuscany/java/sca/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
 Fri Nov 20 13:39:36 2009
@@ -185,9 +185,15 @@
         serviceName = "META-INF/services/" + serviceName;
 
         Set<URL> visited = new HashSet<URL>();
+        //System.out.println(">>>> getServiceDeclarations()");
         for (Bundle bundle : context.getBundles()) {
-            if (bundle.getBundleId() == 0 || 
bundle.getHeaders().get(Constants.FRAGMENT_HOST) != null) {
+            if (bundle.getBundleId() == 0 ||
+                bundle.getSymbolicName().startsWith("1.x-osgi-bundle") || 
+                bundle.getHeaders().get(Constants.FRAGMENT_HOST) != null) {
                 // Skip system bundle as it has access to the application 
classloader
+                // Skip the 1.x runtime bundle as this has 1.x services in it
+                //    For testing running 1.x and 2.x in same VM. 
+                //    Don't know what final form will be yet.
                 // Skip bundle fragments too
                 continue;
             }