diff options
21 files changed, 128 insertions, 99 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, diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/.classpath b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/.classpath index ad32c83a78..64c5e31b7a 100644 --- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/.classpath +++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <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="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/META-INF/MANIFEST.MF index 8e395f6bac..275cbd5c1b 100644 --- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/META-INF/MANIFEST.MF +++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/META-INF/MANIFEST.MF @@ -5,7 +5,8 @@ Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.jpt.dbws.eclipselink.core.gen;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.persistence.dbws.builder;bundle-version="[2.3.0,3.0.0)", javax.wsdl;bundle-version="[1.6.2,2.0.0)" -Export-Package: org.eclipse.jpt.dbws.eclipselink.core.gen +Export-Package: org.eclipse.jpt.dbws.eclipselink.core.gen, + org.eclipse.jpt.dbws.eclipselink.core.gen.internal;x-internal:=true diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/build.properties b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/build.properties index a00641b71c..75ea4d80e4 100644 --- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/build.properties +++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/build.properties @@ -8,8 +8,8 @@ # Contributors: # Oracle. - initial API and implementation ############################################################################### -javacSource=1.6 -javacTarget=1.6 +javacSource=1.5 +javacTarget=1.5 source.. = src/ output.. = bin/ bin.includes = .,\ diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/.classpath b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/.classpath index 958e1de112..76f5da81fa 100644 --- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/.classpath +++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/.classpath @@ -2,7 +2,14 @@ <classpath> <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/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <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"> + <accessrules> + <accessrule kind="accessible" pattern="org/eclipse/jpt/common/ui/**"/> + <accessrule kind="accessible" pattern="org/eclipse/jpt/common/utility/**"/> + <accessrule kind="accessible" pattern="org/eclipse/jst/**"/> + <accessrule kind="accessible" pattern="org/eclipse/wst/**"/> + </accessrules> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.core/META-INF/MANIFEST.MF index 893cd60200..8085c48648 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/META-INF/MANIFEST.MF +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/META-INF/MANIFEST.MF @@ -33,12 +33,12 @@ Export-Package: org.eclipse.jpt.jaxb.core, org.eclipse.jpt.jaxb.core.internal.context;x-internal:=true, org.eclipse.jpt.jaxb.core.internal.context.java;x-internal:=true, org.eclipse.jpt.jaxb.core.internal.facet;x-internal:=true, - org.eclipse.jpt.jaxb.core.internal.gen;x-friends:="org.eclipse.jpt.jaxb.ui", + org.eclipse.jpt.jaxb.core.internal.gen;x-internal:=true, org.eclipse.jpt.jaxb.core.internal.jaxb21;x-internal:=true, org.eclipse.jpt.jaxb.core.internal.jaxb22;x-internal:=true, org.eclipse.jpt.jaxb.core.internal.libprov;x-internal:=true, org.eclipse.jpt.jaxb.core.internal.libval;x-internal:=true, - org.eclipse.jpt.jaxb.core.internal.operations;x-friends:="org.eclipse.jpt.jaxb.ui", + org.eclipse.jpt.jaxb.core.internal.operations;x-internal:=true, org.eclipse.jpt.jaxb.core.internal.platform;x-internal:=true, org.eclipse.jpt.jaxb.core.internal.resource.java;x-internal:=true, org.eclipse.jpt.jaxb.core.internal.resource.java.binary;x-internal:=true, diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/.classpath b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/.classpath index 587d7eb60e..4ac7ebdea3 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/.classpath +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/.classpath @@ -4,10 +4,9 @@ <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"> <accessrules> + <accessrule kind="accessible" pattern="org/eclipse/jpt/jaxb/core/**"/> <accessrule kind="accessible" pattern="org/eclipse/jpt/common/core/**"/> - <accessrule kind="accessible" pattern="org/eclipse/jpt/common/eclipselink/core/**"/> <accessrule kind="accessible" pattern="org/eclipse/jpt/common/utility/**"/> - <accessrule kind="accessible" pattern="org/eclipse/jpt/jaxb/core/**"/> <accessrule kind="accessible" pattern="org/eclipse/wst/**"/> </accessrules> </classpathentry> diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF index 804d5ae6af..821cb8ba2e 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.200,2.0.0)", org.eclipse.jst.j2ee;bundle-version="[1.1.500,2.0.0)" Export-Package: org.eclipse.jpt.jaxb.eclipselink.core, - org.eclipse.jpt.jaxb.eclipselink.core.internal.libval, - org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_1, - org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2, - org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_3 + org.eclipse.jpt.jaxb.eclipselink.core.internal.libval;x-internal:=true, + org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_1;x-internal:=true, + org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2;x-internal:=true, + org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_3;x-internal:=true diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/.classpath b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/.classpath index c365bee0b5..783ee1e9ed 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/.classpath +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/.classpath @@ -4,12 +4,9 @@ <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"> <accessrules> - <accessrule kind="accessible" pattern="org/eclipse/jpt/common/eclipselink/core/**"/> - <accessrule kind="accessible" pattern="org/eclipse/jpt/common/utility/**"/> - <accessrule kind="accessible" pattern="org/eclipse/jpt/common/ui/**"/> - <accessrule kind="accessible" pattern="org/eclipse/jpt/jaxb/core/**"/> - <accessrule kind="accessible" pattern="org/eclipse/jpt/jaxb/eclipselink/core/**"/> <accessrule kind="accessible" pattern="org/eclipse/jpt/jaxb/ui/**"/> + <accessrule kind="accessible" pattern="org/eclipse/jpt/common/ui/**"/> + <accessrule kind="accessible" pattern="org/eclipse/jpt/common/utility/**"/> </accessrules> </classpathentry> <classpathentry kind="output" path="bin"/> diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF index c11ee115df..31eeef31b8 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF @@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.jpt.jaxb.ui;bundle-version="[1.1.0,2.0.0)", org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)" Export-Package: org.eclipse.jpt.jaxb.eclipselink.ui, - org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_1, - org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_2, - org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_3 + org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_1;x-internal:=true, + org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_2;x-internal:=true, + org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_3;x-internal:=true diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.classpath b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.classpath index 431697a3b2..76131ca132 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.classpath +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <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"> <accessrules> <accessrule kind="accessible" pattern="org/eclipse/jpt/jaxb/core/**"/> diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/build.properties b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/build.properties index 08cd61be5f..320b3f239d 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/build.properties +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/build.properties @@ -7,8 +7,8 @@ # Contributors: # Oracle - initial API and implementation ################################################################################ -javacSource = 1.6 -javacTarget = 1.6 +javacSource = 1.5 +javacTarget = 1.5 bin.includes = .,\ META-INF/,\ about.html,\ diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/.classpath b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/.classpath index 786c6eaa79..0a1e4900fd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/.classpath +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/.classpath @@ -6,7 +6,6 @@ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <accessrules> <accessrule kind="accessible" pattern="org/eclipse/jpt/jpa/ui/**"/> - <accessrule kind="accessible" pattern="org/eclipse/jpt/jpa/core/**"/> <accessrule kind="accessible" pattern="org/eclipse/jpt/common/ui/**"/> <accessrule kind="accessible" pattern="org/eclipse/jpt/common/utility/**"/> </accessrules> diff --git a/jpa/plugins/org.eclipse.jpt.jpa.gen/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.gen/META-INF/MANIFEST.MF index 26e63b9419..694bc5a5a4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.gen/META-INF/MANIFEST.MF +++ b/jpa/plugins/org.eclipse.jpt.jpa.gen/META-INF/MANIFEST.MF @@ -6,8 +6,8 @@ Bundle-SymbolicName: org.eclipse.jpt.jpa.gen Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.jpt.jpa.gen.internal;x-friends:="org.eclipse.jpt.jpa.ui", - org.eclipse.jpt.jpa.gen.internal.util;x-friends:="org.eclipse.jpt.jpa.ui" +Export-Package: org.eclipse.jpt.jpa.gen.internal;x-internal:=true, + org.eclipse.jpt.jpa.gen.internal.util;x-internal:=true Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)", org.eclipse.jpt.common.utility;bundle-version="[2.0.0,3.0.0)", diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/.classpath b/jpa/plugins/org.eclipse.jpt.jpa.ui/.classpath index 83c0a39455..934fb38085 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/.classpath +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/.classpath @@ -2,7 +2,7 @@ <classpath> <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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <accessrules> <accessrule kind="accessible" pattern="org/eclipse/jst/**"/> diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/META-INF/MANIFEST.MF b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/META-INF/MANIFEST.MF index 14a16c1180..bcae287be2 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/META-INF/MANIFEST.MF +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/META-INF/MANIFEST.MF @@ -28,14 +28,16 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui.views.properties.tabbed;bundle-version="[3.4.0,4.0.0)", org.eclipse.wst.common.emf;bundle-version="[1.1.200,2.0.0)", org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)" -Export-Package: org.eclipse.jpt.jpadiagrameditor.ui.internal, - org.eclipse.jpt.jpadiagrameditor.ui.internal.dialog, - org.eclipse.jpt.jpadiagrameditor.ui.internal.feature, - org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n, - org.eclipse.jpt.jpadiagrameditor.ui.internal.modelintegration.ui, - org.eclipse.jpt.jpadiagrameditor.ui.internal.modelintegration.util, - org.eclipse.jpt.jpadiagrameditor.ui.internal.preferences, - org.eclipse.jpt.jpadiagrameditor.ui.internal.propertypage, - org.eclipse.jpt.jpadiagrameditor.ui.internal.provider, - org.eclipse.jpt.jpadiagrameditor.ui.internal.relations, - org.eclipse.jpt.jpadiagrameditor.ui.internal.util +Export-Package: org.eclipse.jpt.jpadiagrameditor.ui.internal;x-internal:=true, + org.eclipse.jpt.jpadiagrameditor.ui.internal.dialog;x-internal:=true, + org.eclipse.jpt.jpadiagrameditor.ui.internal.facade;x-internal:=true, + org.eclipse.jpt.jpadiagrameditor.ui.internal.feature;x-internal:=true, + org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n;x-internal:=true, + org.eclipse.jpt.jpadiagrameditor.ui.internal.modelintegration.ui;x-internal:=true, + org.eclipse.jpt.jpadiagrameditor.ui.internal.modelintegration.util;x-internal:=true, + org.eclipse.jpt.jpadiagrameditor.ui.internal.preferences;x-internal:=true, + org.eclipse.jpt.jpadiagrameditor.ui.internal.propertypage;x-internal:=true, + org.eclipse.jpt.jpadiagrameditor.ui.internal.propertytester;x-internal:=true, + org.eclipse.jpt.jpadiagrameditor.ui.internal.provider;x-internal:=true, + org.eclipse.jpt.jpadiagrameditor.ui.internal.relations;x-internal:=true, + org.eclipse.jpt.jpadiagrameditor.ui.internal.util;x-internal:=true diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/.classpath b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/.classpath index 696bd754b7..4bf00ce327 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/.classpath +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/.classpath @@ -2,13 +2,11 @@ <classpath> <classpathentry kind="src" path="src"/> <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/core/**"/> + <accessrule kind="accessible" pattern="org/eclipse/jpt/jpadiagrameditor/ui/**"/> <accessrule kind="accessible" pattern="org/eclipse/jpt/common/utility/**"/> - <accessrule kind="accessible" pattern="org/eclipse/jpt/jpa/core/**"/> - <accessrule kind="accessible" pattern="org/eclipse/jpt/jpa/ui/**"/> - <accessrule kind="accessible" pattern="org/eclipse/wst/**"/> </accessrules> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath> |