Merge branch 'master' of ssh://git.eclipse.org/gitroot/eclipselink/examples
diff --git a/dbws/dbws.maven/README.md b/dbws/dbws.maven/README.md
index 4182ed3..25ccc1e 100644
--- a/dbws/dbws.maven/README.md
+++ b/dbws/dbws.maven/README.md
@@ -5,7 +5,7 @@
This pom.xml and its config.properties file simplifies this. Simply edit the config.properties file to match the version
and install location of the EclipseLink release and execute mvn.
-After this fas completed successfully other projects can reference these artifacts using:
+After this has completed successfully other projects can reference these artifacts using:
<dependency>
<groupId>org.eclipse.persistence</groupId>
diff --git a/dbws/dbws.maven/pom.xml b/dbws/dbws.maven/pom.xml
index 8db7267..908227e 100644
--- a/dbws/dbws.maven/pom.xml
+++ b/dbws/dbws.maven/pom.xml
@@ -61,7 +61,6 @@
<groupId>commonj.sdo</groupId>
</exclusion>
</exclusions>
- <scope>test</scope>
</dependency>
<dependency>
@@ -75,7 +74,6 @@
<groupId>org.eclipse.persistence</groupId>
<artifactId>dbws.builder</artifactId>
<version>${eclipselink.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
diff --git a/dbws/dbws.maven/src/main/java/org/eclipse/persistence/tools/dbws/MavenPackager.java b/dbws/dbws.maven/src/main/java/org/eclipse/persistence/tools/dbws/MavenPackager.java
index 419c94e..9781ce5 100644
--- a/dbws/dbws.maven/src/main/java/org/eclipse/persistence/tools/dbws/MavenPackager.java
+++ b/dbws/dbws.maven/src/main/java/org/eclipse/persistence/tools/dbws/MavenPackager.java
@@ -12,14 +12,59 @@
******************************************************************************/
package org.eclipse.persistence.tools.dbws;
+import static org.eclipse.persistence.internal.xr.Util.DBWS_OR_XML;
+import static org.eclipse.persistence.internal.xr.Util.DBWS_OX_XML;
+import static org.eclipse.persistence.internal.xr.Util.DBWS_SERVICE_XML;
import static org.eclipse.persistence.tools.dbws.DBWSPackager.ArchiveUse.noArchive;
-public class MavenPackager extends IDEPackager {
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+public class MavenPackager extends IDEPackager {
+ File resourceDir;
+ String resourceDirName;
+
public MavenPackager() {
super(null, "maven", noArchive);
srcDirname = "java";
publicHTMLDirname = "webapp";
+ resourceDirName = "META-INF";
+ }
+
+ protected void buildResourceDir() throws FileNotFoundException {
+ buildSrcDir();
+ resourceDir = new File(srcDir, resourceDirName);
+ if (!resourceDir.exists()) {
+ boolean worked = resourceDir.mkdir();
+ if (!worked) {
+ throw new FileNotFoundException("cannot create " + resourceDirName + " under " + srcDir);
+ }
+ }
}
-}
+ @Override
+ public OutputStream getOxStream() throws FileNotFoundException {
+ buildResourceDir();
+ return new FileOutputStream(new File(resourceDir, DBWS_OX_XML));
+ }
+
+ @Override
+ public OutputStream getSessionsStream(String sessionsFileName) throws FileNotFoundException {
+ buildResourceDir();
+ return new FileOutputStream(new File(resourceDir, sessionsFileName));
+ }
+
+ @Override
+ public OutputStream getServiceStream() throws FileNotFoundException {
+ buildResourceDir();
+ return new FileOutputStream(new File(resourceDir, DBWS_SERVICE_XML));
+ }
+
+ @Override
+ public OutputStream getOrStream() throws FileNotFoundException {
+ buildResourceDir();
+ return new FileOutputStream(new File(resourceDir, DBWS_OR_XML));
+ }
+}
\ No newline at end of file
diff --git a/dbws/dbws.simple/pom.xml b/dbws/dbws.simple/pom.xml
index 02855da..8f92238 100644
--- a/dbws/dbws.simple/pom.xml
+++ b/dbws/dbws.simple/pom.xml
@@ -84,6 +84,13 @@
<version>5.1.24</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc6</artifactId>
+ <version>11.2.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
@@ -143,6 +150,26 @@
<target>1.7</target>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-empty-directory</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${project.basedir}/target/generated-src/java" />
+ <mkdir dir="${project.basedir}/target/generated-src/webapp" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -170,16 +197,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <includes>
- <include>${project.basedir}/target/generated-src/java/**/*.java</include>
- </includes>
- </configuration>
- </plugin>
</plugins>
<resources>
@@ -191,6 +208,5 @@
</resource>
</resources>
-
</build>
</project>
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 91%
rename from jpa-moxy/round-trip/pom.xml
rename to jpa-moxy/jpa-moxy.simple/pom.xml
index 78beb4b..82d4b3e 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>
@@ -126,7 +126,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
- <mainClass>eclipselink.example.jpamoxy.roundtrip.InitDB</mainClass>
+ <mainClass>eclipselink.example.jpamoxy.simple.InitDB</mainClass>
</configuration>
</plugin>
</plugins>
@@ -141,7 +141,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
- <mainClass>eclipselink.example.jpamoxy.roundtrip.Marshall</mainClass>
+ <mainClass>eclipselink.example.jpamoxy.simple.Marshall</mainClass>
<arguments>
<argument>xml</argument>
</arguments>
@@ -159,7 +159,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
- <mainClass>eclipselink.example.jpamoxy.roundtrip.Marshall</mainClass>
+ <mainClass>eclipselink.example.jpamoxy.simple.Marshall</mainClass>
<arguments>
<argument>json</argument>
</arguments>
@@ -177,7 +177,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
- <mainClass>eclipselink.example.jpamoxy.roundtrip.Unmarshall</mainClass>
+ <mainClass>eclipselink.example.jpamoxy.simple.Unmarshall</mainClass>
<arguments>
<argument>xml</argument>
</arguments>
@@ -195,7 +195,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
- <mainClass>eclipselink.example.jpamoxy.roundtrip.Unmarshall</mainClass>
+ <mainClass>eclipselink.example.jpamoxy.simple.Unmarshall</mainClass>
<arguments>
<argument>json</argument>
</arguments>
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" />
diff --git a/jpa/employee/employee.model/src/config/weblogic/createDataSource.cmd b/jpa/employee/employee.model/src/config/weblogic/createDataSource.cmd
new file mode 100644
index 0000000..476e6aa
--- /dev/null
+++ b/jpa/employee/employee.model/src/config/weblogic/createDataSource.cmd
@@ -0,0 +1,19 @@
+@echo off
+
+set LOC=%1%
+
+if /I "%LOC%"=="" (goto error)
+goto start
+
+:start
+call "%LOC%\server\bin\setWLSEnv.cmd"
+call "%JAVA_HOME%\bin\java" weblogic.WLST createDataSource.py"
+
+goto end
+
+:error
+echo "No arguments supplied: Must provide directory where WLS is installed"
+echo " USAGE: createDataSource.cmd C:\Oracle\Middleware\wlserver_12.1"
+
+:end
+@endlocal
\ No newline at end of file
diff --git a/moxy/twitter/README.md b/moxy/twitter/README.md
index b38ba87..ab6c419 100644
--- a/moxy/twitter/README.md
+++ b/moxy/twitter/README.md
@@ -1,18 +1,14 @@
-<pre>
-
EclipseLink MOXy Twitter Example
--------------------------------
This example application demonstrates how to read JSON data into objects mapped with EclipseLink JAXB.
-* Using standard JAXB APIs, Result and SearchResults classes are mapped to a subset of the JSON data returned from a Twitter query
-* Query is executed by using the Twitter Search URL (e.g. http://search.twitter.com/search.json?q=jaxb)
-* Incoming JSON is unmarshalled to a SearchResult object
-* An example Result is added to the query results, which are then marshalled to System.out
-* This example also uses a DateAdapter to convert Twitter's timestamp format to a java.util.Date
+* Using standard JAXB APIs, `Result` and `SearchResults` classes are mapped to a subset of the JSON data returned from a Twitter query
+* Query is executed by using a Twitter Search URL (e.g. [http://search.twitter.com/search.json?q=jaxb](http://search.twitter.com/search.json?q=jaxb))
+* Incoming JSON is unmarshalled to a `SearchResult` object
+* An new `Result` is manually created and added to the query results, which are then marshalled to `System.out`
+* This example also uses a `DateAdapter` to convert Twitter's timestamp format to a `java.util.Date`
-To run this example, simply execute 'mvn' from this directory, or run a Maven build in Eclipse.
+To run this example, simply execute `mvn` from this directory, or run a Maven build in Eclipse.
-http://wiki.eclipse.org/EclipseLink/Examples/MOXy/JSON_Twitter
-
-</pre>
\ No newline at end of file
+[http://wiki.eclipse.org/EclipseLink/Examples/MOXy/JSON_Twitter](http://wiki.eclipse.org/EclipseLink/Examples/MOXy/JSON_Twitter)
\ No newline at end of file
