aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hugh...@apache.org
Subject svn commit: r1080649 - in /aries/trunk/subsystem: pom.xml subsystem-core/pom.xml subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceProcessor.java
Date Fri, 11 Mar 2011 16:34:51 GMT
Author: hughesj
Date: Fri Mar 11 16:34:50 2011
New Revision: 1080649

URL: http://svn.apache.org/viewvc?rev=1080649&view=rev
Log:
ARIES-606 additional patch from John Ross

Modified:
    aries/trunk/subsystem/pom.xml
    aries/trunk/subsystem/subsystem-core/pom.xml
    aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceProcessor.java

Modified: aries/trunk/subsystem/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/pom.xml?rev=1080649&r1=1080648&r2=1080649&view=diff
==============================================================================
--- aries/trunk/subsystem/pom.xml (original)
+++ aries/trunk/subsystem/pom.xml Fri Mar 11 16:34:50 2011
@@ -119,7 +119,7 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.bundlerepository</artifactId>
-                <version>1.6.1-SNAPSHOT</version>
+                <version>1.6.4</version>
             </dependency>
             
             

Modified: aries/trunk/subsystem/subsystem-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/pom.xml?rev=1080649&r1=1080648&r2=1080649&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-core/pom.xml Fri Mar 11 16:34:50 2011
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
-            <version>3.7.0.v20110110</version>
+            <version>3.7.0.v20110221</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceProcessor.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceProcessor.java?rev=1080649&r1=1080648&r2=1080649&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceProcessor.java
(original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceProcessor.java
Fri Mar 11 16:34:50 2011
@@ -59,7 +59,7 @@ import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.Version;
-import org.osgi.framework.wiring.Capability;
+import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.util.tracker.ServiceTracker;
 
 public class SubsystemResourceProcessor implements ResourceProcessor {
@@ -246,35 +246,35 @@ public class SubsystemResourceProcessor 
             String importService = headers.get(SubsystemConstants.SUBSYSTEM_IMPORTSERVICE);
             String exportService = headers.get(SubsystemConstants.SUBSYSTEM_EXPORTSERVICE);
             if (importPackage != null && !importPackage.trim().isEmpty()) {
-                List<SharePolicy> importPackagePolicies = importSharePolicies.get(Capability.PACKAGE_CAPABILITY);
+                List<SharePolicy> importPackagePolicies = importSharePolicies.get(BundleRevision.PACKAGE_NAMESPACE);
                 if (importPackagePolicies == null) {
                     importPackagePolicies = new ArrayList<SharePolicy>();
-                    importSharePolicies.put(Capability.PACKAGE_CAPABILITY,importPackagePolicies);
+                    importSharePolicies.put(BundleRevision.PACKAGE_NAMESPACE,importPackagePolicies);
                 }
                 
-                importPackagePolicies.add(new SharePolicy(SharePolicy.TYPE_IMPORT, Capability.PACKAGE_CAPABILITY,
createFilter(importPackage, Capability.PACKAGE_CAPABILITY)));
+                importPackagePolicies.add(new SharePolicy(SharePolicy.TYPE_IMPORT, BundleRevision.PACKAGE_NAMESPACE,
createFilter(importPackage, BundleRevision.PACKAGE_NAMESPACE)));
             }
             
             if (importService != null && !importService.trim().isEmpty()) {
-                List<SharePolicy> importServicePolicies = importSharePolicies.get("osgi.service");
+                List<SharePolicy> importServicePolicies = importSharePolicies.get("scope.share.service");
                 if (importServicePolicies == null) {
                     importServicePolicies = new ArrayList<SharePolicy>();
-                    importSharePolicies.put("osgi.service",importServicePolicies);
+                    importSharePolicies.put("scope.share.service",importServicePolicies);
                 }
                 
-                importServicePolicies.add(new SharePolicy(SharePolicy.TYPE_IMPORT, "osgi.service",
createFilter(importService, "osgi.service")));
+                importServicePolicies.add(new SharePolicy(SharePolicy.TYPE_IMPORT, "scope.share.service",
createFilter(importService, "scope.share.service")));
             }
             
         }
         
         private Filter createFilter(String packages, String namespace) {
-            if (namespace.equals(Capability.PACKAGE_CAPABILITY)) {
+            if (namespace.equals(BundleRevision.PACKAGE_NAMESPACE)) {
                 // split packages
                 List<String> pkgs = ManifestHeaderProcessor.split(packages, ",");
                 StringBuffer sb = new StringBuffer();
                 sb.append("(|");
                 for (String pkg : pkgs) {
-                    sb.append("(" + Capability.PACKAGE_CAPABILITY + "=" + pkg + ")");
+                    sb.append("(" + BundleRevision.PACKAGE_NAMESPACE + "=" + pkg + ")");
                 }
                 sb.append(")");
                 try {
@@ -285,13 +285,13 @@ public class SubsystemResourceProcessor 
                 }
                 
             }
-            if (namespace.equals("osgi.service")) {
+            if (namespace.equals("scope.share.service")) {
                 // split packages
                 List<String> pkgs = ManifestHeaderProcessor.split(packages, ",");
                 StringBuffer sb = new StringBuffer();
                 sb.append("(|");
                 for (String pkg : pkgs) {
-                    sb.append("(osgi.service=" + pkg + ")");
+                    sb.append("(scope.share.service=" + pkg + ")");
                 }
                 sb.append(")");
                 try {



Mime
View raw message