From cf9a016317586d3d8b63107dd71683e4312a82d0 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Thu, 29 Mar 2007 11:45:59 +0000 Subject: [PATCH] Organize Manifests: Export internal packages with x-internal --- .../META-INF/MANIFEST.MF | 3 ++- .../org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF | 5 +++++ rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF | 8 +++++++- rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF | 7 ++++--- .../org.eclipse.rse.processes.ui/plugin.properties | 2 +- .../org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF | 1 + .../org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF | 6 ++++-- .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 ++ .../META-INF/MANIFEST.MF | 3 ++- .../META-INF/MANIFEST.MF | 3 ++- rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF | 2 ++ rse/plugins/org.eclipse.rse.ui/plugin.properties | 6 +++--- rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF | 7 +++++++ 16 files changed, 45 insertions(+), 15 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF index f4b76409fba..b84d9493eee 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF @@ -16,6 +16,7 @@ Require-Bundle: org.eclipse.ui, Eclipse-LazyStart: true Export-Package: org.eclipse.rse.connectorservice.dstore, - org.eclipse.rse.connectorservice.dstore.util + org.eclipse.rse.connectorservice.dstore.util, + org.eclipse.rse.internal.connectorservice.dstore;x-internal:=true Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF index 0e774f1ccb4..d9481350481 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF @@ -20,3 +20,8 @@ Require-Bundle: org.eclipse.ui, Eclipse-LazyStart: true Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Export-Package: org.eclipse.rse.internal.dstore.security;x-internal:=true, + org.eclipse.rse.internal.dstore.security.preference;x-internal:=true, + org.eclipse.rse.internal.dstore.security.util;x-internal:=true, + org.eclipse.rse.internal.dstore.security.widgets;x-internal:=true, + org.eclipse.rse.internal.dstore.security.wizards;x-internal:=true diff --git a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF index 223dde4a98e..214c3578512 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF @@ -26,6 +26,12 @@ Export-Package: org.eclipse.rse.files.ui, org.eclipse.rse.files.ui.dialogs, org.eclipse.rse.files.ui.resources, org.eclipse.rse.files.ui.widgets, - org.eclipse.rse.internal.files.ui.search;x-internal:=true + org.eclipse.rse.internal.files.ui.actions;x-internal:=true, + org.eclipse.rse.internal.files.ui.propertypages;x-internal:=true, + org.eclipse.rse.internal.files.ui.resources;x-internal:=true, + org.eclipse.rse.internal.files.ui.search;x-internal:=true, + org.eclipse.rse.internal.files.ui.view;x-internal:=true, + org.eclipse.rse.internal.files.ui.widgets;x-internal:=true, + org.eclipse.rse.internal.files.ui.wizards;x-internal:=true Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF index ed02716e4f8..0fdfce07436 100644 --- a/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Eclipse-LazyStart: true Export-Package: org.eclipse.rse.internal.logging;x-internal:=true, - org.eclipse.rse.internal.logging.ui, + org.eclipse.rse.internal.logging.ui;x-internal:=true, org.eclipse.rse.logging Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF index b8c3d86239f..067840b4d85 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF @@ -26,9 +26,10 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.rse.core, org.eclipse.rse.ui -Export-Package: org.eclipse.rse.internal.processes.ui.dialogs, - org.eclipse.rse.internal.processes.ui.propertypages, - org.eclipse.rse.internal.processes.ui.view, +Export-Package: org.eclipse.rse.internal.processes.ui;x-internal:=true, + org.eclipse.rse.internal.processes.ui.dialogs;x-internal:=true, + org.eclipse.rse.internal.processes.ui.propertypages;x-internal:=true, + org.eclipse.rse.internal.processes.ui.view;x-internal:=true, org.eclipse.rse.processes.ui, org.eclipse.rse.processes.ui.actions, org.eclipse.rse.processes.ui.view diff --git a/rse/plugins/org.eclipse.rse.processes.ui/plugin.properties b/rse/plugins/org.eclipse.rse.processes.ui/plugin.properties index 86f170579a4..3cf01ebe632 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/plugin.properties +++ b/rse/plugins/org.eclipse.rse.processes.ui/plugin.properties @@ -20,6 +20,6 @@ pluginName = RSE Processes UI providerName = Eclipse.org -Factory.LocalProcesses = Local Processes +#Factory.LocalProcesses = Local Processes PropertyPage.ServerLauncherSettings = Server Launcher Settings PropertyPage.Service = Service diff --git a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF index 4b2ae017d37..33eaa2edc8e 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF @@ -21,6 +21,7 @@ Export-Package: org.eclipse.rse.dstore.universal.miners, org.eclipse.rse.services.dstore, org.eclipse.rse.services.dstore.files, org.eclipse.rse.services.dstore.processes, + org.eclipse.rse.services.dstore.rmtservice, org.eclipse.rse.services.dstore.search, org.eclipse.rse.services.dstore.shells, org.eclipse.rse.services.dstore.util diff --git a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF index 1aad0625c98..a9514243777 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF @@ -21,8 +21,10 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.core, org.eclipse.rse.ui Eclipse-LazyStart: true -Export-Package: org.eclipse.rse.internal.shells.ui.actions, - org.eclipse.rse.internal.shells.ui.propertypages, +Export-Package: org.eclipse.rse.internal.shells.ui;x-internal:=true, + org.eclipse.rse.internal.shells.ui.actions;x-internal:=true, + org.eclipse.rse.internal.shells.ui.propertypages;x-internal:=true, + org.eclipse.rse.internal.shells.ui.view;x-internal:=true, org.eclipse.rse.shells.ui, org.eclipse.rse.shells.ui.view Bundle-Vendor: %providerName diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF index 381494876fc..3b91d1fe23c 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF @@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.ui Eclipse-LazyStart: true Export-Package: org.eclipse.rse.internal.subsystems.files.core;x-internal:=true, + org.eclipse.rse.internal.subsystems.files.core.model;x-internal:=true, org.eclipse.rse.subsystems.files.core, org.eclipse.rse.subsystems.files.core.model, org.eclipse.rse.subsystems.files.core.servicesubsystem, diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF index 7074fb1daa6..fe6de5ce7b5 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.core, org.eclipse.rse.ui Eclipse-LazyStart: true -Export-Package: org.eclipse.rse.subsystems.files.dstore, +Export-Package: org.eclipse.rse.internal.subsystems.files.dstore;x-internal:=true, org.eclipse.rse.subsystems.files.dstore Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF index 75e7e415b2c..bbc25d33220 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF @@ -19,3 +19,5 @@ Require-Bundle: org.eclipse.ui, Eclipse-LazyStart: true Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Export-Package: org.eclipse.rse.internal.subsystems.processes.dstore;x-internal:=true, + org.eclipse.rse.subsystems.processes.dstore diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF index 3ff0bb68d16..95858daf4ba 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF @@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.ui, org.eclipse.rse.core Eclipse-LazyStart: true -Export-Package: org.eclipse.rse.internal.subsystems.shells.servicesubsystem;x-internal:=true, +Export-Package: org.eclipse.rse.internal.subsystems.shells.core;x-internal:=true, + org.eclipse.rse.internal.subsystems.shells.servicesubsystem;x-internal:=true, org.eclipse.rse.internal.subsystems.shells.subsystems;x-internal:=true, org.eclipse.rse.subsystems.shells.core.model, org.eclipse.rse.subsystems.shells.core.subsystems, diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF index 89b66482d8b..cbda900eafe 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF @@ -19,5 +19,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.subsystems.files.core Eclipse-LazyStart: true Bundle-Vendor: %providerName -Export-Package: org.eclipse.rse.subsystems.shells.dstore +Export-Package: org.eclipse.rse.internal.subsystems.shells.dstore;x-internal:=true, + org.eclipse.rse.subsystems.shells.dstore Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF index ed042ef6ff7..531a90b5350 100644 --- a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF @@ -27,11 +27,13 @@ Export-Package: org.eclipse.rse.core, org.eclipse.rse.internal.filters;x-internal:=true, org.eclipse.rse.internal.model;x-internal:=true, org.eclipse.rse.internal.ui;x-internal:=true, + org.eclipse.rse.internal.ui.actions;x-internal:=true, org.eclipse.rse.internal.ui.view;x-internal:=true, org.eclipse.rse.internal.ui.view.monitor;x-internal:=true, org.eclipse.rse.internal.ui.view.scratchpad;x-internal:=true, org.eclipse.rse.internal.ui.view.search;x-internal:=true, org.eclipse.rse.internal.ui.view.team;x-internal:=true, + org.eclipse.rse.internal.ui.widgets;x-internal:=true, org.eclipse.rse.model, org.eclipse.rse.ui, org.eclipse.rse.ui.actions, diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.properties b/rse/plugins/org.eclipse.rse.ui/plugin.properties index be8ba8e2bc3..012d4a2d500 100644 --- a/rse/plugins/org.eclipse.rse.ui/plugin.properties +++ b/rse/plugins/org.eclipse.rse.ui/plugin.properties @@ -58,9 +58,9 @@ PropertyPage.FilterString = Filter String PropertyPage.TeamViewCategoryNode = Category Information PropertyPage.Profile = Profile Information PropertyPage.TeamViewSubSystemFactoryNode = SubSystem Factory Information -PropertyPage.TeamViewUserActionNode = User Action Information -PropertyPage.TeamViewCompileTypeNode = Compile Type Information -PropertyPage.TeamViewCompileCommandNode = Compile Command Information +#PropertyPage.TeamViewUserActionNode = User Action Information +#PropertyPage.TeamViewCompileTypeNode = Compile Type Information +#PropertyPage.TeamViewCompileCommandNode = Compile Command Information View.Category.RemoteSystems = Remote Systems View.RemoteSystems = Remote Systems diff --git a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF index cccdf7b3a0d..276948b5a61 100644 --- a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF +++ b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF @@ -26,6 +26,13 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.4 Export-Package: org.eclipse.rse.tests, org.eclipse.rse.tests.core, org.eclipse.rse.tests.core.connection, + org.eclipse.rse.tests.core.registries, + org.eclipse.rse.tests.internal;x-internal:=true, + org.eclipse.rse.tests.internal.testsubsystem;x-internal:=true, + org.eclipse.rse.tests.persistence, + org.eclipse.rse.tests.preferences, + org.eclipse.rse.tests.subsystems.files, + org.eclipse.rse.tests.subsystems.testsubsystem, org.eclipse.rse.tests.testsubsystem, org.eclipse.rse.tests.testsubsystem.interfaces Bundle-ClassPath: rsetests.jar