more x-friend/access rules clean-up

5 files changed, 79 insertions, 53 deletions

diff --git a/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF
index 56ca77aebc..b09f0314cc 100644
--- a/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF
@@ -26,14 +26,14 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)"
+Dali-Comment: We friend 'utility' to all non-EclipseLink, non-test bundles
 Export-Package: org.eclipse.jpt.common.core,
  org.eclipse.jpt.common.core.internal;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.jaxb.core",
  org.eclipse.jpt.common.core.internal.gen;
   x-friends:="org.eclipse.jpt.jpa.core,
-   org.eclipse.jpt.jaxb.core,
-   org.eclipse.jpt.dbws.eclipselink.ui",
+   org.eclipse.jpt.jaxb.core",
  org.eclipse.jpt.common.core.internal.libprov;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.jaxb.core",
@@ -48,8 +48,6 @@ Export-Package: org.eclipse.jpt.common.core,
    org.eclipse.jpt.jaxb.core",
  org.eclipse.jpt.common.core.internal.utility;
   x-friends:="org.eclipse.jpt.common.ui,
-   org.eclipse.jpt.common.eclipselink.core,
-   org.eclipse.jpt.dbws.eclipselink.ui,
    org.eclipse.jpt.jaxb.core,
    org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.core,
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/.classpath b/common/plugins/org.eclipse.jpt.common.eclipselink.core/.classpath
index 8f257414e6..ef7cc06313 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/.classpath
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/.classpath
@@ -3,6 +3,10 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="property_files"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/jpt/common/utility/**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.eclipselink.core/META-INF/MANIFEST.MF
index 3310d95d93..4530770e8c 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/META-INF/MANIFEST.MF
@@ -14,5 +14,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.jpt.common.utility;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.200,2.0.0)"
 Export-Package: org.eclipse.jpt.common.eclipselink.core,
- org.eclipse.jpt.common.eclipselink.core.internal;x-friends:="org.eclipse.jpt.jpa.eclipselink.core",
- org.eclipse.jpt.common.eclipselink.core.internal.libval;x-friends:="org.eclipse.jpt.jpa.eclipselink.core"
+ org.eclipse.jpt.common.eclipselink.core.internal;
+  x-friends:="org.eclipse.jpt.jpa.eclipselink.core,
+   org.eclipse.jpt.jaxb.eclipselink.core",
+ org.eclipse.jpt.common.eclipselink.core.internal.libval;
+  x-friends:="org.eclipse.jpt.jpa.eclipselink.core,
+   org.eclipse.jpt.jaxb.eclipselink.core"
diff --git a/common/plugins/org.eclipse.jpt.common.ui/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.ui/META-INF/MANIFEST.MF
index 094fd231a8..f804cd4689 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.ui/META-INF/MANIFEST.MF
@@ -23,16 +23,47 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui.navigator;bundle-version="[3.3.100,4.0.0)",
  org.eclipse.ui.views.properties.tabbed;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)"
+Dali-Comment: *NO* EclipseLink friends!
 Export-Package: org.eclipse.jpt.common.ui,
- org.eclipse.jpt.common.ui.internal;x-friends:="org.eclipse.jpt.dbws.eclipselink.ui,org.eclipse.jpt.jaxb.ui,org.eclipse.jpt.jpa.ui",
- org.eclipse.jpt.common.ui.internal.jface;x-friends:="org.eclipse.jpt.dbws.eclipselink.ui,org.eclipse.jpt.jaxb.ui,org.eclipse.jpt.jpa.ui",
- org.eclipse.jpt.common.ui.internal.listeners;x-friends:="org.eclipse.jpt.dbws.eclipselink.ui,org.eclipse.jpt.jaxb.ui,org.eclipse.jpt.jpa.ui",
- org.eclipse.jpt.common.ui.internal.properties;x-friends:="org.eclipse.jpt.dbws.eclipselink.ui,org.eclipse.jpt.jaxb.ui,org.eclipse.jpt.jpa.ui",
- org.eclipse.jpt.common.ui.internal.swt;x-friends:="org.eclipse.jpt.dbws.eclipselink.ui,org.eclipse.jpt.jaxb.ui,org.eclipse.jpt.jpa.ui",
- org.eclipse.jpt.common.ui.internal.util;x-friends:="org.eclipse.jpt.dbws.eclipselink.ui,org.eclipse.jpt.jaxb.ui,org.eclipse.jpt.jpa.ui",
- org.eclipse.jpt.common.ui.internal.utility;x-friends:="org.eclipse.jpt.dbws.eclipselink.ui,org.eclipse.jpt.jaxb.ui,org.eclipse.jpt.jpa.ui",
- org.eclipse.jpt.common.ui.internal.utility.swt;x-friends:="org.eclipse.jpt.dbws.eclipselink.ui,org.eclipse.jpt.jaxb.ui,org.eclipse.jpt.jpa.ui",
- org.eclipse.jpt.common.ui.internal.widgets;x-friends:="org.eclipse.jpt.dbws.eclipselink.ui,org.eclipse.jpt.jaxb.ui,org.eclipse.jpt.jpa.ui",
- org.eclipse.jpt.common.ui.internal.wizards;x-friends:="org.eclipse.jpt.dbws.eclipselink.ui,org.eclipse.jpt.jaxb.ui,org.eclipse.jpt.jpa.ui",
+ org.eclipse.jpt.common.ui.internal;
+  x-friends:="org.eclipse.jpt.jaxb.ui,
+   org.eclipse.jpt.jpa.db.ui,
+   org.eclipse.jpt.jpa.ui",
+ org.eclipse.jpt.common.ui.internal.jface;
+  x-friends:="org.eclipse.jpt.jaxb.ui,
+   org.eclipse.jpt.jpa.db.ui,
+   org.eclipse.jpt.jpa.ui",
+ org.eclipse.jpt.common.ui.internal.listeners;
+  x-friends:="org.eclipse.jpt.jaxb.ui,
+   org.eclipse.jpt.jpa.db.ui,
+   org.eclipse.jpt.jpa.ui",
+ org.eclipse.jpt.common.ui.internal.properties;
+  x-friends:="org.eclipse.jpt.jaxb.ui,
+   org.eclipse.jpt.jpa.db.ui,
+   org.eclipse.jpt.jpa.ui",
+ org.eclipse.jpt.common.ui.internal.swt;
+  x-friends:="org.eclipse.jpt.jaxb.ui,
+   org.eclipse.jpt.jpa.db.ui,
+   org.eclipse.jpt.jpa.ui",
+ org.eclipse.jpt.common.ui.internal.util;
+  x-friends:="org.eclipse.jpt.jaxb.ui,
+   org.eclipse.jpt.jpa.db.ui,
+   org.eclipse.jpt.jpa.ui",
+ org.eclipse.jpt.common.ui.internal.utility;
+  x-friends:="org.eclipse.jpt.jaxb.ui,
+   org.eclipse.jpt.jpa.db.ui,
+   org.eclipse.jpt.jpa.ui",
+ org.eclipse.jpt.common.ui.internal.utility.swt;
+  x-friends:="org.eclipse.jpt.jaxb.ui,
+   org.eclipse.jpt.jpa.db.ui,
+   org.eclipse.jpt.jpa.ui",
+ org.eclipse.jpt.common.ui.internal.widgets;
+  x-friends:="org.eclipse.jpt.jaxb.ui,
+   org.eclipse.jpt.jpa.db.ui,
+   org.eclipse.jpt.jpa.ui",
+ org.eclipse.jpt.common.ui.internal.wizards;
+  x-friends:="org.eclipse.jpt.jaxb.ui,
+   org.eclipse.jpt.jpa.db.ui,
+   org.eclipse.jpt.jpa.ui",
  org.eclipse.jpt.common.ui.jface
 Import-Package: com.ibm.icu.text;version="4.0.1"
diff --git a/common/plugins/org.eclipse.jpt.common.utility/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.utility/META-INF/MANIFEST.MF
index fa003f2b9f..e06b5cb959 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.utility/META-INF/MANIFEST.MF
@@ -6,151 +6,140 @@ Bundle-SymbolicName: org.eclipse.jpt.common.utility
 Bundle-Version: 2.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Dali-Comment: *NO* EclipseLink friends!
 Export-Package: org.eclipse.jpt.common.utility,
  org.eclipse.jpt.common.utility.internal;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.common.core,
    org.eclipse.jpt.common.ui,
-   org.eclipse.jpt.common.eclipselink.core,
-   org.eclipse.jpt.dbws.eclipselink.ui,
    org.eclipse.jpt.jaxb.core,
    org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.gen,
-   org.eclipse.jpt.jpa.ui",
+   org.eclipse.jpt.jpa.ui,
+   org.eclipse.jpt.jaxb.core.schemagen",
  org.eclipse.jpt.common.utility.internal.enumerations;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.common.core,
    org.eclipse.jpt.common.ui,
-   org.eclipse.jpt.common.eclipselink.core,
-   org.eclipse.jpt.dbws.eclipselink.ui,
    org.eclipse.jpt.jaxb.core,
    org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.gen,
-   org.eclipse.jpt.jpa.ui",
+   org.eclipse.jpt.jpa.ui,
+   org.eclipse.jpt.jaxb.core.schemagen",
  org.eclipse.jpt.common.utility.internal.iterables;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.common.core,
    org.eclipse.jpt.common.ui,
-   org.eclipse.jpt.common.eclipselink.core,
-   org.eclipse.jpt.dbws.eclipselink.ui,
    org.eclipse.jpt.jaxb.core,
    org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.gen,
-   org.eclipse.jpt.jpa.ui",
+   org.eclipse.jpt.jpa.ui,
+   org.eclipse.jpt.jaxb.core.schemagen",
  org.eclipse.jpt.common.utility.internal.iterators;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.common.core,
    org.eclipse.jpt.common.ui,
-   org.eclipse.jpt.common.eclipselink.core,
-   org.eclipse.jpt.dbws.eclipselink.ui,
    org.eclipse.jpt.jaxb.core,
    org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.gen,
-   org.eclipse.jpt.jpa.ui",
+   org.eclipse.jpt.jpa.ui,
+   org.eclipse.jpt.jaxb.core.schemagen",
  org.eclipse.jpt.common.utility.internal.model;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.common.core,
    org.eclipse.jpt.common.ui,
-   org.eclipse.jpt.common.eclipselink.core,
-   org.eclipse.jpt.dbws.eclipselink.ui,
    org.eclipse.jpt.jaxb.core,
    org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.gen,
-   org.eclipse.jpt.jpa.ui",
+   org.eclipse.jpt.jpa.ui,
+   org.eclipse.jpt.jaxb.core.schemagen",
  org.eclipse.jpt.common.utility.internal.model.listener.awt;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.common.core,
    org.eclipse.jpt.common.ui,
-   org.eclipse.jpt.common.eclipselink.core,
-   org.eclipse.jpt.dbws.eclipselink.ui,
    org.eclipse.jpt.jaxb.core,
    org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.gen,
-   org.eclipse.jpt.jpa.ui",
+   org.eclipse.jpt.jpa.ui,
+   org.eclipse.jpt.jaxb.core.schemagen",
  org.eclipse.jpt.common.utility.internal.model.value;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.common.core,
    org.eclipse.jpt.common.ui,
-   org.eclipse.jpt.common.eclipselink.core,
-   org.eclipse.jpt.dbws.eclipselink.ui,
    org.eclipse.jpt.jaxb.core,
    org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.gen,
-   org.eclipse.jpt.jpa.ui",
+   org.eclipse.jpt.jpa.ui,
+   org.eclipse.jpt.jaxb.core.schemagen",
  org.eclipse.jpt.common.utility.internal.model.value.prefs;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.common.core,
    org.eclipse.jpt.common.ui,
-   org.eclipse.jpt.common.eclipselink.core,
-   org.eclipse.jpt.dbws.eclipselink.ui,
    org.eclipse.jpt.jaxb.core,
    org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.gen,
-   org.eclipse.jpt.jpa.ui",
+   org.eclipse.jpt.jpa.ui,
+   org.eclipse.jpt.jaxb.core.schemagen",
  org.eclipse.jpt.common.utility.internal.model.value.swing;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.common.core,
    org.eclipse.jpt.common.ui,
-   org.eclipse.jpt.common.eclipselink.core,
-   org.eclipse.jpt.dbws.eclipselink.ui,
    org.eclipse.jpt.jaxb.core,
    org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.gen,
-   org.eclipse.jpt.jpa.ui",
+   org.eclipse.jpt.jpa.ui,
+   org.eclipse.jpt.jaxb.core.schemagen",
  org.eclipse.jpt.common.utility.internal.node;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.common.core,
    org.eclipse.jpt.common.ui,
-   org.eclipse.jpt.common.eclipselink.core,
-   org.eclipse.jpt.dbws.eclipselink.ui,
    org.eclipse.jpt.jaxb.core,
    org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.gen,
-   org.eclipse.jpt.jpa.ui",
+   org.eclipse.jpt.jpa.ui,
+   org.eclipse.jpt.jaxb.core.schemagen",
  org.eclipse.jpt.common.utility.internal.swing;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.common.core,
    org.eclipse.jpt.common.ui,
-   org.eclipse.jpt.common.eclipselink.core,
-   org.eclipse.jpt.dbws.eclipselink.ui,
    org.eclipse.jpt.jaxb.core,
    org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.gen,
-   org.eclipse.jpt.jpa.ui",
+   org.eclipse.jpt.jpa.ui,
+   org.eclipse.jpt.jaxb.core.schemagen",
  org.eclipse.jpt.common.utility.internal.synchronizers;
   x-friends:="org.eclipse.jpt.jpa.core,
    org.eclipse.jpt.common.core,
    org.eclipse.jpt.common.ui,
-   org.eclipse.jpt.common.eclipselink.core,
-   org.eclipse.jpt.dbws.eclipselink.ui,
    org.eclipse.jpt.jaxb.core,
    org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.gen,
-   org.eclipse.jpt.jpa.ui",
+   org.eclipse.jpt.jpa.ui,
+   org.eclipse.jpt.jaxb.core.schemagen",
  org.eclipse.jpt.common.utility.model,
  org.eclipse.jpt.common.utility.model.event,
  org.eclipse.jpt.common.utility.model.listener,