Commit c21d5001 authored by toaster's avatar toaster
Browse files

git-svn-id: https://subversion.umiacs.umd.edu/ace/trunk@53 f1b3a171-7291-4a19-a512-95ad0ad9394a
parent c16e0e6e
......@@ -15,6 +15,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
</properties>
<repositories>
......@@ -25,8 +26,8 @@
<snapshots>
<enabled>true</enabled>
</snapshots> -->
</repository>
</repositories>
</repository>
</repositories>
<dependencies>
<!-- local ace deps -->
......@@ -49,7 +50,7 @@
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0</version>
</dependency>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
......@@ -136,8 +137,9 @@
<artifactId>irods-api</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
</project>
......@@ -46,8 +46,8 @@ import javax.sql.DataSource;
public final class PersistUtil {
/** entity manager specified in app's persistence.xml. */
private static EntityManagerFactory emf
= Persistence.createEntityManagerFactory("ace-amPU");
private static EntityManagerFactory emf = null;
//= Persistence.createEntityManagerFactory("ace-amPU");
/** db connection to aceamdb. */
private static DataSource ds = null;
......
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="1.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_1_0.xsd">
<persistence-unit name="ace-amPU" transaction-type="RESOURCE_LOCAL">
<provider>oracle.toplink.essentials.PersistenceProvider</provider>
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
<non-jta-data-source>java:comp/env/jdbc/aceamdb</non-jta-data-source>
<class>edu.umiacs.ace.monitor.log.LogEvent</class>
<class>edu.umiacs.ace.monitor.users.Users</class>
......@@ -21,11 +21,11 @@
<class>edu.umiacs.ace.driver.swap.SwapSettings</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
<property name="toplink.session.customizer" value="edu.umiacs.ace.util.DataSourceSessionCustomizer"/>
<!-- <property name="toplink.logging.level" value="FINE"/> -->
<property name="toplink.create-ddl-jdbc-file-name" value="create.sql"/>
<property name="toplink.ddl-generation.output-mode" value="sql-script"/>
<property name="toplink.application-location" value="/tmp"/>
<property name="eclipselink.session.customizer" value="edu.umiacs.ace.util.DataSourceSessionCustomizer"/>
<!-- <property name="eclipselink.create-ddl-jdbc-file-name" value="create.sql"/>
<property name="eclipselink.ddl-generation.output-mode" value="sql-script"/>
<property name="eclipselink.application-location" value="/tmp"/>-->
</properties>
</persistence-unit>
</persistence>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment