felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r553333 [3/3] - in /felix/trunk: framework/ framework/src/main/java/org/apache/felix/framework/ framework/src/main/java/org/apache/felix/framework/cache/ framework/src/main/java/org/apache/felix/framework/util/ framework/src/main/java/org/a...
Date Wed, 04 Jul 2007 21:15:07 GMT
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java?view=diff&rev=553333&r1=553332&r2=553333
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
Wed Jul  4 14:15:05 2007
@@ -58,7 +58,7 @@
         //     bundle://<module-id>:<bundle-classpath-index>/<resource-path>
         // Where <module-id> = <bundle-id>.<revision>
         long bundleId = Util.getBundleIdFromModuleId(url.getHost());
-        BundleImpl bundle = (BundleImpl) m_framework.getBundle(bundleId);
+        FelixBundle bundle = (FelixBundle) m_framework.getBundle(bundleId);
         if (bundle == null)
         {
             throw new IOException("No bundle associated with resource: " + url);
@@ -80,7 +80,7 @@
         //     bundle://<module-id>:<module-classpath-index>/<resource-path>
             // Where <module-id> = <bundle-id>.<revision>
             long bundleId = Util.getBundleIdFromModuleId(url.getHost());
-            BundleImpl bundle = (BundleImpl) m_framework.getBundle(bundleId);
+            FelixBundle bundle = (FelixBundle) m_framework.getBundle(bundleId);
             if (bundle == null)
             {
                 throw new IOException("No bundle associated with resource: " + url);

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java?view=diff&rev=553333&r1=553332&r2=553333
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersContentHandlerProxy.java
Wed Jul  4 14:15:05 2007
@@ -103,7 +103,7 @@
         {
             // Get the framework's system bundle context.
             BundleContext context =
-                ((BundleImpl) framework.getBundle(0)).getInfo().getBundleContext();
+                ((FelixBundle) framework.getBundle(0)).getInfo().getBundleContext();
             // Create a filter for the mime type.
             String filter = 
                 "(&(objectClass="

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java?view=diff&rev=553333&r1=553332&r2=553333
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlersStreamHandlerProxy.java
Wed Jul  4 14:15:05 2007
@@ -203,7 +203,7 @@
         {
             // Get the framework's system bundle context.
             BundleContext context =
-                ((BundleImpl) framework.getBundle(0)).getInfo().getBundleContext();
+                ((FelixBundle) framework.getBundle(0)).getInfo().getBundleContext();
             // Create a filter for the protocol.
             String filter = 
                 "(&(objectClass="

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java?view=diff&rev=553333&r1=553332&r2=553333
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
Wed Jul  4 14:15:05 2007
@@ -102,7 +102,7 @@
      * because it is special an is not really an archive.
      * </p>
     **/
-    BundleArchive()
+    public BundleArchive()
     {
     }
 

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java?view=diff&rev=553333&r1=553332&r2=553333
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
Wed Jul  4 14:15:05 2007
@@ -88,7 +88,7 @@
 
     private static SecureAction m_secureAction = new SecureAction();
 
-    public BundleCache(PropertyResolver cfg, Logger logger)
+    public BundleCache(Logger logger, PropertyResolver cfg)
         throws Exception
     {
         m_cfg = cfg;

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleRevision.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleRevision.java?view=diff&rev=553333&r1=553332&r2=553333
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleRevision.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleRevision.java
Wed Jul  4 14:15:05 2007
@@ -51,15 +51,6 @@
 
     /**
      * <p>
-     * This constructor is only used by the system bundle archive.
-     * </p>
-    **/
-    BundleRevision()
-    {
-    }
-
-    /**
-     * <p>
      * This class is abstract and cannot be created. It represents a revision
      * of a bundle, i.e., its content. A revision is associated with a particular
      * location string, which is typically in URL format. Subclasses of this

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolverImpl.java?view=diff&rev=553333&r1=553332&r2=553333
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolverImpl.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/MutablePropertyResolverImpl.java
Wed Jul  4 14:15:05 2007
@@ -23,7 +23,7 @@
 public class MutablePropertyResolverImpl implements MutablePropertyResolver
 {
     private Map m_props = null;
-    
+
     public MutablePropertyResolverImpl(Map props)
     {
         m_props = props;

Added: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/PropertyResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/PropertyResolverImpl.java?view=auto&rev=553333
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/PropertyResolverImpl.java
(added)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/PropertyResolverImpl.java
Wed Jul  4 14:15:05 2007
@@ -0,0 +1,39 @@
+/* 
+ * 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.util;
+
+public class PropertyResolverImpl implements PropertyResolver
+{
+    private MutablePropertyResolver m_resolver = null;
+
+    public PropertyResolverImpl(MutablePropertyResolver resolver)
+    {
+        m_resolver = resolver;
+    }
+
+    public String get(String key)
+    {
+        return (m_resolver == null) ? null : m_resolver.get(key);
+    }
+
+    public String[] getKeys()
+    {
+        return (m_resolver == null) ? null : m_resolver.getKeys();
+    }
+}
\ No newline at end of file

Propchange: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/PropertyResolverImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java?view=diff&rev=553333&r1=553332&r2=553333
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
Wed Jul  4 14:15:05 2007
@@ -676,8 +676,7 @@
                 URLClassLoader.class.getDeclaredMethod("addURL",
                 new Class[] {URL.class});
             addURL.setAccessible(true);
-            addURL.invoke(getClass().getClassLoader(), 
-                new Object[]{extension, loader});
+            addURL.invoke(loader, new Object[]{extension});
         }
     }
     

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java?view=diff&rev=553333&r1=553332&r2=553333
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java
Wed Jul  4 14:15:05 2007
@@ -88,8 +88,8 @@
         return m_filter;
     }
 
-//  TODO: RB - We need to verify that the resolver code does not
-//  touch these implementation-specific methods.
+// TODO: RB - We need to verify that the resolver code does not
+// touch these implementation-specific methods.
 
     public String getPackageName()
     {

Modified: felix/trunk/main/src/main/java/org/apache/felix/main/Main.java
URL: http://svn.apache.org/viewvc/felix/trunk/main/src/main/java/org/apache/felix/main/Main.java?view=diff&rev=553333&r1=553332&r2=553333
==============================================================================
--- felix/trunk/main/src/main/java/org/apache/felix/main/Main.java (original)
+++ felix/trunk/main/src/main/java/org/apache/felix/main/Main.java Wed Jul  4 14:15:05 2007
@@ -191,10 +191,11 @@
         try
         {
             // Now create an instance of the framework.
-            m_felix = new Felix();
-            m_felix.start(
-                new MutablePropertyResolverImpl(new StringMap(configProps, false)),
+            m_felix = new Felix(
+                new MutablePropertyResolverImpl(
+                    new StringMap(configProps, false)),
                 null);
+            m_felix.start();
         }
         catch (Exception ex)
         {



Mime
View raw message