Author: pauls
Date: Thu Sep 22 12:32:00 2016
New Revision: 1761928

URL: http://svn.apache.org/viewvc?rev=1761928&view=rev
Log:
Update the security provider to work with the latest felix framework.

Added:
    
felix/trunk/framework.security/src/main/java/org/apache/felix/framework/FakeBundle.java
Modified:
    
felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java

Added: 
felix/trunk/framework.security/src/main/java/org/apache/felix/framework/FakeBundle.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/framework.security/src/main/java/org/apache/felix/framework/FakeBundle.java?rev=1761928&view=auto
==============================================================================
--- 
felix/trunk/framework.security/src/main/java/org/apache/felix/framework/FakeBundle.java
 (added)
+++ 
felix/trunk/framework.security/src/main/java/org/apache/felix/framework/FakeBundle.java
 Thu Sep 22 12:32:00 2016
@@ -0,0 +1,207 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.framework;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Map;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.Version;
+
+/**
+ *
+ */
+public class FakeBundle extends BundleImpl implements Bundle
+{
+    private final Map m_certs;
+
+    public FakeBundle(Map certs)
+    {
+        m_certs = Collections.unmodifiableMap(certs);
+    }
+
+    public Enumeration findEntries(String arg0, String arg1, boolean arg2)
+    {
+        return null;
+    }
+
+    public BundleContext getBundleContext()
+    {
+        return null;
+    }
+
+    public long getBundleId()
+    {
+        return -1;
+    }
+
+    public URL getEntry(String arg0)
+    {
+        return null;
+    }
+
+    public Enumeration getEntryPaths(String arg0)
+    {
+        return null;
+    }
+
+    public Dictionary getHeaders()
+    {
+        return new Hashtable();
+    }
+
+    public Dictionary getHeaders(String arg0)
+    {
+        return new Hashtable();
+    }
+
+    public long getLastModified()
+    {
+        return 0;
+    }
+
+    public String getLocation()
+    {
+        return "";
+    }
+
+    public ServiceReference[] getRegisteredServices()
+    {
+        return null;
+    }
+
+    public URL getResource(String arg0)
+    {
+        return null;
+    }
+
+    public Enumeration getResources(String arg0) throws IOException
+    {
+        return null;
+    }
+
+    public ServiceReference[] getServicesInUse()
+    {
+        return null;
+    }
+
+    public Map getSignerCertificates(int arg0)
+    {
+        return m_certs;
+    }
+
+    public int getState()
+    {
+        return Bundle.UNINSTALLED;
+    }
+
+    public String getSymbolicName()
+    {
+        return null;
+    }
+
+    public Version getVersion()
+    {
+        return Version.emptyVersion;
+    }
+
+    public boolean hasPermission(Object arg0)
+    {
+        return false;
+    }
+
+    public Class loadClass(String arg0) throws ClassNotFoundException
+    {
+        return null;
+    }
+
+    public void start() throws BundleException
+    {
+        throw new IllegalStateException();
+    }
+
+    public void start(int arg0) throws BundleException
+    {
+        throw new IllegalStateException();
+    }
+
+    public void stop() throws BundleException
+    {
+        throw new IllegalStateException();
+    }
+
+    public void stop(int arg0) throws BundleException
+    {
+        throw new IllegalStateException();
+    }
+
+    public void uninstall() throws BundleException
+    {
+        throw new IllegalStateException();
+    }
+
+    public void update() throws BundleException
+    {
+        throw new IllegalStateException();
+    }
+
+    public void update(InputStream arg0) throws BundleException
+    {
+        throw new IllegalStateException();
+    }
+
+    public boolean equals(Object o)
+    {
+        return this == o;
+    }
+
+    public int hashCode()
+    {
+        return System.identityHashCode(this);
+    }
+
+    public int compareTo(Bundle o) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    public Object adapt(Class arg0) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public File getDataFile(String arg0) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public int compareTo(Object t)
+    {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+}

Modified: 
felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java?rev=1761928&r1=1761927&r2=1761928&view=diff
==============================================================================
--- 
felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java
 (original)
+++ 
felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java
 Thu Sep 22 12:32:00 2016
@@ -51,6 +51,7 @@ import java.util.Map.Entry;
 
 import org.apache.felix.framework.BundleProtectionDomain;
 import org.apache.felix.framework.BundleRevisionImpl;
+import org.apache.felix.framework.FakeBundle;
 import org.apache.felix.framework.security.permissionadmin.PermissionAdminImpl;
 import org.apache.felix.framework.security.util.Conditions;
 import org.apache.felix.framework.security.util.LocalPermissions;
@@ -307,176 +308,6 @@ public final class ConditionalPermission
         }
     }
 
