Small fixes to application.clj and supporting java code. Scripted PU deployed with JPA-RS access to metadata.
diff --git a/jpars.script.clojure/src/main/java/example/CreateDataService.java b/jpars.script.clojure/src/main/java/example/CreateDataService.java
index 85b34f9..f05c374 100644
--- a/jpars.script.clojure/src/main/java/example/CreateDataService.java
+++ b/jpars.script.clojure/src/main/java/example/CreateDataService.java
@@ -33,7 +33,7 @@
address.id("id", int.class, "P_ID", GenerationType.SEQUENCE.name());
address.basic("street", String.class, "NAME");
- pu.start(PersistenceUnitProperties.CREATE_OR_EXTEND);
+ pu.create("v1.0", PersistenceUnitProperties.CREATE_OR_EXTEND);
}
}
diff --git a/jpars.script.clojure/src/main/java/example/application.clj b/jpars.script.clojure/src/main/java/example/application.clj
index 051a47f..d446c8a 100644
--- a/jpars.script.clojure/src/main/java/example/application.clj
+++ b/jpars.script.clojure/src/main/java/example/application.clj
@@ -11,8 +11,6 @@
(.basic person "name", nil, "NAME")
)
- (.start pu "create-or-extend-tables"))
-
-; (example.CreateDataService/create "test-2")
+ (.create pu "v1" "create-or-extend-tables"))
)
diff --git a/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/EntityType.java b/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/EntityType.java
index 2fc7fa1..f54597c 100644
--- a/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/EntityType.java
+++ b/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/EntityType.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+ * which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * dclarke - initial
+ ******************************************************************************/
package org.eclipse.persistence.script;
import org.eclipse.persistence.dynamic.DynamicEntity;
diff --git a/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/PersistenceUnit.java b/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/PersistenceUnit.java
index cf91520..9dad433 100644
--- a/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/PersistenceUnit.java
+++ b/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/PersistenceUnit.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+ * which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * dclarke - initial
+ ******************************************************************************/
package org.eclipse.persistence.script;
import java.lang.reflect.Field;
@@ -108,14 +120,18 @@
getProperties().put(PersistenceUnitProperties.NON_JTA_DATASOURCE, dsName);
}
- public void start(String schemaGeneration) {
+ /**
+ * Launch the dynamic PU and make it available through the REST interface.
+ * @param schemaGeneration
+ */
+ public void create(String version, String schemaGeneration) {
DynamicType[] dynamicTypes = new DynamicType[getTypes().size()];
for (int index = 0; index < getTypes().size(); index++) {
dynamicTypes[index] = getTypes().get(index).getBuilder().getType();
}
// Create an entity manager factory.
- EntityManagerFactory emf = createEntityManagerFactory(getDynamicClassLoader());
+ EntityManagerFactory emf = createEntityManagerFactory(getDynamicClassLoader(), version);
// Create JPA Dynamic Helper (with the emf above) and after the types
// have been created and add the types through the helper.
@@ -133,7 +149,7 @@
}
}
- private EntityManagerFactory createEntityManagerFactory(DynamicClassLoader dcl) {
+ private EntityManagerFactory createEntityManagerFactory(DynamicClassLoader dcl, String version) {
Map<String, Object> props = new HashMap<String, Object>();
SEPersistenceUnitInfo info = new SEPersistenceUnitInfo();
info.setClassLoader(dcl);
@@ -165,7 +181,7 @@
EntityManagerFactoryImpl emf = new EntityManagerFactoryImpl(sessionImpl);
PersistenceFactoryBase factory = (PersistenceFactoryBase) getFactory(dcl);
- PersistenceContext bootstrapPersistenceContext = factory.bootstrapPersistenceContext(getName(), emf, null, "v1.0", true);
+ PersistenceContext bootstrapPersistenceContext = factory.bootstrapPersistenceContext(getName(), emf, null, version, true);
getDynamicPersistenceContexts(factory).put(getName(), bootstrapPersistenceContext);
