From c7234c5db76e0aeb9fb315840145e90354756fc1 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Mon, 19 Feb 2007 09:47:48 +0000
Subject: [PATCH] [cleanup] fix classpath warnings due to internal packages in
 tests

---
 rse/plugins/org.eclipse.rse.services.files.ftp/.classpath   | 6 +-----
 .../org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF | 2 +-
 rse/plugins/org.eclipse.rse.subsystems.files.ftp/.classpath | 6 +-----
 .../META-INF/MANIFEST.MF                                    | 2 +-
 rse/tests/org.eclipse.rse.tests/.classpath                  | 6 +-----
 5 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/.classpath b/rse/plugins/org.eclipse.rse.services.files.ftp/.classpath
index 7bdc3fd5675..ce73933404a 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/.classpath
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/.classpath
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="discouraged" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
index aa8f8990a1f..6933b58c62c 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.apache.commons.net,
  org.eclipse.rse.core
 Eclipse-LazyStart: true
-Export-Package: org.eclipse.rse.internal.services.files.ftp;x-friends:="org.eclipse.rse.subsystems.files.ftp"
+Export-Package: org.eclipse.rse.internal.services.files.ftp;x-friends:="org.eclipse.rse.subsystems.files.ftp,org.eclipse.rse.tests"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/.classpath b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/.classpath
index 7bdc3fd5675..ce73933404a 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/.classpath
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/.classpath
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="discouraged" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
index 960bb98abc5..312687fb5fd 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.ui,
  org.eclipse.ui.console
 Eclipse-LazyStart: true
-Export-Package: org.eclipse.rse.internal.subsystems.files.ftp;x-internal:=true,
+Export-Package: org.eclipse.rse.internal.subsystems.files.ftp;x-friends:="org.eclipse.rse.tests",
  org.eclipse.rse.internal.subsystems.files.ftp.connectorservice;x-internal:=true,
  org.eclipse.rse.internal.subsystems.files.ftp.model;x-internal:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/tests/org.eclipse.rse.tests/.classpath b/rse/tests/org.eclipse.rse.tests/.classpath
index 7bdc3fd5675..ce73933404a 100644
--- a/rse/tests/org.eclipse.rse.tests/.classpath
+++ b/rse/tests/org.eclipse.rse.tests/.classpath
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="discouraged" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>