Changeset 298:b2c2747af54f for kraken-jpa/src/main/java/org/krakenapps/jpa/JpaScript.java

Timestamp:

09/05/11 12:25:05 (9 months ago)

Author:

xeraph

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2732

Message:

 

File:

• kraken-jpa/src/main/java/org/krakenapps/jpa/JpaScript.java (modified) (4 diffs)

kraken-jpa/src/main/java/org/krakenapps/jpa/JpaScript.java

@@ -16 +16 @@
 package org.krakenapps.jpa;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -158 +159 @@
 
         private List<DatabaseConfigTemplate> getConfigTemplates() {
+                File jpaDir = new File(System.getProperty("kraken.data.dir"), "kraken-jpa");
+                String jpaDataPath = jpaDir.getAbsolutePath();
+                
                 List<DatabaseConfigTemplate> configs = new ArrayList<JpaScript.DatabaseConfigTemplate>();
                 configs.add(new DatabaseConfigTemplate("MySQL", "com.mysql.jdbc.Driver",
@@ -165 +169 @@
                                 "org.hibernate.dialect.PostgreSQLDialect", "jdbc:postgresql://$host/$db"));
                 configs.add(new DatabaseConfigTemplate("HSQLDB", "org.hsqldb.jdbcDriver", "org.hibernate.dialect.HSQLDialect",
-                                "jdbc:hsqldb:$db;shutdown=true"));
+                                "jdbc:hsqldb:" + jpaDataPath + "/$db;shutdown=true"));
                 return configs;
         }
@@ -242 +246 @@
         public void unregister(String[] args) {
                 String factoryName = args[0];
-                if (jpa.hasEntityManagerFactory(factoryName)) {
+                if (!jpa.hasEntityManagerFactory(factoryName)) {
                         context.println(factoryName + " not found");
                         return;