From cf90e3c2e751aa6303d78407b254678cad49fe6e Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Tue, 3 Apr 2007 08:40:38 +0000 Subject: [PATCH] [cleanup] organize Manifests: export internal packages with x-internal --- .../org.eclipse.rse.core/META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 17 ++++++++++------- .../services/dstore/shells/DStoreHostShell.java | 2 -- .../DStoreShellOutputReader.java | 3 +-- .../{shell => shells}/DStoreShellThread.java | 2 +- .../dstore/DStoreServiceCommandShell.java | 2 +- .../org.eclipse.rse.ui/META-INF/MANIFEST.MF | 1 + 7 files changed, 15 insertions(+), 13 deletions(-) rename rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/{shell => shells}/DStoreShellOutputReader.java (97%) rename rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/{shell => shells}/DStoreShellThread.java (99%) diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF index 2e8c1cdfc86..14e05879f44 100644 --- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF @@ -16,6 +16,7 @@ Export-Package: org.eclipse.rse.core, org.eclipse.rse.core.subsystems, org.eclipse.rse.internal.core;x-internal:=true, org.eclipse.rse.internal.core.filters;x-internal:=true, + org.eclipse.rse.internal.core.model;x-internal:=true, org.eclipse.rse.internal.core.subsystems;x-internal:=true, org.eclipse.rse.internal.logging;x-internal:=true, org.eclipse.rse.internal.persistence;x-internal:=true, 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 0351c0e7d57..5524ca7a2bc 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 @@ -16,13 +16,16 @@ Export-Package: org.eclipse.rse.dstore.universal.miners, org.eclipse.rse.dstore.universal.miners.environment, org.eclipse.rse.dstore.universal.miners.filesystem, org.eclipse.rse.dstore.universal.miners.processes, - org.eclipse.rse.internal.dstore.universal.miners.command.patterns, - org.eclipse.rse.internal.services.dstore.files, - org.eclipse.rse.internal.services.dstore.processes, - org.eclipse.rse.internal.services.dstore.rmtservice, - org.eclipse.rse.internal.services.dstore.search, - org.eclipse.rse.internal.services.dstore.shell;x-internal:=true, - org.eclipse.rse.internal.services.dstore.shells, + org.eclipse.rse.internal.dstore.universal.miners.command;x-internal:=true, + org.eclipse.rse.internal.dstore.universal.miners.command.patterns;x-internal:=true, + org.eclipse.rse.internal.dstore.universal.miners.filesystem;x-internal:=true, + org.eclipse.rse.internal.dstore.universal.miners.processes;x-internal:=true, + org.eclipse.rse.internal.services.dstore;x-internal:=true, + org.eclipse.rse.internal.services.dstore.files;x-internal:=true, + org.eclipse.rse.internal.services.dstore.processes;x-internal:=true, + org.eclipse.rse.internal.services.dstore.rmtservice;x-internal:=true, + org.eclipse.rse.internal.services.dstore.search;x-internal:=true, + org.eclipse.rse.internal.services.dstore.shells;x-internal:=true, org.eclipse.rse.services.dstore, org.eclipse.rse.services.dstore.util Bundle-Vendor: %providerName diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostShell.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostShell.java index 3433d6f9d83..2498d3a0fba 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostShell.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostShell.java @@ -18,8 +18,6 @@ package org.eclipse.rse.internal.services.dstore.shells; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; -import org.eclipse.rse.internal.services.dstore.shell.DStoreShellOutputReader; -import org.eclipse.rse.internal.services.dstore.shell.DStoreShellThread; import org.eclipse.rse.services.dstore.util.DStoreStatusMonitor; import org.eclipse.rse.services.shells.AbstractHostShell; import org.eclipse.rse.services.shells.IHostShell; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shell/DStoreShellOutputReader.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellOutputReader.java similarity index 97% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shell/DStoreShellOutputReader.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellOutputReader.java index 7041487c1bb..0892cefa84d 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shell/DStoreShellOutputReader.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellOutputReader.java @@ -14,12 +14,11 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.services.dstore.shell; +package org.eclipse.rse.internal.services.dstore.shells; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.extra.DomainEvent; import org.eclipse.dstore.extra.IDomainListener; -import org.eclipse.rse.internal.services.dstore.shells.DStoreHostOutput; import org.eclipse.rse.services.shells.AbstractHostShellOutputReader; import org.eclipse.rse.services.shells.IHostOutput; import org.eclipse.rse.services.shells.IHostShell; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shell/DStoreShellThread.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellThread.java similarity index 99% rename from rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shell/DStoreShellThread.java rename to rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellThread.java index 67f5b7d687b..a17c86ff16a 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shell/DStoreShellThread.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellThread.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.internal.services.dstore.shell; +package org.eclipse.rse.internal.services.dstore.shells; import java.io.File; diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/DStoreServiceCommandShell.java b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/DStoreServiceCommandShell.java index 3e52123bee4..ed50ff74fb5 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/DStoreServiceCommandShell.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/DStoreServiceCommandShell.java @@ -17,9 +17,9 @@ package org.eclipse.rse.internal.subsystems.shells.dstore; import org.eclipse.dstore.core.model.DataElement; -import org.eclipse.rse.internal.services.dstore.shell.DStoreShellOutputReader; import org.eclipse.rse.internal.services.dstore.shells.DStoreHostOutput; import org.eclipse.rse.internal.services.dstore.shells.DStoreHostShell; +import org.eclipse.rse.internal.services.dstore.shells.DStoreShellOutputReader; import org.eclipse.rse.internal.subsystems.shells.servicesubsystem.OutputRefreshJob; import org.eclipse.rse.services.shells.IHostOutput; import org.eclipse.rse.services.shells.IHostShell; 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 fb99564205b..6f022d0498f 100644 --- a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF @@ -30,6 +30,7 @@ Export-Package: org.eclipse.rse.core, org.eclipse.rse.internal.ui.filters.dialogs;x-internal:=true, org.eclipse.rse.internal.ui.logging;x-internal:=true, org.eclipse.rse.internal.ui.propertypages;x-internal:=true, + org.eclipse.rse.internal.ui.subsystems;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,