diff options
author | John Arthorne | 2010-01-12 15:55:45 +0000 |
---|---|---|
committer | John Arthorne | 2010-01-12 15:55:45 +0000 |
commit | b1d9e5e50f6fe5eebd337ffe18753183e3d05e7a (patch) | |
tree | b7f7d7e0da7f209890d41d8462c19dac270ad891 | |
parent | c1c227aec95958ce284299c0144bb0f413a83573 (diff) | |
download | rt.equinox.p2-b1d9e5e50f6fe5eebd337ffe18753183e3d05e7a.tar.gz rt.equinox.p2-b1d9e5e50f6fe5eebd337ffe18753183e3d05e7a.tar.xz rt.equinox.p2-b1d9e5e50f6fe5eebd337ffe18753183e3d05e7a.zip |
Bug 299374 - metadata API leaks
9 files changed, 19 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF index 6f2f847f7..a40324f0f 100644 --- a/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF @@ -8,6 +8,7 @@ Bundle-Version: 1.0.200.qualifier Import-Package: org.eclipse.equinox.app, org.eclipse.equinox.internal.p2.console, org.eclipse.equinox.internal.p2.core.helpers, + org.eclipse.equinox.internal.p2.metadata, org.eclipse.equinox.internal.p2.metadata.query, org.eclipse.equinox.internal.provisional.p2.core, org.eclipse.equinox.internal.provisional.p2.director, diff --git a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/DirectorApplication.java b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/DirectorApplication.java index 21727b460..f1c83e31a 100644 --- a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/DirectorApplication.java +++ b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/DirectorApplication.java @@ -12,6 +12,8 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.director.app; +import org.eclipse.equinox.internal.p2.metadata.VersionedId; + import java.io.*; import java.net.URI; import java.net.URISyntaxException; diff --git a/bundles/org.eclipse.equinox.p2.director.app/src_ant/org/eclipse/equinox/p2/director/app/ant/DirectorTask.java b/bundles/org.eclipse.equinox.p2.director.app/src_ant/org/eclipse/equinox/p2/director/app/ant/DirectorTask.java index 9c1216385..a692aa7b4 100644 --- a/bundles/org.eclipse.equinox.p2.director.app/src_ant/org/eclipse/equinox/p2/director/app/ant/DirectorTask.java +++ b/bundles/org.eclipse.equinox.p2.director.app/src_ant/org/eclipse/equinox/p2/director/app/ant/DirectorTask.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.equinox.p2.director.app.ant; +import org.eclipse.equinox.internal.p2.metadata.VersionedId; + import java.io.*; import java.net.URI; import java.net.URISyntaxException; @@ -19,7 +21,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.URIUtil; import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.internal.p2.director.app.*; -import org.eclipse.equinox.internal.provisional.p2.metadata.VersionedId; import org.eclipse.osgi.util.NLS; /** diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java index cff24b9ff..989b2482e 100644 --- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java +++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java @@ -11,6 +11,8 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.installer; +import org.eclipse.equinox.internal.p2.metadata.VersionedId; + import java.io.*; import java.net.URI; import java.net.URISyntaxException; @@ -19,7 +21,6 @@ import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; import org.eclipse.equinox.internal.provisional.p2.installer.InstallDescription; -import org.eclipse.equinox.internal.provisional.p2.metadata.VersionedId; import org.eclipse.equinox.p2.metadata.IVersionedId; /** diff --git a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF index 163a6d3af..4d1bec1d1 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF @@ -15,7 +15,9 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata; org.eclipse.equinox.p2.ui, org.eclipse.equinox.p2.operations, org.eclipse.equinox.p2.publisher, - org.eclipse.equinox.p2.director", + org.eclipse.equinox.p2.director, + org.eclipse.equinox.p2.director.app, + org.eclipse.equinox.p2.installer", org.eclipse.equinox.internal.p2.metadata.query; x-friends:="org.eclipse.equinox.p2.artifact.optimizers, org.eclipse.equinox.p2.artifact.processors, diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/VersionedId.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/VersionedId.java index 826d66c75..06de22ca4 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/VersionedId.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/VersionedId.java @@ -11,7 +11,9 @@ * Thomas Hallgren - Fix for bug 268659 * IBM - ongoing development *******************************************************************************/ -package org.eclipse.equinox.internal.provisional.p2.metadata; +package org.eclipse.equinox.internal.p2.metadata; + +import org.eclipse.equinox.internal.provisional.p2.metadata.Version; import org.eclipse.equinox.internal.p2.core.helpers.StringHelper; import org.eclipse.equinox.p2.metadata.IVersionedId; diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java index 110fe70d3..6f6141e4e 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java +++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java @@ -13,6 +13,8 @@ package org.eclipse.equinox.internal.p2.publisher.eclipse; +import org.eclipse.equinox.internal.p2.metadata.VersionedId; + import java.io.*; import java.util.*; import javax.xml.parsers.SAXParser; @@ -20,7 +22,6 @@ import javax.xml.parsers.SAXParserFactory; import org.eclipse.equinox.internal.p2.core.helpers.*; import org.eclipse.equinox.internal.p2.publisher.Activator; import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo; -import org.eclipse.equinox.internal.provisional.p2.metadata.VersionedId; import org.eclipse.equinox.p2.metadata.IVersionedId; import org.eclipse.osgi.service.datalocation.Location; import org.xml.sax.Attributes; diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/InstallPublisherApplication.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/InstallPublisherApplication.java index 2a7b5628f..3324528d8 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/InstallPublisherApplication.java +++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/InstallPublisherApplication.java @@ -10,10 +10,11 @@ ******************************************************************************/ package org.eclipse.equinox.p2.publisher.eclipse; +import org.eclipse.equinox.internal.p2.metadata.VersionedId; + import java.net.URISyntaxException; import java.util.ArrayList; import org.eclipse.equinox.internal.provisional.p2.metadata.Version; -import org.eclipse.equinox.internal.provisional.p2.metadata.VersionedId; import org.eclipse.equinox.p2.metadata.IVersionedId; import org.eclipse.equinox.p2.publisher.*; diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ProductAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ProductAction.java index f496956b6..d34f90d56 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ProductAction.java +++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ProductAction.java @@ -10,12 +10,13 @@ ******************************************************************************/ package org.eclipse.equinox.p2.publisher.eclipse; +import org.eclipse.equinox.internal.p2.metadata.VersionedId; + import java.io.File; import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.publisher.eclipse.IProductDescriptor; import org.eclipse.equinox.internal.provisional.p2.metadata.Version; -import org.eclipse.equinox.internal.provisional.p2.metadata.VersionedId; import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.metadata.IVersionedId; import org.eclipse.equinox.p2.publisher.*; |