felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r901771 - in /felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework: ./ candidateset/ capabilityset/ resolver/ util/ util/manifestparser/
Date Thu, 21 Jan 2010 16:52:50 GMT
Author: rickhall
Date: Thu Jan 21 16:52:48 2010
New Revision: 901771

URL: http://svn.apache.org/viewvc?rev=901771&view=rev
Log:
Rename package, since original name was a mistake.

Added:
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Attribute.java
      - copied, changed from r899767, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Attribute.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Capability.java
      - copied, changed from r899767, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Capability.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
      - copied, changed from r899767, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/CapabilitySet.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Directive.java
      - copied, changed from r899767, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Directive.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Module.java
      - copied, changed from r901272, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Module.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Requirement.java
      - copied, changed from r900957, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Requirement.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java
      - copied, changed from r899767, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/SimpleFilter.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Wire.java
      - copied, changed from r901272, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Wire.java
Removed:
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Attribute.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Capability.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/CapabilitySet.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Directive.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Module.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Requirement.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/SimpleFilter.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Wire.java
Modified:
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/BundleImpl.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ExtensionManager.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/Felix.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/FelixResolverState.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ModuleImpl.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/RequiredBundleImpl.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/CandidateComparator.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolveException.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/Resolver.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/Util.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/CapabilityImpl.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ParsedHeaderClause.java
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/RequirementImpl.java

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/BundleImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/BundleImpl.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/BundleImpl.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/BundleImpl.java
Thu Jan 21 16:52:48 2010
@@ -25,7 +25,7 @@
 import java.util.*;
 
 import org.apache.felix.framework.cache.BundleArchive;
-import org.apache.felix.framework.candidateset.Module;
+import org.apache.felix.framework.capabilityset.Module;
 import org.apache.felix.framework.ext.SecurityProvider;
 import org.apache.felix.framework.util.StringMap;
 import org.osgi.framework.*;

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/BundleProtectionDomain.java
Thu Jan 21 16:52:48 2010
@@ -25,7 +25,7 @@
 import java.security.ProtectionDomain;
 import java.security.cert.Certificate;
 
