Simplified config
diff --git a/jpars.script.clojure/.classpath b/jpars.script.clojure/.classpath
index 2784a1b..1151b0d 100644
--- a/jpars.script.clojure/.classpath
+++ b/jpars.script.clojure/.classpath
@@ -17,16 +17,16 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/jpars.script.clojure/.settings/org.eclipse.jdt.core.prefs b/jpars.script.clojure/.settings/org.eclipse.jdt.core.prefs
index 45a6e0e..443e085 100644
--- a/jpars.script.clojure/.settings/org.eclipse.jdt.core.prefs
+++ b/jpars.script.clojure/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/jpars.script.clojure/.settings/org.eclipse.wst.common.project.facet.core.xml b/jpars.script.clojure/.settings/org.eclipse.wst.common.project.facet.core.xml
index 4c37a74..65276cf 100644
--- a/jpars.script.clojure/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/jpars.script.clojure/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
- <installed facet="java" version="1.5"/>
<installed facet="jst.web" version="2.3"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.jaxrs" version="1.1"/>
+ <installed facet="java" version="1.7"/>
</faceted-project>
diff --git a/jpars.script.clojure/derby.log b/jpars.script.clojure/derby.log
deleted file mode 100644
index ea1fa9a..0000000
--- a/jpars.script.clojure/derby.log
+++ /dev/null
@@ -1,10 +0,0 @@
-----------------------------------------------------------------
-Fri Apr 19 13:23:51 EDT 2013:
-Booting Derby version The Apache Software Foundation - Apache Derby - 10.9.1.0 - (1344872): instance a816c00e-013e-2352-d688-0000026182f8
-on database directory /Users/djclarke/GIT/eclipselink/incubator/jpars.script.clojure/target/derby/test with class loader sun.misc.Launcher$AppClassLoader@7122e0b3
-Loaded from file:/Users/djclarke/.m2/repository/org/apache/derby/derby/10.9.1.0/derby-10.9.1.0.jar
-java.vendor=Oracle Corporation
-java.runtime.version=1.7.0_10-b18
-user.dir=/Users/djclarke/GIT/eclipselink/incubator/jpars.script.clojure
-derby.system.home=null
-Database Class Loader started - derby.database.classpath=''
diff --git a/jpars.script.clojure/pom.xml b/jpars.script.clojure/pom.xml
index 103a765..ae3f300 100644
--- a/jpars.script.clojure/pom.xml
+++ b/jpars.script.clojure/pom.xml
@@ -6,23 +6,11 @@
<packaging>war</packaging>
<version>2.4.2-SNAPSHOT</version>
-
- <repositories>
- <repository>
- <id>Java.Net</id>
- <url>http://download.java.net/maven/2/</url>
- </repository>
- <repository>
- <id>EclipseLink</id>
- <url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
+ <groupId>com.oracle.toplink</groupId>
<artifactId>eclipselink</artifactId>
- <version>2.4.2-SNAPSHOT</version>
+ <version>12.1.2-0-0</version>
<exclusions>
<exclusion>
<artifactId>commonj.sdo</artifactId>
@@ -32,11 +20,25 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.oracle.toplink</groupId>
+ <artifactId>toplink-dataservices</artifactId>
+ <version>12.1.2-0-0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.oracle.toplink</groupId>
+ <artifactId>javax.persistence</artifactId>
+ <version>12.1.2-0-0</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- EclipseLink JPA-RS Web Fragment -->
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.jpars</artifactId>
- <version>2.4.2-SNAPSHOT</version>
+ <groupId>com.oracle.toplink</groupId>
+ <artifactId>toplink-dataservices-web</artifactId>
+ <version>12.1.2-0-0</version>
</dependency>
<dependency>
@@ -46,16 +48,7 @@
<scope>test</scope>
</dependency>
-
-
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>6.0</version>
- <scope>provided</scope>
- </dependency>
-
-
+
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
@@ -70,5 +63,20 @@
</dependencies>
<build>
<finalName>jpars.script.clojure</finalName>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>derby.stream.error.file</name>
+ <value>target/derby.log</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/jpars.script.clojure/src/main/java/org/eclipse/persistence/jpa/dynamic/package-info.java b/jpars.script.clojure/src/main/java/org/eclipse/persistence/jpa/dynamic/package-info.java
new file mode 100644
index 0000000..30c5cb3
--- /dev/null
+++ b/jpars.script.clojure/src/main/java/org/eclipse/persistence/jpa/dynamic/package-info.java
@@ -0,0 +1,8 @@
+/**
+ *
+ */
+/**
+ * @author dclarke
+ *
+ */
+package org.eclipse.persistence.jpa.dynamic;
\ No newline at end of file
diff --git a/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/DataService.java b/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/DataService.java
index a61ebf2..eac0204 100644
--- a/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/DataService.java
+++ b/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/DataService.java
@@ -24,7 +24,6 @@
import org.eclipse.persistence.jpa.rs.PersistenceContextFactory;
import org.eclipse.persistence.jpa.rs.PersistenceContextFactoryProvider;
import org.eclipse.persistence.jpa.rs.PersistenceFactoryBase;
-import org.eclipse.persistence.sessions.SessionEventListener;
public class DataService {
diff --git a/jpars.script.clojure/src/test/java/test/TestApplicationInitialize.java b/jpars.script.clojure/src/test/java/test/TestApplicationInitialize.java
index 2de98e9..56b2b6f 100644
--- a/jpars.script.clojure/src/test/java/test/TestApplicationInitialize.java
+++ b/jpars.script.clojure/src/test/java/test/TestApplicationInitialize.java
@@ -12,14 +12,10 @@
******************************************************************************/
package test;
-import org.junit.Test;
-
-import example.ApplicationInitialize;
public class TestApplicationInitialize {
- @Test
public void create() {
- ApplicationInitialize.init();
+ // ApplicationInitialize.init();
}
}
diff --git a/jpars.script.clojure/src/test/java/test/api/TestCreatePersistenceUnit.java b/jpars.script.clojure/src/test/java/test/api/TestCreatePersistenceUnit.java
index c13ac2e..88cccf7 100644
--- a/jpars.script.clojure/src/test/java/test/api/TestCreatePersistenceUnit.java
+++ b/jpars.script.clojure/src/test/java/test/api/TestCreatePersistenceUnit.java
@@ -14,13 +14,10 @@
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
-import javax.persistence.GenerationType;
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.eclipse.persistence.dynamic.DynamicEntity;
-import org.eclipse.persistence.dynamic.DynamicHelper;
import org.eclipse.persistence.dynamic.DynamicType;
-import org.eclipse.persistence.jpa.JpaHelper;
import org.eclipse.persistence.jpa.dynamic.JPADynamicHelper;
import org.eclipse.persistence.script.EntityType;
import org.eclipse.persistence.script.PersistenceUnit;
