X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fspring%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Ftest%2Fspring%2FHibernateUtils.java;h=edefc37369c9e97be39e65c96a99ec011c1966de;hb=e27d51b0e8f5e2547b243015dec3f590aeabb733;hp=74a7ef7e44659b4f5dead4ea7e8203fd0325b106;hpb=6baa1546bf990db7c66e9837bbb23f1070bf81e0;p=utils

diff --git a/support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java b/support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java
index 74a7ef7e..edefc373 100644
--- a/support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java
+++ b/support/spring/src/test/java/org/wamblee/test/spring/HibernateUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 the original author or authors.
+ * 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.
@@ -12,8 +12,7 @@
  * 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.test.spring;
 
 import java.io.File;
@@ -23,36 +22,39 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
 
-import org.apache.oro.io.AwkFilenameFilter;
 import org.hibernate.cfg.Configuration;
 import org.wamblee.io.ClassPathResource;
 import org.wamblee.io.InputResource;
+import org.wamblee.io.RegexFilenameFilter;
 
 /**
  * Hibernate utilities.
- *
+ * 
  * @author Erik Brakkee
  */
 public final class HibernateUtils {
-
     private static final String DATABASE_PROPS = "test.database.properties";
 
     /**
      * Disabled.
-     *
+     * 
      */
-    private HibernateUtils() { 
+    private HibernateUtils() {
         // Empty
     }
-    
+
     /**
+     * 
      * @param aDir
+     * 
      * @return
+     * 
      */
     public static Configuration getConfiguration(File aDir) throws IOException {
         Configuration conf = new Configuration();
-        File[] files = aDir.listFiles((FileFilter) (new AwkFilenameFilter(
-                ".*\\.hbm\\.xml")));
+        File[] files = aDir.listFiles((FileFilter) (new RegexFilenameFilter(
+            ".*\\.hbm\\.xml")));
+
         for (File f : files) {
             System.out.println("Mapping file: " + f);
             conf.addFile(f);
@@ -61,8 +63,8 @@ public final class HibernateUtils {
         Map<String, String> dbProps = getHibernateProperties();
 
         for (Map.Entry<String, String> entry : dbProps.entrySet()) {
-            System.out.println("Property: " + entry.getKey() + "="
-                    + entry.getValue());
+            System.out.println("Property: " + entry.getKey() + "=" +
+                entry.getValue());
             conf.setProperty(entry.getKey(), entry.getValue());
         }
 
@@ -70,24 +72,23 @@ public final class HibernateUtils {
     }
 
     private static Map<String, String> getHibernateProperties()
-            throws IOException {
-
+        throws IOException {
         System.out.println("Reading properties file: " + DATABASE_PROPS);
+
         InputResource lPropFile = new ClassPathResource(DATABASE_PROPS);
         Properties props = new Properties();
         props.load(lPropFile.getInputStream());
 
         Map<String, String> result = new TreeMap<String, String>();
         result.put("hibernate.connection.driver_class", props
-                .getProperty("database.driver"));
+            .getProperty("database.driver"));
         result.put("hibernate.connection.url", props
-                .getProperty("database.url"));
+            .getProperty("database.url"));
         result.put("hibernate.connection.username", props
-                .getProperty("database.username"));
+            .getProperty("database.username"));
         result.put("hibernate.connection.password", props
-                .getProperty("database.password"));
+            .getProperty("database.password"));
 
         return result;
     }
-
 }