-import org.apache.felix.framework.candidateset.Module;
+import org.apache.felix.framework.capabilityset.Module;
 
 public class BundleProtectionDomain extends ProtectionDomain
 {

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
Thu Jan 21 16:52:48 2010
@@ -19,8 +19,8 @@
 package org.apache.felix.framework;
 
 import java.util.List;
-import org.apache.felix.framework.candidateset.Capability;
-import org.apache.felix.framework.candidateset.Module;
+import org.apache.felix.framework.capabilityset.Capability;
+import org.apache.felix.framework.capabilityset.Module;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Version;
 import org.osgi.service.packageadmin.ExportedPackage;

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ExtensionManager.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ExtensionManager.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ExtensionManager.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ExtensionManager.java
Thu Jan 21 16:52:48 2010
@@ -38,10 +38,10 @@
 import java.util.Set;
 
 import org.apache.felix.framework.Felix.FelixResolver;
-import org.apache.felix.framework.candidateset.Attribute;
-import org.apache.felix.framework.candidateset.Capability;
-import org.apache.felix.framework.candidateset.Directive;
-import org.apache.felix.framework.candidateset.Module;
+import org.apache.felix.framework.capabilityset.Attribute;
+import org.apache.felix.framework.capabilityset.Capability;
+import org.apache.felix.framework.capabilityset.Directive;
+import org.apache.felix.framework.capabilityset.Module;
 import org.apache.felix.framework.util.FelixConstants;
 import org.apache.felix.framework.util.StringMap;
 import org.apache.felix.framework.util.Util;

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/Felix.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/Felix.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/Felix.java
Thu Jan 21 16:52:48 2010
@@ -27,13 +27,13 @@
 import org.apache.felix.framework.ServiceRegistry.ServiceRegistryCallbacks;
 import org.apache.felix.framework.cache.BundleArchive;
 import org.apache.felix.framework.cache.BundleCache;
-import org.apache.felix.framework.candidateset.Attribute;
-import org.apache.felix.framework.candidateset.Capability;
-import org.apache.felix.framework.candidateset.CapabilitySet;
-import org.apache.felix.framework.candidateset.Directive;
-import org.apache.felix.framework.candidateset.Module;
-import org.apache.felix.framework.candidateset.Requirement;
-import org.apache.felix.framework.candidateset.Wire;
+import org.apache.felix.framework.capabilityset.Attribute;
+import org.apache.felix.framework.capabilityset.Capability;
+import org.apache.felix.framework.capabilityset.CapabilitySet;
+import org.apache.felix.framework.capabilityset.Directive;
+import org.apache.felix.framework.capabilityset.Module;
+import org.apache.felix.framework.capabilityset.Requirement;
+import org.apache.felix.framework.capabilityset.Wire;
 import org.apache.felix.framework.ext.SecurityProvider;
 import org.apache.felix.framework.resolver.ResolveException;
 import org.apache.felix.framework.resolver.Resolver;

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/FelixResolverState.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/FelixResolverState.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/FelixResolverState.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/FelixResolverState.java
Thu Jan 21 16:52:48 2010
@@ -25,11 +25,11 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import org.apache.felix.framework.candidateset.Capability;
-import org.apache.felix.framework.candidateset.CapabilitySet;
-import org.apache.felix.framework.candidateset.Module;
-import org.apache.felix.framework.candidateset.Requirement;
-import org.apache.felix.framework.candidateset.Wire;
+import org.apache.felix.framework.capabilityset.Capability;
+import org.apache.felix.framework.capabilityset.CapabilitySet;
+import org.apache.felix.framework.capabilityset.Module;
+import org.apache.felix.framework.capabilityset.Requirement;
+import org.apache.felix.framework.capabilityset.Wire;
 import org.apache.felix.framework.resolver.CandidateComparator;
 import org.apache.felix.framework.resolver.ResolveException;
 import org.apache.felix.framework.resolver.Resolver;

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java
Thu Jan 21 16:52:48 2010
@@ -19,7 +19,7 @@
 package org.apache.felix.framework;
 
 import java.util.*;
-import org.apache.felix.framework.candidateset.Module;
+import org.apache.felix.framework.capabilityset.Module;
 
 import org.apache.felix.framework.util.Util;
 

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ModuleImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ModuleImpl.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ModuleImpl.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ModuleImpl.java
Thu Jan 21 16:52:48 2010
@@ -30,7 +30,6 @@
 import java.security.ProtectionDomain;
 import java.security.SecureClassLoader;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 
 import java.util.Enumeration;
@@ -42,12 +41,12 @@
 import java.util.Vector;
 import org.apache.felix.framework.Felix.FelixResolver;
 import org.apache.felix.framework.cache.JarContent;
-import org.apache.felix.framework.candidateset.Attribute;
-import org.apache.felix.framework.candidateset.Capability;
-import org.apache.felix.framework.candidateset.Directive;
-import org.apache.felix.framework.candidateset.Module;
-import org.apache.felix.framework.candidateset.Requirement;
-import org.apache.felix.framework.candidateset.Wire;
+import org.apache.felix.framework.capabilityset.Attribute;
+import org.apache.felix.framework.capabilityset.Capability;
+import org.apache.felix.framework.capabilityset.Directive;
+import org.apache.felix.framework.capabilityset.Module;
+import org.apache.felix.framework.capabilityset.Requirement;
+import org.apache.felix.framework.capabilityset.Wire;
 import org.apache.felix.framework.resolver.ResolveException;
 import org.apache.felix.framework.resolver.WireImpl;
 import org.apache.felix.framework.resolver.WireModuleImpl;
@@ -297,7 +296,7 @@
         if (m_cachedRequirements == null)
         {
             List<Requirement> reqList = (m_requirements == null)
-                ? new ArrayList() : new ArrayList(Arrays.asList(m_requirements));
+                ? new ArrayList() : new ArrayList(m_requirements);
             for (int fragIdx = 0;
                 (m_fragments != null) && (fragIdx < m_fragments.size());
                 fragIdx++)
@@ -324,7 +323,7 @@
         if (m_cachedDynamicRequirements == null)
         {
             List<Requirement> reqList = (m_dynamicRequirements == null)
-                ? new ArrayList() : new ArrayList(Arrays.asList(m_dynamicRequirements));
+                ? new ArrayList() : new ArrayList(m_dynamicRequirements);
             for (int fragIdx = 0;
                 (m_fragments != null) && (fragIdx < m_fragments.size());
                 fragIdx++)
@@ -351,7 +350,7 @@
         if (m_isResolved)
         {
             List<R4Library> nativeList = (m_nativeLibraries == null)
-                ? new ArrayList() : new ArrayList(Arrays.asList(m_nativeLibraries));
+                ? new ArrayList() : new ArrayList(m_nativeLibraries);
             for (int fragIdx = 0;
                 (m_fragments != null) && (fragIdx < m_fragments.size());
                 fragIdx++)

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/PackageAdminImpl.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
Thu Jan 21 16:52:48 2010
@@ -19,7 +19,7 @@
 package org.apache.felix.framework;
 
 import java.util.*;
-import org.apache.felix.framework.candidateset.Module;
+import org.apache.felix.framework.capabilityset.Module;
 import org.apache.felix.framework.util.VersionRange;
 import org.osgi.framework.AdminPermission;
 import org.osgi.framework.Bundle;

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/RequiredBundleImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/RequiredBundleImpl.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/RequiredBundleImpl.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/RequiredBundleImpl.java
Thu Jan 21 16:52:48 2010
@@ -21,7 +21,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.apache.felix.framework.candidateset.Module;
+import org.apache.felix.framework.capabilityset.Module;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Version;
 import org.osgi.service.packageadmin.RequiredBundle;

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/ServiceRegistrationImpl.java
Thu Jan 21 16:52:48 2010
@@ -22,8 +22,8 @@
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.*;
-import org.apache.felix.framework.candidateset.Module;
-import org.apache.felix.framework.candidateset.Wire;
+import org.apache.felix.framework.capabilityset.Module;
+import org.apache.felix.framework.capabilityset.Wire;
 
 import org.apache.felix.framework.util.MapToDictionary;
 import org.apache.felix.framework.util.StringMap;

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/URLHandlersBundleURLConnection.java
Thu Jan 21 16:52:48 2010
@@ -24,7 +24,7 @@
 import java.net.URLConnection;
 import java.security.Permission;
 import java.util.List;
-import org.apache.felix.framework.candidateset.Module;
+import org.apache.felix.framework.capabilityset.Module;
 
 import org.apache.felix.framework.util.Util;
 

Copied: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Attribute.java
(from r899767, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Attribute.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Attribute.java?p2=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Attribute.java&p1=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Attribute.java&r1=899767&r2=901771&rev=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Attribute.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Attribute.java
Thu Jan 21 16:52:48 2010
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.felix.framework.candidateset;
+package org.apache.felix.framework.capabilityset;
 
 public class Attribute
 {

Copied: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Capability.java
(from r899767, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Capability.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Capability.java?p2=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Capability.java&p1=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Capability.java&r1=899767&r2=901771&rev=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Capability.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Capability.java
Thu Jan 21 16:52:48 2010
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.felix.framework.candidateset;
+package org.apache.felix.framework.capabilityset;
 
 import java.util.List;
 

Copied: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
(from r899767, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/CapabilitySet.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java?p2=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java&p1=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/CapabilitySet.java&r1=899767&r2=901771&rev=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/CapabilitySet.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
Thu Jan 21 16:52:48 2010
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.felix.framework.candidateset;
+package org.apache.felix.framework.capabilityset;
 
 import java.util.Collection;
 import java.util.HashMap;

Copied: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Directive.java
(from r899767, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Directive.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Directive.java?p2=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Directive.java&p1=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Directive.java&r1=899767&r2=901771&rev=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Directive.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Directive.java
Thu Jan 21 16:52:48 2010
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.felix.framework.candidateset;
+package org.apache.felix.framework.capabilityset;
 
 public class Directive
 {

Copied: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Module.java
(from r901272, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Module.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Module.java?p2=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Module.java&p1=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Module.java&r1=901272&r2=901771&rev=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Module.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Module.java
Thu Jan 21 16:52:48 2010
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.felix.framework.candidateset;
+package org.apache.felix.framework.capabilityset;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Requirement.java
(from r900957, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Requirement.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Requirement.java?p2=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Requirement.java&p1=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Requirement.java&r1=900957&r2=901771&rev=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Requirement.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Requirement.java
Thu Jan 21 16:52:48 2010
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.felix.framework.candidateset;
+package org.apache.felix.framework.capabilityset;
 
 import java.util.List;
 

Copied: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java
(from r899767, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/SimpleFilter.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java?p2=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java&p1=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/SimpleFilter.java&r1=899767&r2=901771&rev=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/SimpleFilter.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/SimpleFilter.java
Thu Jan 21 16:52:48 2010
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.felix.framework.candidateset;
+package org.apache.felix.framework.capabilityset;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Wire.java
(from r901272, felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Wire.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Wire.java?p2=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Wire.java&p1=felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Wire.java&r1=901272&r2=901771&rev=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/candidateset/Wire.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/capabilityset/Wire.java
Thu Jan 21 16:52:48 2010
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.felix.framework.candidateset;
+package org.apache.felix.framework.capabilityset;
 
 import java.net.URL;
 import java.util.Enumeration;

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/CandidateComparator.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/CandidateComparator.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/CandidateComparator.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/CandidateComparator.java
Thu Jan 21 16:52:48 2010
@@ -19,7 +19,7 @@
 package org.apache.felix.framework.resolver;
 
 import java.util.Comparator;
-import org.apache.felix.framework.candidateset.Capability;
+import org.apache.felix.framework.capabilityset.Capability;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
 

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolveException.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolveException.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolveException.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolveException.java
Thu Jan 21 16:52:48 2010
@@ -18,8 +18,8 @@
  */
 package org.apache.felix.framework.resolver;
 
-import org.apache.felix.framework.candidateset.Module;
-import org.apache.felix.framework.candidateset.Requirement;
+import org.apache.felix.framework.capabilityset.Module;
+import org.apache.felix.framework.capabilityset.Requirement;
 
 public class ResolveException extends RuntimeException
 {

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/Resolver.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/Resolver.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/Resolver.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/Resolver.java
Thu Jan 21 16:52:48 2010
@@ -21,10 +21,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.felix.framework.candidateset.Capability;
-import org.apache.felix.framework.candidateset.Module;
-import org.apache.felix.framework.candidateset.Requirement;
-import org.apache.felix.framework.candidateset.Wire;
+import org.apache.felix.framework.capabilityset.Capability;
+import org.apache.felix.framework.capabilityset.Module;
+import org.apache.felix.framework.capabilityset.Requirement;
+import org.apache.felix.framework.capabilityset.Wire;
 
 public interface Resolver
 {

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
Thu Jan 21 16:52:48 2010
@@ -29,11 +29,11 @@
 import java.util.StringTokenizer;
 import java.util.TreeSet;
 import org.apache.felix.framework.Logger;
-import org.apache.felix.framework.candidateset.Capability;
-import org.apache.felix.framework.candidateset.CapabilitySet;
-import org.apache.felix.framework.candidateset.Module;
-import org.apache.felix.framework.candidateset.Requirement;
-import org.apache.felix.framework.candidateset.Wire;
+import org.apache.felix.framework.capabilityset.Capability;
+import org.apache.felix.framework.capabilityset.CapabilitySet;
+import org.apache.felix.framework.capabilityset.Module;
+import org.apache.felix.framework.capabilityset.Requirement;
+import org.apache.felix.framework.capabilityset.Wire;
 
 // 1. Treat hard pkg constraints separately from implied package constraints
 // 2. Map pkg constraints to a set of capabilities, not a single capability.

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/WireImpl.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/WireImpl.java
Thu Jan 21 16:52:48 2010
@@ -20,10 +20,10 @@
 
 import java.net.URL;
 import java.util.Enumeration;
-import org.apache.felix.framework.candidateset.Capability;
-import org.apache.felix.framework.candidateset.Module;
-import org.apache.felix.framework.candidateset.Requirement;
-import org.apache.felix.framework.candidateset.Wire;
+import org.apache.felix.framework.capabilityset.Capability;
+import org.apache.felix.framework.capabilityset.Module;
+import org.apache.felix.framework.capabilityset.Requirement;
+import org.apache.felix.framework.capabilityset.Wire;
 import org.apache.felix.moduleloader.ResourceNotFoundException;
 
 public class WireImpl implements Wire

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/WireModuleImpl.java
Thu Jan 21 16:52:48 2010
@@ -22,10 +22,10 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
-import org.apache.felix.framework.candidateset.Capability;
-import org.apache.felix.framework.candidateset.Module;
-import org.apache.felix.framework.candidateset.Requirement;
-import org.apache.felix.framework.candidateset.Wire;
+import org.apache.felix.framework.capabilityset.Capability;
+import org.apache.felix.framework.capabilityset.Module;
+import org.apache.felix.framework.capabilityset.Requirement;
+import org.apache.felix.framework.capabilityset.Wire;
 import org.apache.felix.framework.util.Util;
 import org.apache.felix.moduleloader.ResourceNotFoundException;
 

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/Util.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/Util.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/Util.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/Util.java
Thu Jan 21 16:52:48 2010
@@ -25,11 +25,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import org.apache.felix.framework.candidateset.Capability;
-import org.apache.felix.framework.candidateset.CapabilitySet;
-import org.apache.felix.framework.candidateset.Module;
-import org.apache.felix.framework.candidateset.Requirement;
-import org.apache.felix.framework.candidateset.Wire;
+import org.apache.felix.framework.capabilityset.Capability;
+import org.apache.felix.framework.capabilityset.CapabilitySet;
+import org.apache.felix.framework.capabilityset.Module;
+import org.apache.felix.framework.capabilityset.Requirement;
+import org.apache.felix.framework.capabilityset.Wire;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/CapabilityImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/CapabilityImpl.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/CapabilityImpl.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/CapabilityImpl.java
Thu Jan 21 16:52:48 2010
@@ -22,10 +22,10 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.StringTokenizer;
-import org.apache.felix.framework.candidateset.Attribute;
-import org.apache.felix.framework.candidateset.Capability;
-import org.apache.felix.framework.candidateset.Directive;
-import org.apache.felix.framework.candidateset.Module;
+import org.apache.felix.framework.capabilityset.Attribute;
+import org.apache.felix.framework.capabilityset.Capability;
+import org.apache.felix.framework.capabilityset.Directive;
+import org.apache.felix.framework.capabilityset.Module;
 import org.apache.felix.framework.util.Util;
 import org.osgi.framework.Constants;
 

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
Thu Jan 21 16:52:48 2010
@@ -23,11 +23,11 @@
 import java.util.Map.Entry;
 
 import org.apache.felix.framework.Logger;
-import org.apache.felix.framework.candidateset.Capability;
-import org.apache.felix.framework.candidateset.Attribute;
-import org.apache.felix.framework.candidateset.Directive;
-import org.apache.felix.framework.candidateset.Module;
-import org.apache.felix.framework.candidateset.Requirement;
+import org.apache.felix.framework.capabilityset.Capability;
+import org.apache.felix.framework.capabilityset.Attribute;
+import org.apache.felix.framework.capabilityset.Directive;
+import org.apache.felix.framework.capabilityset.Module;
+import org.apache.felix.framework.capabilityset.Requirement;
 import org.apache.felix.framework.util.FelixConstants;
 import org.apache.felix.framework.util.VersionRange;
 import org.osgi.framework.*;
@@ -109,7 +109,7 @@
             {
                 capList.add(moduleCap);
                 capList.add(new CapabilityImpl(
-                    owner, Capability.HOST_NAMESPACE, null,
+                    owner, Capability.HOST_NAMESPACE, new ArrayList<Directive>(0),
                     ((CapabilityImpl) moduleCap).getAttributes()));
             }
 

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ParsedHeaderClause.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ParsedHeaderClause.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ParsedHeaderClause.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/ParsedHeaderClause.java
Thu Jan 21 16:52:48 2010
@@ -19,8 +19,8 @@
 package org.apache.felix.framework.util.manifestparser;
 
 import java.util.List;
-import org.apache.felix.framework.candidateset.Attribute;
-import org.apache.felix.framework.candidateset.Directive;
+import org.apache.felix.framework.capabilityset.Attribute;
+import org.apache.felix.framework.capabilityset.Directive;
 
 public class ParsedHeaderClause
 {

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/RequirementImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/RequirementImpl.java?rev=901771&r1=901770&r2=901771&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/RequirementImpl.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/util/manifestparser/RequirementImpl.java
Thu Jan 21 16:52:48 2010
@@ -21,10 +21,10 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.apache.felix.framework.candidateset.Attribute;
-import org.apache.felix.framework.candidateset.Directive;
-import org.apache.felix.framework.candidateset.Requirement;
-import org.apache.felix.framework.candidateset.SimpleFilter;
+import org.apache.felix.framework.capabilityset.Attribute;
+import org.apache.felix.framework.capabilityset.Directive;
+import org.apache.felix.framework.capabilityset.Requirement;
+import org.apache.felix.framework.capabilityset.SimpleFilter;
 import org.apache.felix.framework.util.VersionRange;
 import org.osgi.framework.Constants;
 



Mime
View raw message