X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=test%2Fhibernate%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsupport%2Fpersistence%2Fhibernate%2FHibernateJpaCustomizer.java;h=923d0c225106793f4c5fb2a7fb99ffadf3633f93;hb=f9ccadb956bac942258d9892c66e481ac2aec446;hp=4dd71360446e3e0d58accaf917b182413f028e30;hpb=ddd261f331280640c5b53c7128230b629ebcd268;p=utils

diff --git a/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java b/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java
index 4dd71360..923d0c22 100644
--- a/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java
+++ b/test/hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java
@@ -1,7 +1,18 @@
 /*
- * SCJD assignment, URLyBird, Erik Brakkee.
- * Candidate ID: sr1399267.
- */
+ * Copyright 2005-2010 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ 
 package org.wamblee.support.persistence.hibernate;
 
 import org.dbunit.dataset.filter.ITableFilterSimple;
@@ -11,45 +22,38 @@ import org.wamblee.support.persistence.PersistenceUnitDescription;
 
 import java.util.Map;
 
-
 /**
- * DOCUMENT ME!
- *
+ * 
  * @author $author$
  * @version $Revision$
  */
 public class HibernateJpaCustomizer implements JpaCustomizer {
-/**
+    /**
      * Creates a new HibernateJpaCustomizer object.
      */
     public HibernateJpaCustomizer() {
         // Empty
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aPersistenceUnit DOCUMENT ME!
-     * @param aJpaProperties DOCUMENT ME!
-     */
     @Override
     public void customize(PersistenceUnitDescription aPersistenceUnit,
         Map<String, String> aJpaProperties) {
-        // Hibernate: Override transaction type and datasource
-        aJpaProperties.put("javax.persistence.transactionType", "RESOURCE_LOCAL");
-        aJpaProperties.put("javax.persistence.jtaDataSource", null);
-        aJpaProperties.put("javax.persistence.nonJtaDataSource",
-            aPersistenceUnit.getJndiName());
+        
+        System.setProperty("hibernate.temp.use_jdbc_metadata_defaults", "true");
+        
+        // Set non-JPA connection properties for older versions of hibernate
+        System.getProperties().remove("hibernate.connection.datasource");
+        if (System.getProperty("hibernate.connection.datasource") != null ) { 
+            throw new RuntimeException("ERROR");
+        }
+        System.setProperty("hibernate.connection.url", aJpaProperties.get("javax.persistence.jdbc.url"));
+        System.setProperty("hibernate.connection.username", aJpaProperties.get("javax.persistence.jdbc.user"));
+        System.setProperty("hibernate.connection.password", aJpaProperties.get("javax.persistence.jdbc.password"));
 
         // Hibernate schema generation
-        aJpaProperties.put("hibernate.hbm2ddl.auto", "create");
+        aJpaProperties.put("hibernate.hbm2ddl.auto", "create-drop");
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
     @Override
     public ITableFilterSimple getJpaTables() {
         return new HibernateTables();