Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2011-02-27 20:57:35 -0500
committerPascal Rapicault2011-02-27 20:57:35 -0500
commitbfcb48ce0bf6d7d190a167742ce12c1f79a0938f (patch)
tree8c32818060a32f140413754c64e967478c60baf1
parent986bc7548c62270ac88eddd3315b5d23cdfc945f (diff)
downloadrt.equinox.p2-bfcb48ce0bf6d7d190a167742ce12c1f79a0938f.tar.gz
rt.equinox.p2-bfcb48ce0bf6d7d190a167742ce12c1f79a0938f.tar.xz
rt.equinox.p2-bfcb48ce0bf6d7d190a167742ce12c1f79a0938f.zip
Bug 336246 - Remove the metadata generator
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF4
-rw-r--r--bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF1
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF1
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF3
-rw-r--r--bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteModel.java1
-rw-r--r--features/org.eclipse.equinox.p2.sdk/build.properties1
-rw-r--r--features/org.eclipse.equinox.p2.sdk/feature.xml14
-rw-r--r--org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml1
-rw-r--r--org.eclipse.equinox.p2.releng/projectSet-extssh.psf1
-rw-r--r--org.eclipse.equinox.p2.releng/projectSet.psf1
14 files changed, 4 insertions, 34 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF
index 973cd3251..17087365a 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Import-Package: org.eclipse.core.runtime.internal.adaptor,
org.osgi.service.log;version="1.3.0",
org.osgi.service.startlevel;version="1.0.0",
org.osgi.util.tracker;version="1.3.0"
-Export-Package: org.eclipse.equinox.internal.frameworkadmin.equinox;x-friends:="org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.simpleconfigurator.manipulator",
+Export-Package: org.eclipse.equinox.internal.frameworkadmin.equinox;x-friends:="org.eclipse.equinox.p2.publisher,org.eclipse.equinox.simpleconfigurator.manipulator",
org.eclipse.equinox.internal.frameworkadmin.equinox.utils;x-internal:=true
Require-Bundle: org.eclipse.equinox.common
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
diff --git a/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF
index c1bde7c05..1806faf84 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF
@@ -11,13 +11,11 @@ Import-Package: org.eclipse.osgi.service.pluginconversion;version="1.0.0",
Export-Package: org.eclipse.equinox.frameworkadmin;version="2.0.0",
org.eclipse.equinox.internal.frameworkadmin.utils;
x-friends:="org.eclipse.equinox.frameworkadmin.equinox,
- org.eclipse.equinox.p2.metadata.generator,
org.eclipse.equinox.p2.publisher,
org.eclipse.equinox.simpleconfigurator.manipulator",
org.eclipse.equinox.internal.provisional.configuratormanipulator;x-friends:="org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.simpleconfigurator.manipulator",
org.eclipse.equinox.internal.provisional.frameworkadmin;
x-friends:="org.eclipse.equinox.frameworkadmin.equinox,
- org.eclipse.equinox.p2.metadata.generator,
org.eclipse.equinox.p2.publisher,
org.eclipse.equinox.p2.touchpoint.eclipse,
org.eclipse.equinox.simpleconfigurator.manipulator,
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF
index 8ce0a38ab..10ad01eea 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF
@@ -10,8 +10,7 @@ Export-Package: org.eclipse.equinox.internal.p2.artifact.processing;x-friends:="
org.eclipse.equinox.internal.p2.artifact.processors.md5;x-internal:=true,
org.eclipse.equinox.internal.p2.artifact.processors.pack200;x-friends:="org.eclipse.equinox.p2.artifact.processors,org.eclipse.equinox.p2.artifact.optimizers",
org.eclipse.equinox.internal.p2.artifact.repository;
- x-friends:="org.eclipse.equinox.p2.metadata.generator,
- org.eclipse.equinox.p2.publisher,
+ x-friends:="org.eclipse.equinox.p2.publisher,
org.eclipse.equinox.p2.reconciler.dropins,
org.eclipse.equinox.p2.ui,
org.eclipse.equinox.p2.directorywatcher,
@@ -27,7 +26,6 @@ Export-Package: org.eclipse.equinox.internal.p2.artifact.processing;x-friends:="
x-friends:="org.eclipse.equinox.p2.artifact.processors,
org.eclipse.equinox.p2.artifact.optimizers,
org.eclipse.equinox.p2.artifact.repository,
- org.eclipse.equinox.p2.metadata.generator,
org.eclipse.equinox.p2.ui,
org.eclipse.equinox.p2.publisher,
org.eclipse.equinox.p2.updatesite"
diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
index dcc34fa39..88a93d536 100644
--- a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
Bundle-Activator: org.eclipse.equinox.internal.p2.core.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.repository",
+Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.repository",
org.eclipse.equinox.internal.p2.core.helpers;
x-friends:="org.eclipse.equinox.frameworkadmin.test,
org.eclipse.equinox.p2.artifact.optimizers,
@@ -23,7 +23,6 @@ Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equ
org.eclipse.equinox.p2.garbagecollector,
org.eclipse.equinox.p2.installer,
org.eclipse.equinox.p2.metadata,
- org.eclipse.equinox.p2.metadata.generator,
org.eclipse.equinox.p2.metadata.repository,
org.eclipse.equinox.p2.operations,
org.eclipse.equinox.p2.publisher,
@@ -48,7 +47,6 @@ Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equ
org.eclipse.equinox.p2.engine,
org.eclipse.equinox.p2.garbagecollector,
org.eclipse.equinox.p2.metadata,
- org.eclipse.equinox.p2.metadata.generator,
org.eclipse.equinox.p2.metadata.repository,
org.eclipse.equinox.p2.operations,
org.eclipse.equinox.p2.publisher,
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
index ee10c5c9e..cad901f0f 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.equinox.internal.p2.metadata.repository;
x-friends:="org.eclipse.equinox.p2.engine,
- org.eclipse.equinox.p2.metadata.generator,
org.eclipse.equinox.p2.publisher,
org.eclipse.equinox.p2.reconciler.dropins,
org.eclipse.equinox.p2.ui,
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 3ccafcf3d..5ecd69136 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata;
org.eclipse.equinox.p2.director.app,
org.eclipse.equinox.p2.engine,
org.eclipse.equinox.p2.installer,
- org.eclipse.equinox.p2.metadata.generator,
org.eclipse.equinox.p2.metadata.repository,
org.eclipse.equinox.p2.operations,
org.eclipse.equinox.p2.publisher,
@@ -58,7 +57,6 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata;
org.eclipse.equinox.p2.installer,
org.eclipse.equinox.p2.jarprocessor,
org.eclipse.equinox.p2.metadata,
- org.eclipse.equinox.p2.metadata.generator,
org.eclipse.equinox.p2.metadata.repository,
org.eclipse.equinox.p2.operations,
org.eclipse.equinox.p2.publisher,
diff --git a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
index fba4b33b9..0b0082cae 100644
--- a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@ Export-Package: org.eclipse.equinox.internal.p2.persistence;x-friends:="org.ecli
org.eclipse.equinox.internal.p2.repository.helpers;
x-friends:="org.eclipse.equinox.p2.artifact.repository,
org.eclipse.equinox.p2.exemplarysetup,
- org.eclipse.equinox.p2.metadata.generator,
org.eclipse.equinox.p2.metadata.repository,
org.eclipse.equinox.p2.operations,
org.eclipse.equinox.p2.repository.tools,
diff --git a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
index 7e7ba3a1d..b79f5cda6 100644
--- a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
@@ -21,8 +21,7 @@ Export-Package: org.eclipse.equinox.p2.tests;version="2.0.0",
org.eclipse.equinox.p2.tests.publisher;version="2.0.0",
org.eclipse.equinox.p2.tests.publisher.actions;version="2.0.0",
org.eclipse.equinox.p2.tests.simpleconfigurator;version="2.0.0"
-Require-Bundle: org.eclipse.equinox.p2.metadata.generator,
- org.eclipse.equinox.frameworkadmin,
+Require-Bundle: org.eclipse.equinox.frameworkadmin,
org.eclipse.equinox.common,
org.eclipse.core.tests.harness;bundle-version="3.4.0",
org.eclipse.core.runtime;bundle-version="3.4.0",
diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteModel.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteModel.java
index 9beaa9f6b..58c699fb2 100644
--- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteModel.java
+++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteModel.java
@@ -222,7 +222,6 @@ public class SiteModel {
/**
* Returns the URI from which the list of mirrors of this site can be retrieved.
*
- * @since org.eclipse.equinox.p2.metadata.generator 1.0
*/
public String getMirrorsURI() {
return mirrorsURIString;
diff --git a/features/org.eclipse.equinox.p2.sdk/build.properties b/features/org.eclipse.equinox.p2.sdk/build.properties
index ec46ed90f..e66718299 100644
--- a/features/org.eclipse.equinox.p2.sdk/build.properties
+++ b/features/org.eclipse.equinox.p2.sdk/build.properties
@@ -35,7 +35,6 @@ generate.plugin@org.eclipse.equinox.p2.extensionlocation.source=org.eclipse.equi
generate.plugin@org.eclipse.equinox.p2.garbagecollector.source=org.eclipse.equinox.p2.garbagecollector
generate.plugin@org.eclipse.equinox.p2.installer.source=org.eclipse.equinox.p2.installer
generate.plugin@org.eclipse.equinox.p2.jarprocessor.source=org.eclipse.equinox.p2.jarprocessor
-generate.plugin@org.eclipse.equinox.p2.metadata.generator.source=org.eclipse.equinox.p2.metadata.generator
generate.plugin@org.eclipse.equinox.p2.metadata.repository.source=org.eclipse.equinox.p2.metadata.repository
generate.plugin@org.eclipse.equinox.p2.metadata.source=org.eclipse.equinox.p2.metadata
generate.plugin@org.eclipse.equinox.p2.operations.source=org.eclipse.equinox.p2.operations
diff --git a/features/org.eclipse.equinox.p2.sdk/feature.xml b/features/org.eclipse.equinox.p2.sdk/feature.xml
index 48773d789..531531c8f 100644
--- a/features/org.eclipse.equinox.p2.sdk/feature.xml
+++ b/features/org.eclipse.equinox.p2.sdk/feature.xml
@@ -227,20 +227,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.equinox.p2.metadata.generator"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.p2.metadata.generator.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.equinox.p2.metadata.repository"
download-size="0"
install-size="0"
diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
index e7da0c9d6..0f9d26afd 100644
--- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
+++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
@@ -38,7 +38,6 @@
<module>../org.eclipse.equinox.p2.installer</module>
<module>../org.eclipse.equinox.p2.jarprocessor</module>
<module>../org.eclipse.equinox.p2.metadata</module>
- <module>../org.eclipse.equinox.p2.metadata.generator</module>
<module>../org.eclipse.equinox.p2.metadata.repository</module>
<module>../org.eclipse.equinox.p2.operations</module>
<module>../org.eclipse.equinox.p2.publisher</module>
diff --git a/org.eclipse.equinox.p2.releng/projectSet-extssh.psf b/org.eclipse.equinox.p2.releng/projectSet-extssh.psf
index e4b2cf3b9..aeb70d718 100644
--- a/org.eclipse.equinox.p2.releng/projectSet-extssh.psf
+++ b/org.eclipse.equinox.p2.releng/projectSet-extssh.psf
@@ -26,7 +26,6 @@
<project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.installer,org.eclipse.equinox.p2.installer"/>
<project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.jarprocessor,org.eclipse.equinox.p2.jarprocessor"/>
<project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.metadata"/>
-<project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.metadata.generator"/>
<project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.metadata.repository"/>
<project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.operations,org.eclipse.equinox.p2.operations"/>
<project reference="1.0,:extssh:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.publisher"/>
diff --git a/org.eclipse.equinox.p2.releng/projectSet.psf b/org.eclipse.equinox.p2.releng/projectSet.psf
index e8c77cd9a..df30466d2 100644
--- a/org.eclipse.equinox.p2.releng/projectSet.psf
+++ b/org.eclipse.equinox.p2.releng/projectSet.psf
@@ -23,7 +23,6 @@
<project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.installer,org.eclipse.equinox.p2.installer"/>
<project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.jarprocessor,org.eclipse.equinox.p2.jarprocessor"/>
<project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.metadata"/>
-<project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.metadata.generator"/>
<project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.metadata.repository"/>
<project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.operations,org.eclipse.equinox.p2.operations"/>
<project reference="1.0,:pserver:dev.eclipse.org:/cvsroot/rt,org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.publisher"/>

Back to the top