[Schmitzm-commits] r2056 - in trunk: schmitzm-core/src/main/java/de/schmitzm/versionnumber schmitzm-core/src/test/java/de/schmitzm/crypt schmitzm-core/src/test/java/de/schmitzm/data schmitzm-core/src/test/java/de/schmitzm/i18n schmitzm-core/src/test/java/de/schmitzm/io schmitzm-core/src/test/java/de/schmitzm/lang schmitzm-core/src/test/java/de/schmitzm/linux schmitzm-core/src/test/java/de/schmitzm/net/mail schmitzm-core/src/test/java/de/schmitzm/testing schmitzm-db schmitzm-db/src/main/java/de/schmitzm/postgres

scm-commit at wald.intevation.org scm-commit at wald.intevation.org
Fri Jun 15 15:17:12 CEST 2012


Author: alfonx
Date: 2012-06-15 15:17:12 +0200 (Fri, 15 Jun 2012)
New Revision: 2056

Modified:
   trunk/schmitzm-core/src/main/java/de/schmitzm/versionnumber/ReleaseUtil.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/crypt/CryptUtilTest.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/data/UnitConversionTest.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/i18n/I18NUtilTest.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/i18n/TranslationTest.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/io/IOUtilTest.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/lang/LangUtilTest.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/lang/ResourceProviderTest.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/lang/TimedHashMapTest.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/lang/TimedLimitedHashmapTest.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/linux/LinuxUtilTest.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/net/mail/MailUtilTest.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/testing/SwingUtilTest.java
   trunk/schmitzm-core/src/test/java/de/schmitzm/testing/TestingUtil.java
   trunk/schmitzm-db/pom.xml
   trunk/schmitzm-db/src/main/java/de/schmitzm/postgres/PGUtil.java
