svn commit: r434383 - in /incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader: IModule.java IModuleFactory.java ModuleFactoryImpl.java ModuleImpl.java

[pa...@apache.org]

Author: pauls
Date: Thu Aug 24 05:28:41 2006
New Revision: 434383

URL: http://svn.apache.org/viewvc?rev=434383&view=rev
Log:
Add the ability to carry a security context to the modulelayer.
This will be the hook for the framework to pass around bundle 
protection domains (FELIX-21).

Modified:
    incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IModule.java
    incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IModuleFactory.java
    incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java
    incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java

Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IModule.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IModule.java?rev=434383&r1=434382&r2=434383&view=diff
==============================================================================
--- incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IModule.java (original)
+++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IModule.java Thu Aug 24 05:28:41 2006
@@ -29,4 +29,6 @@
 
     public Class getClass(String name);
     public URL getResource(String name);
+
+    public Object getSecurityContext();
 }

Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IModuleFactory.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IModuleFactory.java?rev=434383&r1=434382&r2=434383&view=diff
==============================================================================
--- incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IModuleFactory.java (original)
+++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IModuleFactory.java Thu Aug 24 05:28:41 2006
@@ -21,11 +21,13 @@
     public IModule[] getModules();
     public IModule getModule(String id);
 
-    public IModule createModule(String id, IModuleDefinition md);    
+    public IModule createModule(String id, IModuleDefinition md);
     public void removeModule(IModule module);
 
     public void setContentLoader(IModule module, IContentLoader contentLoader);
 
     public void addModuleListener(ModuleListener l);
     public void removeModuleListener(ModuleListener l);
+
+    public void setSecurityContext(IModule module, Object securityContext);
 }

Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java?rev=434383&r1=434382&r2=434383&view=diff
==============================================================================
--- incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java (original)
+++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/ModuleFactoryImpl.java Thu Aug 24 05:28:41 2006
@@ -110,6 +110,14 @@
         }
     }
 
+    public void setSecurityContext(IModule module, Object securityContext)
+    {
+        synchronized (this)
+        {
+            ((ModuleImpl) module).setSecurityContext(securityContext);
+        }
+    }
+
     /**
      * <p>
      * Adds a listener to the <tt>IModuleFactory</tt> to listen for

Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java?rev=434383&r1=434382&r2=434383&view=diff
==============================================================================
--- incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java (original)
+++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/ModuleImpl.java Thu Aug 24 05:28:41 2006
@@ -28,6 +28,7 @@
     private IModuleDefinition m_md = null;
     private IContentLoader m_contentLoader = null;
     private IWire[] m_wires = null;
+    private Object m_securityContext = null;
 
     ModuleImpl(Logger logger, String id, IModuleDefinition md)
     {
@@ -56,6 +57,11 @@
         m_contentLoader = contentLoader;
     }
 
+    protected void setSecurityContext(Object securityContext)
+    {
+        m_securityContext = securityContext;
+    }
+
     public IWire[] getWires()
     {
         return m_wires;
@@ -111,5 +117,10 @@
     public String toString()
     {
         return m_id;
+    }
+
+    public Object getSecurityContext()
+    {
+        return m_securityContext;
     }
 }