Merge branch 'master' of ssh://git.eclipse.org/gitroot/eclipselink/examples
diff --git a/polyglot/client/src/main/java/example/CreateDatabase.java b/polyglot/client/src/main/java/example/CreateDatabase.java
index 34ca50d..87c09d0 100755
--- a/polyglot/client/src/main/java/example/CreateDatabase.java
+++ b/polyglot/client/src/main/java/example/CreateDatabase.java
@@ -27,7 +27,7 @@
properties.put("eclipselink.ddl-generation.output-mode", "database");
properties.put("eclipselink.logging.level", "FINE");
EntityManagerFactory emf = Persistence.createEntityManagerFactory(
- "RelationalPU", properties);
+ "relational-pu", properties);
// Creating an EntityManager will trigger database login
// and schema generation (because of the properties passed above)
EntityManager em = emf.createEntityManager();
diff --git a/polyglot/composite-pu/src/main/resources/META-INF/persistence.xml b/polyglot/composite-pu/src/main/resources/META-INF/persistence.xml
index 710ca8f..a65a04c 100755
--- a/polyglot/composite-pu/src/main/resources/META-INF/persistence.xml
+++ b/polyglot/composite-pu/src/main/resources/META-INF/persistence.xml
@@ -1,21 +1,19 @@
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd" version="1.0">
- <persistence-unit name="composite-pu" transaction-type="RESOURCE_LOCAL">
- <provider>
- org.eclipse.persistence.jpa.PersistenceProvider
- </provider>
-
- <jar-file>../../relational-pu/2.4.2-SNAPSHOT/relational-pu-2.4.2-SNAPSHOT.jar</jar-file>
- <jar-file>../../nosql-pu/2.4.2-SNAPSHOT/nosql-pu-2.4.2-SNAPSHOT.jar</jar-file>
-
- <properties>
- <property name="eclipselink.composite-unit" value="true"/>
- <property name="eclipselink.logging.level" value="FINE"/>
- <property name="eclipselink.logging.timestamp" value="false"/>
- <property name="eclipselink.logging.thread" value="false"/>
- <property name="eclipselink.logging.session" value="false"/>
- <property name="eclipselink.logging.exceptions" value="false"/>
- <property name="eclipselink.logging.connection" value="false"/>
- </properties>
- </persistence-unit>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd"
+ version="1.0">
+ <persistence-unit name="composite-pu" transaction-type="RESOURCE_LOCAL">
+ <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+ <jar-file>relational-pu.jar</jar-file>
+ <jar-file>nosql-pu.jar</jar-file>
+ <properties>
+ <property name="eclipselink.composite-unit" value="true" />
+ <property name="eclipselink.logging.level" value="FINE" />
+ <property name="eclipselink.logging.timestamp" value="false" />
+ <property name="eclipselink.logging.thread" value="false" />
+ <property name="eclipselink.logging.session" value="false" />
+ <property name="eclipselink.logging.exceptions" value="false" />
+ <property name="eclipselink.logging.connection" value="false" />
+ </properties>
+ </persistence-unit>
</persistence>
\ No newline at end of file
diff --git a/polyglot/nosql-pu/src/main/java/model/Order.java b/polyglot/nosql-pu/src/main/java/model/Order.java
index 5937468..bd01e20 100755
--- a/polyglot/nosql-pu/src/main/java/model/Order.java
+++ b/polyglot/nosql-pu/src/main/java/model/Order.java
@@ -35,7 +35,7 @@
/**
* Order, stored as a root JSON object, nesting its order lines in the same document.
- * @author James Sutherland, Shaun Smith
+ * @author James Sutherland
*/
@Entity
@NoSql(dataFormat=DataFormatType.MAPPED)
diff --git a/polyglot/nosql-pu/src/main/resources/META-INF/persistence.xml b/polyglot/nosql-pu/src/main/resources/META-INF/persistence.xml
index bc8806d..4270b0d 100755
--- a/polyglot/nosql-pu/src/main/resources/META-INF/persistence.xml
+++ b/polyglot/nosql-pu/src/main/resources/META-INF/persistence.xml
@@ -1,23 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
- <persistence-unit name="mongo" transaction-type="RESOURCE_LOCAL">
- <class>model.Order</class>
- <class>model.OrderLine</class>
- <class>model.Address</class>
- <class>model.Customer</class>
- <properties>
- <property name="eclipselink.target-database" value="org.eclipse.persistence.nosql.adapters.mongo.MongoPlatform"/>
- <property name="eclipselink.nosql.connection-spec" value="org.eclipse.persistence.nosql.adapters.mongo.MongoConnectionSpec"/>
- <property name="eclipselink.nosql.property.mongo.port" value="27017"/>
- <property name="eclipselink.nosql.property.mongo.host" value="localhost"/>
- <property name="eclipselink.nosql.property.mongo.db" value="polyglot"/>
- <property name="eclipselink.logging.level" value="FINEST"/>
- <property name="eclipselink.logging.timestamp" value="false"/>
- <property name="eclipselink.logging.thread" value="false"/>
- <property name="eclipselink.logging.session" value="false"/>
- <property name="eclipselink.logging.exceptions" value="false"/>
- <property name="eclipselink.logging.connection" value="false"/>
- <property name="eclipselink.composite-unit.member" value="true"/>
- </properties>
- </persistence-unit>
+<persistence version="2.0"
+ xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ <persistence-unit name="nosql-pu" transaction-type="RESOURCE_LOCAL">
+ <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+ <class>model.Order</class>
+ <class>model.OrderLine</class>
+ <class>model.Address</class>
+ <class>model.Customer</class>
+ <properties>
+ <property name="eclipselink.target-database"
+ value="org.eclipse.persistence.nosql.adapters.mongo.MongoPlatform" />
+ <property name="eclipselink.nosql.connection-spec"
+ value="org.eclipse.persistence.nosql.adapters.mongo.MongoConnectionSpec" />
+ <property name="eclipselink.nosql.property.mongo.port"
+ value="27017" />
+ <property name="eclipselink.nosql.property.mongo.host"
+ value="localhost" />
+ <property name="eclipselink.nosql.property.mongo.db" value="polyglot" />
+ <property name="eclipselink.logging.level" value="FINEST" />
+ <property name="eclipselink.logging.timestamp" value="false" />
+ <property name="eclipselink.logging.thread" value="false" />
+ <property name="eclipselink.logging.session" value="false" />
+ <property name="eclipselink.logging.exceptions" value="false" />
+ <property name="eclipselink.logging.connection" value="false" />
+ <property name="eclipselink.composite-unit.member" value="true" />
+ </properties>
+ </persistence-unit>
</persistence>
diff --git a/polyglot/relational-pu/src/main/resources/META-INF/persistence.xml b/polyglot/relational-pu/src/main/resources/META-INF/persistence.xml
index 6f8053a..c425e07 100755
--- a/polyglot/relational-pu/src/main/resources/META-INF/persistence.xml
+++ b/polyglot/relational-pu/src/main/resources/META-INF/persistence.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
- <persistence-unit name="RelationalPU" transaction-type="RESOURCE_LOCAL">
+ <persistence-unit name="relational-pu" transaction-type="RESOURCE_LOCAL">
+ <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
<class>relational.model.Product</class>
<class>relational.model.Discount</class>
<properties>
