220226 - Support for EclipseLink JPA

2 files changed, 11 insertions, 17 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/META-INF/MANIFEST.MF
index 2326739765..db0fec6326 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.jpt.eclipselink.core.ddlgen;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-ClassPath: lib/persistence.jar
+Require-Bundle: org.eclipse.jpt.eclipselink.core;bundle-version="[1.0.0,2.0.0)"
 Export-Package: javax.persistence,
  javax.persistence.spi,
  org.eclipse.jpt.eclipselink.core.ddlgen
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/src/org/eclipse/jpt/eclipselink/core/ddlgen/Main.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/src/org/eclipse/jpt/eclipselink/core/ddlgen/Main.java
index bd7a7b0f40..46fd318176 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/src/org/eclipse/jpt/eclipselink/core/ddlgen/Main.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core.ddlgen/src/org/eclipse/jpt/eclipselink/core/ddlgen/Main.java
@@ -21,6 +21,8 @@ import java.util.Map.Entry;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
+import org.eclipse.jpt.eclipselink.core.internal.context.schema.generation.SchemaGeneration;
+
 /** 
  * This class creates a EclipseLink <code>EntityManagerFactory</code>, 
  * and executes the DDL generator with the command set in the properties: 
@@ -95,27 +97,18 @@ public class Main
 		this.eclipseLinkProperties = this.getProperties(this.eclipseLinkPropertiesPath);
 		
 		this.createDDLFileName = this.getConfigPropertyAsString( 
-						"eclipselink.create-ddl-jdbc-file-name",
+						SchemaGeneration.ECLIPSELINK_CREATE_FILE_NAME, 
 						this.eclipseLinkProperties,  
-						"createDDL.jdbc");
-//TODO	
-//					SchemaGeneration.ECLIPSELINK_CREATE_FILE_NAME, 
-//					this.eclipseLinkProperties,  
-//					SchemaGeneration.DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME);
-
-		this.dropDDLFileName = this.getConfigPropertyAsString( 
-						"eclipselink.drop-ddl-jdbc-file-name",
+						SchemaGeneration.DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME);
+
+		this.dropDDLFileName = this.getConfigPropertyAsString(
+						SchemaGeneration.ECLIPSELINK_DROP_FILE_NAME, 
 						this.eclipseLinkProperties,  
-						"dropDDL.jdbc");
-//TODO	
-//					SchemaGeneration.ECLIPSELINK_DROP_FILE_NAME, 
-//					this.eclipseLinkProperties,  
-//					SchemaGeneration.DEFAULT_SCHEMA_GENERATION_DROP_FILE_NAME);
+						SchemaGeneration.DEFAULT_SCHEMA_GENERATION_DROP_FILE_NAME); 
 		
 		this.appLocation = this.eclipseLinkProperties.get(
-						"eclipselink.application-location");
-//TODO	
-//					SchemaGeneration.ECLIPSELINK_APPLICATION_LOCATION);
+						SchemaGeneration.ECLIPSELINK_APPLICATION_LOCATION);
+
 		this.isDebugMode = this.getDebugMode(args);
 	}