slub.team team mailing list archive

[Ralf Claussnitzer <ralf.claussnitzer@xxxxxxxxxxxxxxx>]

Ralf Claussnitzer has proposed merging lp:~ralf-claussnitzer/goobi-production/bug-965068 into lp:goobi-production.

Requested reviews:
  Henning Gerhardt (henning-gerhardt)
Related bugs:
  Bug #965068 in Goobi.Production: "apache license v2 must be applied"
  https://bugs.launchpad.net/goobi-production/+bug/965068

For more details, see:
https://code.launchpad.net/~ralf-claussnitzer/goobi-production/bug-965068/+merge/99720
-- 
https://code.launchpad.net/~ralf-claussnitzer/goobi-production/bug-965068/+merge/99720
Your team Saxon State Library Team is subscribed to branch lp:goobi-production.

=== removed directory 'src-dubious/dubious/sub/goobi/persistence'
=== renamed file 'src-dubious/dubious/sub/goobi/persistence/BaseDAO.java' => 'src/de/sub/goobi/persistence/BaseDAO.java'
--- src-dubious/dubious/sub/goobi/persistence/BaseDAO.java	2012-03-10 13:34:49 +0000
+++ src/de/sub/goobi/persistence/BaseDAO.java	2012-03-28 13:09:19 +0000
@@ -1,32 +1,38 @@
 /**
- * This file is very likely based on work of Douglas Harris and Nick Heudecker.
- * A collections of lectures can be found at http://spectral.mscs.mu.edu/SoftDev2005/lectures/.
- *
- * The original file source code is to be found at
- * http://spectral.mscs.mu.edu/SoftDev2005/examples/team/#src/example/persistence/BaseDAO.java
- *
- * @author Douglas Harris <doug@xxxxxxxxxxx>
- * @author Nick Heudecker <nick@xxxxxxxxxxxxxxxx>
+ * Copyright 2005 Nick Heudecker
+ *
+ * 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 dubious.sub.goobi.persistence;
+package de.sub.goobi.persistence;
+
+import de.sub.goobi.helper.Helper;
+import de.sub.goobi.helper.Util;
+import de.sub.goobi.helper.exceptions.DAOException;
+import org.hibernate.HibernateException;
+import org.hibernate.Query;
+import org.hibernate.Session;
 
 import java.io.Serializable;
 import java.sql.SQLException;
 import java.util.List;
 
-import de.sub.goobi.persistence.HibernateUtil;
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.Session;
-
-import de.sub.goobi.helper.Helper;
-import de.sub.goobi.helper.Util;
-import de.sub.goobi.helper.exceptions.DAOException;
-
 /**
  * Base class for DAOs. This class defines common CRUD methods.
+ * Changes have been made by Steffen Hankiewicz.
+ *
+ * @author Nick Heudecker <nick@xxxxxxxxxxxxxxxx>
+ * @author Steffen Hankiewicz <steffen.hankiewicz@xxxxxxxxxxxx>
  */
-
 public abstract class BaseDAO implements Serializable{
 	private static final long serialVersionUID = 4676125965631365912L;
 
@@ -131,21 +137,6 @@
 	}
 
 	/**
-	 * Mein eigener Entwurf für maximale Anzahl bei Rückgabe der Objekte
-	 */
-	protected List retrieveObjs(String query, int first, int max) throws DAOException {
-		try {
-			Session session = Helper.getHibernateSession();
-			Query q = session.createQuery(query);
-			q.setFirstResult(first);
-			q.setMaxResults(max);
-			return q.list();
-		} catch (HibernateException he) {
-			throw new DAOException(he);
-		}
-	}
-
-	/**
 	 * Mein eigener Entwurf für Ermittlung der Anzahl der Objekte
 	 */
 	protected Long retrieveAnzahl(String query) throws DAOException {
@@ -206,16 +197,6 @@
 		}
 	}
 
