[jboss-cvs] JBossAS SVN: r99809 - projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2010-01-22 11:00:24 -0500 (Fri, 22 Jan 2010)
New Revision: 99809

Modified:
   projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java
   projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiModule.java
Log:
Prevent CCE with default ClassLoadingMetaData

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java	2010-01-22 15:45:10 UTC (rev 99808)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java	2010-01-22 16:00:24 UTC (rev 99809)
@@ -32,7 +32,9 @@
 
 import org.jboss.classloader.spi.NativeLibraryProvider;
 import org.jboss.classloading.spi.dependency.Module;
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
 import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.osgi.framework.bundle.AbstractBundleState;
 import org.jboss.osgi.framework.bundle.AbstractDeployedBundleState;
 import org.jboss.osgi.framework.bundle.OSGiBundleManager;
@@ -61,7 +63,8 @@
       if (absBundleState instanceof AbstractDeployedBundleState)
       {
          AbstractDeployedBundleState depBundleState = (AbstractDeployedBundleState)absBundleState;
-         Module module = depBundleState.getDeploymentUnit().getAttachment(Module.class);
+         DeploymentUnit unit = depBundleState.getDeploymentUnit();
+         Module module = unit.getAttachment(Module.class);
          if (module instanceof OSGiModule == false)
             throw new IllegalStateException("Not an instance of OSGiModule: " + module);
 
@@ -77,36 +80,56 @@
          setBlackListable(osgiModule.isBlackListable());
          setDelegates(osgiModule.getDelegates());
 
-         // NativeCode-Library handling
-         OSGiClassLoadingMetaData classLoadingMetaData = osgiModule.getClassLoadingMetaData();
-         NativeLibraryMetaData libMetaData = classLoadingMetaData.getNativeLibraries();
-         if (libMetaData != null && libMetaData.getNativeLibraries() != null)
+         // Bundle-NativeCode handling
+         processNativeLibraryMetaData(depBundleState);
+      }
+   }
+
+   /**
+    * Processes the NativeLibraryMetaData that is part of the OSGiClassLoadingMetaData 
+    * and adds the NativeLibraryProviders to the ClassLoaderPolicy
+    */
+   private void processNativeLibraryMetaData(AbstractBundleState absBundleState)
+   {
+      if (absBundleState instanceof OSGiBundleState == false)
+         return;
+      
+      OSGiBundleState bundleState = (OSGiBundleState)absBundleState;
+      DeploymentUnit unit = bundleState.getDeploymentUnit();
+      ClassLoadingMetaData clMetaData = unit.getAttachment(ClassLoadingMetaData.class);
+      if (clMetaData instanceof OSGiClassLoadingMetaData == false)
+         return;
+      
+      OSGiClassLoadingMetaData classLoadingMetaData = (OSGiClassLoadingMetaData)clMetaData;
+      NativeLibraryMetaData libMetaData = classLoadingMetaData.getNativeLibraries();
+      if (libMetaData == null || libMetaData.getNativeLibraries() == null)
+         return;
+      
+      // Add the native library mappings to the OSGiClassLoaderPolicy
+      for (NativeLibrary library : libMetaData.getNativeLibraries())
+      {
+         String libpath = library.getLibraryPath();
+         String libfile = new File(libpath).getName();
+         String libname = libfile.substring(0, libfile.lastIndexOf('.'));
+         
+         // Add the library provider to the policy
+         NativeLibraryProvider libProvider = new OSGiNativeLibraryProvider(bundleState, libname, libpath);
+         addNativeLibrary(libProvider);
+         
+         // [TODO] why does the TCK use 'Native' to mean 'libNative' ? 
+         if (libname.startsWith("lib"))
          {
-            OSGiBundleState bundleState = (OSGiBundleState)absBundleState;
-            
-            // Add the native library mappings to the OSGiClassLoaderPolicy
-            for (NativeLibrary library : libMetaData.getNativeLibraries())
-            {
-               String libpath = library.getLibraryPath();
-               String libfile = new File(libpath).getName();
-               String libname = libfile.substring(0, libfile.lastIndexOf('.'));
-               
-               // Add the library provider to the policy
-               NativeLibraryProvider libProvider = new OSGiNativeLibraryProvider(bundleState, libname, libpath);
-               addNativeLibrary(libProvider);
-               
-               // [TODO] why does the TCK use 'Native' to mean 'libNative' ? 
-               if (libname.startsWith("lib"))
-               {
-                  libname = libname.substring(3);
-                  libProvider = new OSGiNativeLibraryProvider(bundleState, libname, libpath);
-                  addNativeLibrary(libProvider);
-               }
-            }
+            libname = libname.substring(3);
+            libProvider = new OSGiNativeLibraryProvider(bundleState, libname, libpath);
+            addNativeLibrary(libProvider);
          }
       }
    }
 
+   /**
+    * An implementation of NativeLibraryProvider that provides the native library file
+    * location from the bundle that contains the library.
+    */
    static class OSGiNativeLibraryProvider implements NativeLibraryProvider
    {
       private OSGiBundleState bundleState;

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiModule.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiModule.java	2010-01-22 15:45:10 UTC (rev 99808)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiModule.java	2010-01-22 16:00:24 UTC (rev 99809)
@@ -37,20 +37,8 @@
    /** The serialVersionUID */
    private static final long serialVersionUID = 1L;
 
-   private OSGiClassLoadingMetaData metaData;
-   
    public OSGiModule(DeploymentUnit unit, ClassLoadingMetaData metaData)
    {
       super(unit);
-      
-      if (metaData instanceof OSGiClassLoadingMetaData == false)
-         throw new IllegalStateException("Not an instance of OSGiClassLoadingMetaData: " + metaData);
-      
-      this.metaData = (OSGiClassLoadingMetaData)metaData;
    }
-
-   public OSGiClassLoadingMetaData getClassLoadingMetaData()
-   {
-      return metaData;
-   }
 }