220226 - Support for EclipseLink JPA

5 files changed, 7 insertions, 8 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/.classpath b/jpa/plugins/org.eclipse.jpt.eclipselink.core/.classpath
index d7e039696c..fb05e003fc 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/.classpath
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/.classpath
@@ -8,6 +8,5 @@
 			<accessrule kind="accessible" pattern="org/eclipse/jpt/utility/**"/>
 		</accessrules>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/persistence.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.eclipselink.core/META-INF/MANIFEST.MF
index 486f41899a..bb72c967ab 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.jpt.eclipselink.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin
@@ -25,4 +26,3 @@ Export-Package: org.eclipse.jpt.eclipselink.core.internal;x-friends:="org.eclips
  org.eclipse.jpt.eclipselink.core.internal.context.schema.generation,
  org.eclipse.jpt.eclipselink.core.internal.ddlgen
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %providerName
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/build.properties b/jpa/plugins/org.eclipse.jpt.eclipselink.core/build.properties
index 2c5d878a08..e9bdb6f945 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/build.properties
@@ -16,6 +16,5 @@ bin.includes = .,\
                META-INF/,\
                about.html,\
                plugin.xml,\
-               plugin.properties,\
-               lib/
+               plugin.properties
 jars.compile.order = .
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/lib/persistence.jar b/jpa/plugins/org.eclipse.jpt.eclipselink.core/lib/persistence.jar
deleted file mode 100644
index 1a1b232921..0000000000
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/lib/persistence.jar
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/ddlgen/EclipseLinkDDLGenerator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/ddlgen/EclipseLinkDDLGenerator.java
index 5ed12ac0f9..5206c1bb60 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/ddlgen/EclipseLinkDDLGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/ddlgen/EclipseLinkDDLGenerator.java
@@ -60,10 +60,11 @@ import org.eclipse.wst.validation.internal.operations.ValidatorJob;
  */
 public class EclipseLinkDDLGenerator
 {
+	static public String ECLIPSELINK_DDL_GEN_JAR_VERSION = "1.0.0";	//$NON-NLS-1$
 	static public String LAUNCH_CONFIG_NAME = "EclipseLink";   //$NON-NLS-1$
 	static public String DDL_GEN_PACKAGE_NAME = "org.eclipse.jpt.eclipselink.core.ddlgen";   //$NON-NLS-1$
 	static public String ECLIPSELINK_DDL_GEN_CLASS = DDL_GEN_PACKAGE_NAME + ".Main";	  //$NON-NLS-1$
-	static public String ECLIPSELINK_DDL_GEN_JAR = DDL_GEN_PACKAGE_NAME + ".jar";	//$NON-NLS-1$
+	static public String ECLIPSELINK_DDL_GEN_JAR = DDL_GEN_PACKAGE_NAME + "_" + ECLIPSELINK_DDL_GEN_JAR_VERSION + ".jar";	//$NON-NLS-1$
 	static public String PROPERTIES_FILE_NAME = "login.properties";	  //$NON-NLS-1$
 	static public String ECLIPSE_HOME = "ECLIPSE_HOME";	  //$NON-NLS-1$
 	static public String PLUGINS_DIR = "plugins";	  //$NON-NLS-1$
@@ -157,8 +158,8 @@ public class EclipseLinkDDLGenerator
 		
 		this.specifyProgramArguments(this.puName, propertiesFile); 
 		this.specifyWorkingDir(projectLocation); 
-		
-		this.specifyClasspathProperties(this.project, this.buildJdbcJarPath(), buildBootstrapJarPath());
+
+		this.specifyClasspathProperties(this.project, this.buildJdbcJarPath(), this.buildBootstrapJarPath());
 	}
 	
 	private void addLaunchListener() {
@@ -260,7 +261,7 @@ public class EclipseLinkDDLGenerator
 		
 		this.launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, programArguments.toString());
 	}
-	
+
 	private void specifyClasspathProperties(JpaProject project, IPath jdbcJar, IPath bootstrapJar) throws CoreException {
 		// DDL_GEN jar
 		IRuntimeClasspathEntry bootstrapEntry = JavaRuntime.newArchiveRuntimeClasspathEntry(bootstrapJar);