-	/**
-	 * Retrieves the HQL query from the resource bundle.
-	 * 
-	 * @param key
-	 *            the HQL query to lookup
-	 */
-	protected String getQuery(String key) {
-		return Util.getQuery(key);
-	}
-	
 	protected void refresh(Object o) {
 		Session session = Helper.getHibernateSession();
 		session.refresh(o);

=== modified file 'src/de/sub/goobi/persistence/BenutzerDAO.java'
--- src/de/sub/goobi/persistence/BenutzerDAO.java	2012-03-10 13:31:03 +0000
+++ src/de/sub/goobi/persistence/BenutzerDAO.java	2012-03-28 13:09:19 +0000
@@ -26,7 +26,6 @@
 
 import de.sub.goobi.beans.Benutzer;
 import de.sub.goobi.helper.exceptions.DAOException;
-import dubious.sub.goobi.persistence.BaseDAO;
 
 public class BenutzerDAO extends BaseDAO {
 

=== modified file 'src/de/sub/goobi/persistence/BenutzergruppenDAO.java'
--- src/de/sub/goobi/persistence/BenutzergruppenDAO.java	2012-03-10 13:31:03 +0000
+++ src/de/sub/goobi/persistence/BenutzergruppenDAO.java	2012-03-28 13:09:19 +0000
@@ -26,7 +26,6 @@
 
 import de.sub.goobi.beans.Benutzergruppe;
 import de.sub.goobi.helper.exceptions.DAOException;
-import dubious.sub.goobi.persistence.BaseDAO;
 
 public class BenutzergruppenDAO extends BaseDAO {
 

=== modified file 'src/de/sub/goobi/persistence/LdapGruppenDAO.java'
--- src/de/sub/goobi/persistence/LdapGruppenDAO.java	2012-03-10 13:31:03 +0000
+++ src/de/sub/goobi/persistence/LdapGruppenDAO.java	2012-03-28 13:09:19 +0000
@@ -26,7 +26,6 @@
 
 import de.sub.goobi.beans.LdapGruppe;
 import de.sub.goobi.helper.exceptions.DAOException;
-import dubious.sub.goobi.persistence.BaseDAO;
 
 @SuppressWarnings("serial")
 public class LdapGruppenDAO extends BaseDAO {

=== modified file 'src/de/sub/goobi/persistence/ProjektDAO.java'
--- src/de/sub/goobi/persistence/ProjektDAO.java	2012-03-10 13:31:03 +0000
+++ src/de/sub/goobi/persistence/ProjektDAO.java	2012-03-28 13:09:19 +0000
@@ -26,7 +26,6 @@
 
 import de.sub.goobi.beans.Projekt;
 import de.sub.goobi.helper.exceptions.DAOException;
-import dubious.sub.goobi.persistence.BaseDAO;
 
 public class ProjektDAO extends BaseDAO {
 

=== modified file 'src/de/sub/goobi/persistence/ProzessDAO.java'
--- src/de/sub/goobi/persistence/ProzessDAO.java	2012-03-10 13:31:03 +0000
+++ src/de/sub/goobi/persistence/ProzessDAO.java	2012-03-28 13:09:19 +0000
@@ -26,7 +26,6 @@
 
 import de.sub.goobi.beans.Prozess;
 import de.sub.goobi.helper.exceptions.DAOException;
-import dubious.sub.goobi.persistence.BaseDAO;
 
 public class ProzessDAO extends BaseDAO {
 

=== modified file 'src/de/sub/goobi/persistence/RegelsatzDAO.java'
--- src/de/sub/goobi/persistence/RegelsatzDAO.java	2012-03-10 13:31:03 +0000
+++ src/de/sub/goobi/persistence/RegelsatzDAO.java	2012-03-28 13:09:19 +0000
@@ -26,7 +26,6 @@
 
 import de.sub.goobi.beans.Regelsatz;
 import de.sub.goobi.helper.exceptions.DAOException;
-import dubious.sub.goobi.persistence.BaseDAO;
 
 public class RegelsatzDAO extends BaseDAO {
 

=== modified file 'src/de/sub/goobi/persistence/SchrittDAO.java'
--- src/de/sub/goobi/persistence/SchrittDAO.java	2012-03-10 13:31:03 +0000
+++ src/de/sub/goobi/persistence/SchrittDAO.java	2012-03-28 13:09:19 +0000
@@ -24,7 +24,6 @@
 
 import java.util.List;
 
-import dubious.sub.goobi.persistence.BaseDAO;
 import org.goobi.production.search.lucene.LuceneIndex;
 
 import de.sub.goobi.beans.Schritt;

=== modified file 'src/de/sub/goobi/persistence/SimpleDAO.java'
--- src/de/sub/goobi/persistence/SimpleDAO.java	2012-03-10 13:31:03 +0000
+++ src/de/sub/goobi/persistence/SimpleDAO.java	2012-03-28 13:09:19 +0000
@@ -23,7 +23,6 @@
 package de.sub.goobi.persistence;
 
 import de.sub.goobi.helper.exceptions.DAOException;
-import dubious.sub.goobi.persistence.BaseDAO;
 
 public class SimpleDAO extends BaseDAO {