geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r881846 - in /geronimo/server/trunk/framework: buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ configs/karaf-framework/src/main/filtered-resources/etc/ modules/geronimo-kernel/src/main/java/org/apache/geron...
Date Wed, 18 Nov 2009 17:43:12 GMT
Author: rickmcguire
Date: Wed Nov 18 17:43:12 2009
New Revision: 881846

URL: http://svn.apache.org/viewvc?rev=881846&view=rev
Log:
make sure the javax.concurrent.util classes are exported by the framework

Modified:
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/BundleClassLoader.java

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=881846&r1=881845&r2=881846&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
(original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
Wed Nov 18 17:43:12 2009
@@ -734,6 +734,8 @@
                        "javax.swing.undo," +
                        "javax.tools," +
                        "javax.transaction;javax.transaction.xa;version=1.1;partial=true;mandatory:=partial,"
+
+                       "javax.util.concurrent;version=1.0," +
+                       "javax.util.concurrent.locks;version=1.0," +
                        "javax.xml," +
                        "javax.xml.bind;version=2.1," +
                        "javax.xml.bind.annotation;version=2.1," +

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=881846&r1=881845&r2=881846&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
Wed Nov 18 17:43:12 2009
@@ -282,6 +282,8 @@
  javax.swing.undo, \
  javax.tools, \
  javax.transaction; javax.transaction.xa; version=1.1; partial=true; mandatory:=partial,
\
+ javax.util.concurrent;version=1.0, \
+ javax.util.concurrent.locks;version=1.0, \
  javax.xml, \
  javax.xml.bind;version=2.1, \
  javax.xml.bind.annotation;version=2.1, \

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/BundleClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/BundleClassLoader.java?rev=881846&r1=881845&r2=881846&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/BundleClassLoader.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/BundleClassLoader.java
Wed Nov 18 17:43:12 2009
@@ -26,6 +26,7 @@
 import java.util.Enumeration;
 
 import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleReference;
 
 /**
  * @version $Rev$ $Date$
@@ -72,4 +73,13 @@
 	        return e;
 	    }
 	}
+
+    /**
+     * Return the bundle instance backing this classloader.
+     *
+     * @return The bundle used to source the classloader.
+     */
+    public Bundle getBundle() {
+        return bundle;
+    }
 }



Mime
View raw message