Merge branch 'master' of ssh://git.eclipse.org/gitroot/eclipselink/examples
diff --git a/jpa-moxy/round-trip/.classpath b/jpa-moxy/jpa-moxy.simple/.classpath
similarity index 100%
rename from jpa-moxy/round-trip/.classpath
rename to jpa-moxy/jpa-moxy.simple/.classpath
diff --git a/jpa-moxy/round-trip/.project b/jpa-moxy/jpa-moxy.simple/.project
similarity index 94%
rename from jpa-moxy/round-trip/.project
rename to jpa-moxy/jpa-moxy.simple/.project
index 15966b8..2e45d43 100644
--- a/jpa-moxy/round-trip/.project
+++ b/jpa-moxy/jpa-moxy.simple/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>round-trip</name>
+ <name>jpa-moxy.simple</name>
<comment></comment>
<projects>
</projects>
diff --git a/jpa-moxy/round-trip/.settings/org.eclipse.core.resources.prefs b/jpa-moxy/jpa-moxy.simple/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from jpa-moxy/round-trip/.settings/org.eclipse.core.resources.prefs
rename to jpa-moxy/jpa-moxy.simple/.settings/org.eclipse.core.resources.prefs
diff --git a/jpa-moxy/round-trip/.settings/org.eclipse.jdt.core.prefs b/jpa-moxy/jpa-moxy.simple/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from jpa-moxy/round-trip/.settings/org.eclipse.jdt.core.prefs
rename to jpa-moxy/jpa-moxy.simple/.settings/org.eclipse.jdt.core.prefs
diff --git a/jpa-moxy/round-trip/.settings/org.eclipse.m2e.core.prefs b/jpa-moxy/jpa-moxy.simple/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from jpa-moxy/round-trip/.settings/org.eclipse.m2e.core.prefs
rename to jpa-moxy/jpa-moxy.simple/.settings/org.eclipse.m2e.core.prefs
diff --git a/jpa-moxy/round-trip/README.md b/jpa-moxy/jpa-moxy.simple/README.md
similarity index 96%
rename from jpa-moxy/round-trip/README.md
rename to jpa-moxy/jpa-moxy.simple/README.md
index 7a1525d..9453ec5 100644
--- a/jpa-moxy/round-trip/README.md
+++ b/jpa-moxy/jpa-moxy.simple/README.md
@@ -1,3 +1,6 @@
+Simple JPA-MOXY Example
+-----------------------
+
This example illustrates JPA-JAXB fidelity with EclipseLink JPA and MOXy:
It demonstrates the use of XmlInverseReference to manage the ManyToOne 'backpointer' of a ManyToOne relationship. EclipseLink MOXy will marshall a cyclical JPA entity graph to XML or JSON and upon unmarshall, will restore the backpointer.
diff --git a/jpa-moxy/round-trip/pom.xml b/jpa-moxy/jpa-moxy.simple/pom.xml
similarity index 98%
rename from jpa-moxy/round-trip/pom.xml
rename to jpa-moxy/jpa-moxy.simple/pom.xml
index 78beb4b..5b76f22 100644
--- a/jpa-moxy/round-trip/pom.xml
+++ b/jpa-moxy/jpa-moxy.simple/pom.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>eclipselink.example.jpa-moxy</groupId>
- <artifactId>round-trip</artifactId>
+ <artifactId>jpa-moxy.simple</artifactId>
<version>2.4.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/InitDB.java b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/InitDB.java
similarity index 85%
rename from jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/InitDB.java
rename to jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/InitDB.java
index 3b034a0..3c068af 100755
--- a/jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/InitDB.java
+++ b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/InitDB.java
@@ -1,4 +1,4 @@
-package eclipselink.example.jpamoxy.roundtrip;
+package eclipselink.example.jpamoxy.simple;
import java.util.HashMap;
import java.util.Map;
@@ -7,9 +7,9 @@
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
-import eclipselink.example.jpamoxy.roundtrip.model.Address;
-import eclipselink.example.jpamoxy.roundtrip.model.Customer;
-import eclipselink.example.jpamoxy.roundtrip.model.PhoneNumber;
+import eclipselink.example.jpamoxy.simple.model.Address;
+import eclipselink.example.jpamoxy.simple.model.Customer;
+import eclipselink.example.jpamoxy.simple.model.PhoneNumber;
public class InitDB {
diff --git a/jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/Marshall.java b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/Marshall.java
similarity index 91%
rename from jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/Marshall.java
rename to jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/Marshall.java
index 9c4956b..101d07d 100755
--- a/jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/Marshall.java
+++ b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/Marshall.java
@@ -1,4 +1,4 @@
-package eclipselink.example.jpamoxy.roundtrip;
+package eclipselink.example.jpamoxy.simple;
import java.io.File;
@@ -9,7 +9,7 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
-import eclipselink.example.jpamoxy.roundtrip.model.Customer;
+import eclipselink.example.jpamoxy.simple.model.Customer;
public class Marshall {
diff --git a/jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/Unmarshall.java b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/Unmarshall.java
similarity index 92%
rename from jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/Unmarshall.java
rename to jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/Unmarshall.java
index 5aba444..b1527e8 100755
--- a/jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/Unmarshall.java
+++ b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/Unmarshall.java
@@ -1,4 +1,4 @@
-package eclipselink.example.jpamoxy.roundtrip;
+package eclipselink.example.jpamoxy.simple;
import java.io.File;
@@ -11,7 +11,7 @@
import javax.xml.bind.Unmarshaller;
import javax.xml.transform.stream.StreamSource;
-import eclipselink.example.jpamoxy.roundtrip.model.Customer;
+import eclipselink.example.jpamoxy.simple.model.Customer;
public class Unmarshall {
diff --git a/jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/model/Address.java b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/Address.java
similarity index 94%
rename from jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/model/Address.java
rename to jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/Address.java
index 5343d00..c15757f 100755
--- a/jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/model/Address.java
+++ b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/Address.java
@@ -1,4 +1,4 @@
-package eclipselink.example.jpamoxy.roundtrip.model;
+package eclipselink.example.jpamoxy.simple.model;
import java.io.Serializable;
import javax.persistence.*;
diff --git a/jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/model/Customer.java b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/Customer.java
similarity index 97%
rename from jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/model/Customer.java
rename to jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/Customer.java
index a910ffb..77eaae2 100755
--- a/jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/model/Customer.java
+++ b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/Customer.java
@@ -1,4 +1,4 @@
-package eclipselink.example.jpamoxy.roundtrip.model;
+package eclipselink.example.jpamoxy.simple.model;
import static javax.persistence.CascadeType.*;
diff --git a/jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/model/PhoneNumber.java b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/PhoneNumber.java
similarity index 94%
rename from jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/model/PhoneNumber.java
rename to jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/PhoneNumber.java
index 0db0bf0..17425bf 100755
--- a/jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/model/PhoneNumber.java
+++ b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/PhoneNumber.java
@@ -1,4 +1,4 @@
-package eclipselink.example.jpamoxy.roundtrip.model;
+package eclipselink.example.jpamoxy.simple.model;
import java.io.Serializable;
import javax.persistence.*;
diff --git a/jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/model/jaxb.properties b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/jaxb.properties
similarity index 100%
rename from jpa-moxy/round-trip/src/main/java/eclipselink/example/jpamoxy/roundtrip/model/jaxb.properties
rename to jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/jaxb.properties
diff --git a/jpa-moxy/round-trip/src/main/resources/META-INF/persistence.xml b/jpa-moxy/jpa-moxy.simple/src/main/resources/META-INF/persistence.xml
similarity index 86%
rename from jpa-moxy/round-trip/src/main/resources/META-INF/persistence.xml
rename to jpa-moxy/jpa-moxy.simple/src/main/resources/META-INF/persistence.xml
index 6ce230e..e797656 100755
--- a/jpa-moxy/round-trip/src/main/resources/META-INF/persistence.xml
+++ b/jpa-moxy/jpa-moxy.simple/src/main/resources/META-INF/persistence.xml
@@ -2,9 +2,9 @@
<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="customer" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>eclipselink.example.jpamoxy.roundtrip.model.Address</class>
- <class>eclipselink.example.jpamoxy.roundtrip.model.Customer</class>
- <class>eclipselink.example.jpamoxy.roundtrip.model.PhoneNumber</class>
+ <class>eclipselink.example.jpamoxy.simple.model.Address</class>
+ <class>eclipselink.example.jpamoxy.simple.model.Customer</class>
+ <class>eclipselink.example.jpamoxy.simple.model.PhoneNumber</class>
<properties>
<property name="javax.persistence.jdbc.url" value="jdbc:derby:target/derby/test;create=true" />
<property name="javax.persistence.jdbc.user" value="app" />
