felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r956639 - in /felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001: Activator.java JarFileClassLoader.java JarVirtualModule.java StringComparator.java StringMap.java
Date Mon, 21 Jun 2010 16:48:51 GMT
Author: rickhall
Date: Mon Jun 21 16:48:51 2010
New Revision: 956639

URL: http://svn.apache.org/viewvc?rev=956639&view=rev
Log:
Rename VBWire and let framework make headers case insensitive.

Removed:
    felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/StringComparator.java
    felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/StringMap.java
Modified:
    felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/Activator.java
    felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/JarFileClassLoader.java
    felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/JarVirtualModule.java

Modified: felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/Activator.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/Activator.java?rev=956639&r1=956638&r2=956639&view=diff
==============================================================================
--- felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/Activator.java
(original)
+++ felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/Activator.java
Mon Jun 21 16:48:51 2010
@@ -57,8 +57,6 @@ public class Activator implements Bundle
                 Manifest mf = jarFile.getManifest();
                 // Use an empty map if there is no manifest.
                 Map headers = (mf == null) ? new HashMap() : mf.getMainAttributes();
-                // Create a case insensitive map of manifest attributes.
-                headers = new StringMap(headers, false);
 
                 // See if the virtual bundle is already installed.
                 Bundle vb = getBundle(bc, "org.apache.felix.framework.vb.b002");

Modified: felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/JarFileClassLoader.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/JarFileClassLoader.java?rev=956639&r1=956638&r2=956639&view=diff
==============================================================================
--- felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/JarFileClassLoader.java
(original)
+++ felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/JarFileClassLoader.java
Mon Jun 21 16:48:51 2010
@@ -29,16 +29,16 @@ import java.util.Map;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 import org.apache.felix.framework.ext.ResourceNotFoundException;
-import org.apache.felix.framework.ext.VBWire;
+import org.apache.felix.framework.ext.Wire;
 
 public class JarFileClassLoader extends SecureClassLoader
 {
     private final JarFile m_jarFile;
     private final Map m_headers;
-    private final VBWire m_bootWire;
-    private final List<VBWire> m_wires;
+    private final Wire m_bootWire;
+    private final List<Wire> m_wires;
 
-    public JarFileClassLoader(JarFile jarFile, Map headers, VBWire bootWire, List<VBWire>
wires)
+    public JarFileClassLoader(JarFile jarFile, Map headers, Wire bootWire, List<Wire>
wires)
     {
         m_jarFile = jarFile;
         m_headers = headers;

Modified: felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/JarVirtualModule.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/JarVirtualModule.java?rev=956639&r1=956638&r2=956639&view=diff
==============================================================================
--- felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/JarVirtualModule.java
(original)
+++ felix/sandbox/rickhall/vb-bnd-test/org.apache.felix.framework.vb/src/org/apache/felix/framework/vb/b001/JarVirtualModule.java
Mon Jun 21 16:48:51 2010
@@ -24,8 +24,8 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 import java.util.jar.JarFile;
-import org.apache.felix.framework.ext.VBWire;
 import org.apache.felix.framework.ext.VirtualModule;
+import org.apache.felix.framework.ext.Wire;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleException;
 
@@ -41,7 +41,7 @@ class JarVirtualModule implements Virtua
         m_jarFile = jarFile;
     }
 
-    public void resolve(VBWire bootWire, List<VBWire> wires) throws BundleException
+    public void resolve(Wire bootWire, List<Wire> wires) throws BundleException
     {
         if (wires != null)
         {



Mime
View raw message