Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2012-08-01 11:31:29 -0400
committerThomas Watson2012-08-01 16:56:59 -0400
commit8fd32410ca1fa2044eb308dbcd32df2f5f436028 (patch)
tree35f619f19c38cf23bfaf4a2f37bd73590ac6238f
parent3f5244566860943ad1edda436cce235f628706a6 (diff)
downloadrt.equinox.framework-8fd32410ca1fa2044eb308dbcd32df2f5f436028.tar.gz
rt.equinox.framework-8fd32410ca1fa2044eb308dbcd32df2f5f436028.tar.xz
rt.equinox.framework-8fd32410ca1fa2044eb308dbcd32df2f5f436028.zip
stop building old resolver impl, move felix resolver impl
-rw-r--r--bundles/org.eclipse.osgi/.classpath1
-rw-r--r--bundles/org.eclipse.osgi/build.properties1
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Candidates.java (renamed from bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Candidates.java)0
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Logger.java (renamed from bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Logger.java)0
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/ResolverImpl.java (renamed from bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/ResolverImpl.java)0
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/ShadowList.java (renamed from bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/ShadowList.java)0
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/SimpleHostedCapability.java (renamed from bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/SimpleHostedCapability.java)0
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Util.java (renamed from bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Util.java)0
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/WireImpl.java (renamed from bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WireImpl.java)0
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/WrappedCapability.java (renamed from bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedCapability.java)0
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/WrappedRequirement.java (renamed from bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedRequirement.java)0
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/WrappedResource.java (renamed from bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedResource.java)0
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java (renamed from bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ComputeNodeOrder.java)2
14 files changed, 2 insertions, 4 deletions
diff --git a/bundles/org.eclipse.osgi/.classpath b/bundles/org.eclipse.osgi/.classpath
index 310e2a009..c0ae52c7f 100644
--- a/bundles/org.eclipse.osgi/.classpath
+++ b/bundles/org.eclipse.osgi/.classpath
@@ -5,6 +5,5 @@
<classpathentry kind="src" path="osgi/src"/>
<classpathentry kind="src" path="supplement/src"/>
<classpathentry kind="src" path="container/src"/>
- <classpathentry kind="src" path="resolver/src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.osgi/build.properties b/bundles/org.eclipse.osgi/build.properties
index 661478622..fb36a381c 100644
--- a/bundles/org.eclipse.osgi/build.properties
+++ b/bundles/org.eclipse.osgi/build.properties
@@ -21,7 +21,6 @@ src.includes = about.html,\
about_files/
source.. = osgi/src,\
supplement/src/,\
- resolver/src/,\
container/src/
output.. = bin/
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Candidates.java b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Candidates.java
index 3bffc1995..3bffc1995 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Candidates.java
+++ b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Candidates.java
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Logger.java b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Logger.java
index 9eaa21212..9eaa21212 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Logger.java
+++ b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Logger.java
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/ResolverImpl.java b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/ResolverImpl.java
index 35ec2b8be..35ec2b8be 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/ResolverImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/ResolverImpl.java
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/ShadowList.java b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/ShadowList.java
index 05734da46..05734da46 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/ShadowList.java
+++ b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/ShadowList.java
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/SimpleHostedCapability.java b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/SimpleHostedCapability.java
index 98e2d4f3d..98e2d4f3d 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/SimpleHostedCapability.java
+++ b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/SimpleHostedCapability.java
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Util.java b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Util.java
index dc5a10003..dc5a10003 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/Util.java
+++ b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Util.java
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WireImpl.java b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/WireImpl.java
index a79ac7114..a79ac7114 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WireImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/WireImpl.java
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedCapability.java b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/WrappedCapability.java
index 9bbec36e2..9bbec36e2 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedCapability.java
+++ b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/WrappedCapability.java
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedRequirement.java b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/WrappedRequirement.java
index a9d66dfea..a9d66dfea 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedRequirement.java
+++ b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/WrappedRequirement.java
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedResource.java b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/WrappedResource.java
index 693e8bbcd..693e8bbcd 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/apache/felix/resolver/WrappedResource.java
+++ b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/WrappedResource.java
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java
index 7494eb91f..b292510d8 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java
@@ -22,7 +22,7 @@ import org.eclipse.osgi.container.Module.Settings;
import org.eclipse.osgi.container.Module.State;
import org.eclipse.osgi.framework.util.ObjectPool;
import org.eclipse.osgi.internal.container.Capabilities;
-import org.eclipse.osgi.internal.resolver.ComputeNodeOrder;
+import org.eclipse.osgi.internal.container.ComputeNodeOrder;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
import org.osgi.framework.wiring.BundleRevision;
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ComputeNodeOrder.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java
index ecc068032..ef2ab02bf 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ComputeNodeOrder.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/ComputeNodeOrder.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.osgi.internal.resolver;
+package org.eclipse.osgi.internal.container;
import java.util.*;

Back to the top