-    private static class FakeBundle implements Bundle
-    {
-        private final Map m_certs;
-
-        public FakeBundle(Map certs)
-        {
-            m_certs = Collections.unmodifiableMap(certs);
-        }
-
-        public Enumeration findEntries(String arg0, String arg1, boolean arg2)
-        {
-            return null;
-        }
-
-        public BundleContext getBundleContext()
-        {
-            return null;
-        }
-
-        public long getBundleId()
-        {
-            return -1;
-        }
-
-        public URL getEntry(String arg0)
-        {
-            return null;
-        }
-
-        public Enumeration getEntryPaths(String arg0)
-        {
-            return null;
-        }
-
-        public Dictionary getHeaders()
-        {
-            return new Hashtable();
-        }
-
-        public Dictionary getHeaders(String arg0)
-        {
-            return new Hashtable();
-        }
-
-        public long getLastModified()
-        {
-            return 0;
-        }
-
-        public String getLocation()
-        {
-            return "";
-        }
-
-        public ServiceReference[] getRegisteredServices()
-        {
-            return null;
-        }
-
-        public URL getResource(String arg0)
-        {
-            return null;
-        }
-
-        public Enumeration getResources(String arg0) throws IOException
-        {
-            return null;
-        }
-
-        public ServiceReference[] getServicesInUse()
-        {
-            return null;
-        }
-
-        public Map getSignerCertificates(int arg0)
-        {
-            return m_certs;
-        }
-
-        public int getState()
-        {
-            return Bundle.UNINSTALLED;
-        }
-
-        public String getSymbolicName()
-        {
-            return null;
-        }
-
-        public Version getVersion()
-        {
-            return Version.emptyVersion;
-        }
-
-        public boolean hasPermission(Object arg0)
-        {
-            return false;
-        }
-
-        public Class loadClass(String arg0) throws ClassNotFoundException
-        {
-            return null;
-        }
-
-        public void start() throws BundleException
-        {
-            throw new IllegalStateException();
-        }
-
-        public void start(int arg0) throws BundleException
-        {
-            throw new IllegalStateException();
-        }
-
-        public void stop() throws BundleException
-        {
-            throw new IllegalStateException();
-        }
-
-        public void stop(int arg0) throws BundleException
-        {
-            throw new IllegalStateException();
-        }
-
-        public void uninstall() throws BundleException
-        {
-            throw new IllegalStateException();
-        }
-
-        public void update() throws BundleException
-        {
-            throw new IllegalStateException();
-        }
-
-        public void update(InputStream arg0) throws BundleException
-        {
-            throw new IllegalStateException();
-        }
-
-        public boolean equals(Object o)
-        {
-            return this == o;
-        }
-
-        public int hashCode()
-        {
-            return System.identityHashCode(this);
-        }
-
-               public int compareTo(Bundle o) {
-                       // TODO Auto-generated method stub
-                       return 0;
-               }
-
-               public Object adapt(Class arg0) {
-                       // TODO Auto-generated method stub
-                       return null;
-               }
-
-               public File getDataFile(String arg0) {
-                       // TODO Auto-generated method stub
-                       return null;
-               }
-
-        public int compareTo(Object t)
-        {
-            throw new UnsupportedOperationException("Not supported yet.");
-        }
-    }
-
     private static class FakeCert extends X509Certificate
     {
         private final Principal m_principal;
@@ -668,7 +499,7 @@ public final class ConditionalPermission
                 certList.add(new FakeCert(certs[j]));
             }
         }
-        final Bundle fake = new FakeBundle(certificates);
+        final FakeBundle fake = new FakeBundle(certificates);
         ProtectionDomain domain = new ProtectionDomain(null, null)
         {
             public boolean implies(Permission permission)


Reply via email to