aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mnutt...@apache.org
Subject svn commit: r1376550 - in /aries/trunk/proxy: proxy-bundle/pom.xml proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyManagerActivator.java
Date Thu, 23 Aug 2012 15:32:23 GMT
Author: mnuttall
Date: Thu Aug 23 15:32:22 2012
New Revision: 1376550

URL: http://svn.apache.org/viewvc?rev=1376550&view=rev
Log:
Aries-909: Minor change to proxy required for Subsystems support. 

Modified:
    aries/trunk/proxy/proxy-bundle/pom.xml
    aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyManagerActivator.java

Modified: aries/trunk/proxy/proxy-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-bundle/pom.xml?rev=1376550&r1=1376549&r2=1376550&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-bundle/pom.xml (original)
+++ aries/trunk/proxy/proxy-bundle/pom.xml Thu Aug 23 15:32:22 2012
@@ -74,7 +74,7 @@
         <dependency>
         	<groupId>org.apache.aries.proxy</groupId>
         	<artifactId>org.apache.aries.proxy.impl</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyManagerActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyManagerActivator.java?rev=1376550&r1=1376549&r2=1376550&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyManagerActivator.java
(original)
+++ aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/ProxyManagerActivator.java
Thu Aug 23 15:32:22 2012
@@ -18,6 +18,9 @@
  */
 package org.apache.aries.proxy.impl;
 
+import java.util.Dictionary;
+import java.util.Hashtable;
+
 import org.apache.aries.proxy.ProxyManager;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -49,8 +52,14 @@ public class ProxyManagerActivator imple
       try {
         //if ASM is available then we should also try weaving
         Class<?> cls = Class.forName("org.apache.aries.proxy.impl.weaving.ProxyWeavingHook");
+        Dictionary<String,String> props = new Hashtable<String,String>();
+        // SubsystemResource.java also uses this constant. 
+        //   While it could be turned into a static final constant, note that this
+        //   is also a non-standard workaround in the absence of a solution in the spec.

+        // See the associated OSGi spec bug. 
+        props.put("osgi.woven.packages", "org.apache.aries.proxy.weaving,org.apache.aries.proxy");
         context.registerService("org.osgi.framework.hooks.weaving.WeavingHook",
-            cls.getConstructor(BundleContext.class).newInstance(context), null);
+            cls.getConstructor(BundleContext.class).newInstance(context), props);
       } catch (Throwable t) {
         //We don't care about this, we just won't have registered the hook
       }



Mime
View raw message