Log:
upgrade auf jdbc 902 klappt nicht weil aritfactory die datei nicht hat

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/versionnumber/ReleaseUtil.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/versionnumber/ReleaseUtil.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/versionnumber/ReleaseUtil.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -12,15 +12,13 @@
 import org.apache.log4j.Logger;
 
 /**
- * This class provides static utility classes that help releasing and versioning
- * applications. Especially usefull in combination with maven2's
- * buildnumber-maven plugin.<br/>
+ * This class provides static utility classes that help releasing and versioning applications. Especially usefull in
+ * combination with maven2's buildnumber-maven plugin.<br/>
  * 
  * @author Stefan A. Tzeggai
  * 
- *         Wer sein Maven Projekt wie folgt konfiguriert kann die Maven +
- *         Build-Zeitpunk als Programmversion verwenden, z.B.
- *         "v1.5-SNAPSHOT 2010-11-23 23:55"
+ *         Wer sein Maven Projekt wie folgt konfiguriert kann die Maven + Build-Zeitpunk als Programmversion verwenden,
+ *         z.B. "v1.5-SNAPSHOT 2010-11-23 23:55"
  * 
  * <br/>
  *         1. pom.xml anpassen: <code>
@@ -47,8 +45,7 @@
 				</configuration>
 			</plugin>
 		</code><br/>
- *         2. Datei src/main/resources/release.properties mit foglenden Inhalt
- *         anlegen: <code>
+ *         2. Datei src/main/resources/release.properties mit foglenden Inhalt anlegen: <code>
 				#Properties describing this release/build
 				version=${project.version}
 				build=${buildNumber}
@@ -56,8 +53,7 @@
 				activeProfile2Id=${project.activeProfiles[1].id}
 				activeProfile3Id=${project.activeProfiles[2].id}				
 		</code><br/>
- *         3. Filtering für die src/main/resources.properties - Datei
- *         einschalten:<code>
+ *         3. Filtering für die src/main/resources.properties - Datei einschalten:<code>
  *         
 			<resources>
 				<resource>
@@ -68,8 +64,7 @@
 			</resources>
 	    </code> <br/>
  * <br/>
- *         Eine maven Fehlermeldung "The scm url cannot be null." ist
- *         irreführend. In wirklichkeit wird ein Eintrag
+ *         Eine maven Fehlermeldung "The scm url cannot be null." ist irreführend. In wirklichkeit wird ein Eintrag
  *         <scm>...<developerConnection>..</scm> verlangt.<br/>
  *         Nun kann mit <code>
  *         		log.info(this.getClass().getSimpleName() + " "
@@ -80,16 +75,13 @@
 	private static Logger log = Logger.getLogger(ReleaseUtil.class);
 
 	/**
-	 * Returns all (the most) information in one sting. This is a public method
-	 * which never throws an Exception.
+	 * Returns all (the most) information in one sting. This is a public method which never throws an Exception.
 	 * 
 	 * @param clazz
-	 *            Pass a class that resides in the same "project" or jar, where
-	 *            the /release.properties resides as well.
+	 *            Pass a class that resides in the same "project" or jar, where the /release.properties resides as well.
 	 * 
-	 * @return A {@link String} like "v1.4 r243" where the first number is the
-	 *         maven project version and the second number is the SCM revision.
-	 *         Returns "unknown version" if it can't be determined.
+	 * @return A {@link String} like "v1.4 r243" where the first number is the maven project version and the second
+	 *         number is the SCM revision. Returns "unknown version" if it can't be determined.
 	 */
 	public static String getVersionInfo(Class<?> clazz) {
 		try {
@@ -101,16 +93,17 @@
 
 	/**
 	 * @param clazz
-	 *            Pass a class that resides in the same "project" or jar, where
-	 *            the /release.properties resides as well.
+	 *            Pass a class that resides in the same "project" or jar, where the /release.properties resides as well.
 	 * 
 	 * @Return the major part of the software version or 0 if a problem occurs.
 	 */
 	public static String getVersionBuild(Class<?> clazz) {
 		try {
-			final URL releasePropsURL = clazz
-					.getResource("/release.properties");
+			final URL releasePropsURL = clazz.getResource("/release.properties");
 
+			if (releasePropsURL == null)
+				return "0";
+
 			final Properties releaseProps = new Properties();
 			final InputStream openStream = releasePropsURL.openStream();
 			try {
@@ -128,9 +121,7 @@
 
 			return str;
 		} catch (final Exception e) {
-			log.error(
-					"/release.properties could not be read from "
-							+ clazz.getSimpleName(), e);
+			log.error("/release.properties could not be read from " + clazz.getSimpleName(), e);
 			return "0";
 		}
 
@@ -138,19 +129,16 @@
 
 	/**
 	 * @param clazz
-	 *            Pass a class that resides in the same "project" or jar, where
-	 *            the /release.properties resides as well.
+	 *            Pass a class that resides in the same "project" or jar, where the /release.properties resides as well.
 	 * 
-	 * @return A Version String like "1.3" or "1.6". Returns "0.0" if a problem
-	 *         occurred.
+	 * @return A Version String like "1.3" or "1.6". Returns "0.0" if a problem occurred.
 	 */
 	public static String getVersion(Class<?> clazz) {
 		final String defaultVer = "0.0";
 
 		try {
 
-			final URL releasePropsURL = clazz
-					.getResource("/release.properties");
+			final URL releasePropsURL = clazz.getResource("/release.properties");
 
 			final Properties releaseProps = new Properties();
 			final InputStream openStream = releasePropsURL.openStream();
@@ -160,80 +148,72 @@
 				openStream.close();
 			}
 
-			final String versionProperty = releaseProps.getProperty("version",
-					defaultVer);
+			final String versionProperty = releaseProps.getProperty("version", defaultVer);
 			if (versionProperty.equals("${project.version}"))
 				return defaultVer;
 			return versionProperty;
 		} catch (final Exception e) {
-			log.error(
-					"/release.properties could not be read from "
-							+ clazz.getSimpleName(), e);
+			log.error("/release.properties could not be read from " + clazz.getSimpleName(), e);
 			return defaultVer;
 		}
 
 	}
 
-    /**
-     * Returns individual information from release properties file.
-     * @param clazz
-     *            Pass a class that resides in the same "project" or jar, where
-     *            the /release.properties resides as well.
-     */
-    public static String getIndividualProperty(Class<?> clazz, String propKey) {
-      try {
-        final URL releasePropsURL = clazz.getResource("/release.properties");
-        final Properties releaseProps = new Properties();
-        final InputStream openStream = releasePropsURL.openStream();
-        try {
-            releaseProps.load(openStream);
-        } finally {
-            openStream.close();
-        }
-        final String value = releaseProps.getProperty(propKey);
-        return value;
-      } catch (final Exception e) {
-        log.error(
-                "/release.properties could not be read from "
-                    + clazz.getSimpleName(), e);
-        return null;
-      }
-    }
-    
 	/**
+	 * Returns individual information from release properties file.
+	 * 
 	 * @param clazz
-	 *            Pass a class that resides in the same "project" or jar, where
-	 *            the /release.properties resides as well.
+	 *            Pass a class that resides in the same "project" or jar, where the /release.properties resides as well.
+	 */
+	public static String getIndividualProperty(Class<?> clazz, String propKey) {
+		try {
+			final URL releasePropsURL = clazz.getResource("/release.properties");
+
+			final Properties releaseProps = new Properties();
+			final InputStream openStream = releasePropsURL.openStream();
+			try {
+				releaseProps.load(openStream);
+			} finally {
+				openStream.close();
+			}
+			final String value = releaseProps.getProperty(propKey);
+			return value;
+		} catch (final Exception e) {
+			log.error("/release.properties could not be read from " + clazz.getSimpleName(), e);
+			return null;
+		}
+	}
+
+	/**
+	 * @param clazz
+	 *            Pass a class that resides in the same "project" or jar, where the /release.properties resides as well.
 	 * 
-	 * @return Mayor version number part, e.g. "1" for version "1.3". Returns 0
-	 *         if a problem occurred.
+	 * @return Mayor version number part, e.g. "1" for version "1.3". Returns 0 if a problem occurred.
 	 */
 	public static int getVersionMaj(Class<?> clazz) {
 		try {
 			return Integer.parseInt(getVersion(clazz).split("\\.")[0]);
 		} catch (final Exception e) {
 			log.error("Major version number '" + getVersion(clazz)
-					+ "' part could not be parsed from could not parsed (from "
-					+ clazz.getSimpleName() + "). Must be numeric!", e);
+					+ "' part could not be parsed from could not parsed (from " + clazz.getSimpleName()
+					+ "). Must be numeric!", e);
 			return 0;
 		}
 	}
 
 	/**
 	 * @param clazz
-	 *            Pass a class that resides in the same "project" or jar, where
-	 *            the /release.properties resides as well.
+	 *            Pass a class that resides in the same "project" or jar, where the /release.properties resides as well.
 	 * 
-	 * @return Minor version number part, e.g. "3" for version "1.3". Returns 0
-	 *         if a problem occurred.
+	 * @return Minor version number part, e.g. "3" for version "1.3". Returns 0 if a problem occurred.
 	 */
 	public static int getVersionMin(Class<?> clazz) {
 		try {
 			return extractMinVersionFromString(getVersion(clazz));
 		} catch (final Exception e) {
 			log.error("Minor version number '" + getVersion(clazz)
-					+ "' part could not be parsed from could not parsed (from "
-					+ clazz.getSimpleName() + "). Must be numeric!", e);
+					+ "' part could not be parsed from could not parsed (from " + clazz.getSimpleName()
+					+ "). Must be numeric!", e);
 			return 0;
 		}
 
@@ -257,35 +237,26 @@
 	 * Print the GPL disclaimer to the given {@link Logger} on INFO level.
 	 * 
 	 * @param progname
-	 *            Name of the program as printed in the license. Will
-	 *            automatically be starting with an upper-case letter.
-	 *            <code>null</code> will fall-back to <code>This program</code>
+	 *            Name of the program as printed in the license. Will automatically be starting with an upper-case
+	 *            letter. <code>null</code> will fall-back to <code>This program</code>
 	 */
 	public static String getLicense(License l, String progname) {
 		if (progname == null || progname.isEmpty())
 			progname = "This program";
 		switch (l) {
 		case GPL3:
-			return ("\n"
-					+ progname
-					+ " is free software: you can redistribute it and/or modify\n"
+			return ("\n" + progname + " is free software: you can redistribute it and/or modify\n"
 					+ "it under the terms of the GNU General Public License as published by\n"
 					+ "the Free Software Foundation, either version 3 of the License, or\n"
-					+ "(at your option) any later version.\n"
-					+ "\n"
-					+ progname
+					+ "(at your option) any later version.\n" + "\n" + progname
 					+ " is distributed in the hope that it will be useful,\n"
 					+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 					+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" + "GNU General Public License for more details.\n");
 		case LGPL3:
-			return ("\n"
-					+ progname
-					+ " is free software: you can redistribute it and/or modify\n"
+			return ("\n" + progname + " is free software: you can redistribute it and/or modify\n"
 					+ "it under the terms of the GNU Lesser General Public License as published by\n"
 					+ "the Free Software Foundation, either version 3 of the License, or\n"
-					+ "(at your option) any later version.\n"
-					+ "\n"
-					+ progname
+					+ "(at your option) any later version.\n" + "\n" + progname
 					+ " is distributed in the hope that it will be useful,\n"
 					+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 					+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" + "GNU Lesser General Public License for more details.\n");
@@ -304,8 +275,7 @@
 		ArrayList<String> aps = new ArrayList<String>();
 		try {
 
-			final URL releasePropsURL = clazz
-					.getResource("/release.properties");
+			final URL releasePropsURL = clazz.getResource("/release.properties");
 
 			final Properties releaseProps = new Properties();
 			final InputStream openStream = releasePropsURL.openStream();
@@ -328,17 +298,14 @@
 			return aps;
 
 		} catch (final Exception e) {
-			log.error(
-					"/release.properties could not be read from "
-							+ clazz.getSimpleName(), e);
+			log.error("/release.properties could not be read from " + clazz.getSimpleName(), e);
 			return Collections.EMPTY_LIST;
 		}
 
 	}
 
 	/**
-	 * Returns true if the project has been build with the queried profile-id
-	 * activated.
+	 * Returns true if the project has been build with the queried profile-id activated.
 	 */
 	public boolean isProfileActived(Class clazz, String testProfileId) {
 		return getActiveProviles(clazz).contains(testProfileId);

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/crypt/CryptUtilTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/crypt/CryptUtilTest.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/crypt/CryptUtilTest.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -1,8 +1,7 @@
 package de.schmitzm.crypt;
 
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.util.Arrays;
 

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/data/UnitConversionTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/data/UnitConversionTest.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/data/UnitConversionTest.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -1,7 +1,6 @@
 package de.schmitzm.data;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.*;
 
 import org.junit.Test;
 

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/i18n/I18NUtilTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/i18n/I18NUtilTest.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/i18n/I18NUtilTest.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -1,9 +1,6 @@
 package de.schmitzm.i18n;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/i18n/TranslationTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/i18n/TranslationTest.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/i18n/TranslationTest.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -1,8 +1,6 @@
 package de.schmitzm.i18n;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/io/IOUtilTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/io/IOUtilTest.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/io/IOUtilTest.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -1,10 +1,6 @@
 package de.schmitzm.io;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.io.IOException;

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/lang/LangUtilTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/lang/LangUtilTest.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/lang/LangUtilTest.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -1,9 +1,6 @@
 package de.schmitzm.lang;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.lang.management.ManagementFactory;
 import java.util.Enumeration;

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/lang/ResourceProviderTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/lang/ResourceProviderTest.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/lang/ResourceProviderTest.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -1,10 +1,6 @@
 package de.schmitzm.lang;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.StringWriter;
 import java.util.Locale;

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/lang/TimedHashMapTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/lang/TimedHashMapTest.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/lang/TimedHashMapTest.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -1,8 +1,6 @@
 package de.schmitzm.lang;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import org.junit.Test;
 

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/lang/TimedLimitedHashmapTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/lang/TimedLimitedHashmapTest.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/lang/TimedLimitedHashmapTest.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -1,8 +1,6 @@
 package de.schmitzm.lang;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import org.junit.Test;
 

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/linux/LinuxUtilTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/linux/LinuxUtilTest.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/linux/LinuxUtilTest.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -1,7 +1,6 @@
 package de.schmitzm.linux;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.io.IOException;

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/net/mail/MailUtilTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/net/mail/MailUtilTest.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/net/mail/MailUtilTest.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -1,8 +1,6 @@
 package de.schmitzm.net.mail;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.util.regex.Pattern;
 

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/testing/SwingUtilTest.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/testing/SwingUtilTest.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/testing/SwingUtilTest.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -1,7 +1,6 @@
 package de.schmitzm.testing;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 import java.awt.Color;
 import java.text.DecimalFormat;

Modified: trunk/schmitzm-core/src/test/java/de/schmitzm/testing/TestingUtil.java
===================================================================
--- trunk/schmitzm-core/src/test/java/de/schmitzm/testing/TestingUtil.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-core/src/test/java/de/schmitzm/testing/TestingUtil.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -1,10 +1,6 @@
 package de.schmitzm.testing;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.awt.Color;
 import java.awt.Component;

Modified: trunk/schmitzm-db/pom.xml
===================================================================
--- trunk/schmitzm-db/pom.xml	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-db/pom.xml	2012-06-15 13:17:12 UTC (rev 2056)
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>9.1-902.jdbc4</version>
+			<version>9.1-901.jdbc4</version>
 		</dependency>
 	</dependencies>
 

Modified: trunk/schmitzm-db/src/main/java/de/schmitzm/postgres/PGUtil.java
===================================================================
--- trunk/schmitzm-db/src/main/java/de/schmitzm/postgres/PGUtil.java	2012-06-14 13:08:00 UTC (rev 2055)
+++ trunk/schmitzm-db/src/main/java/de/schmitzm/postgres/PGUtil.java	2012-06-15 13:17:12 UTC (rev 2056)
@@ -7,12 +7,8 @@
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
 
-import org.apache.log4j.Logger;
-import org.postgresql.util.PGInterval;
-
-import de.schmitzm.lang.LangUtil;
-
 /**
  * Hilfsmethoden für PostgreSQL. Die Dependency soll nur {@link Connection}
  * sein. In Hibernate kann über #doWork eine {@link Connection} erhalten werden.



More information about the Schmitzm-commits mailing list