slub.team team mailing list archive
-
slub.team team
-
Mailing list archive
-
Message #00092
[Merge] lp:~ralf-claussnitzer/goobi-production/bug-939367 into lp:goobi-production
Ralf Claussnitzer has proposed merging lp:~ralf-claussnitzer/goobi-production/bug-939367 into lp:goobi-production.
Requested reviews:
Henning Gerhardt (henning-gerhardt)
Related bugs:
Bug #939367 in Goobi.Production: "source file licensing clarification necessary"
https://bugs.launchpad.net/goobi-production/+bug/939367
For more details, see:
https://code.launchpad.net/~ralf-claussnitzer/goobi-production/bug-939367/+merge/96882
Source code files without proper licensing or potential copyright infringement have been moved to separate namespace and source directory.
--
https://code.launchpad.net/~ralf-claussnitzer/goobi-production/bug-939367/+merge/96882
Your team Saxon State Library Team is subscribed to branch lp:goobi-production.
=== modified file 'build.xml'
--- build.xml 2012-02-20 15:14:21 +0000
+++ build.xml 2012-03-10 15:35:19 +0000
@@ -51,6 +51,7 @@
<property name="doc.javadocs.dir" value="${build.dir}/javadoc"/>
<property name="test.report.dir" value="${build.dir}/test-reports/"/>
<property name="java.src.dir" value="${basedir}/src"/>
+ <property name="java.src.dubious.dir" value="${basedir}/src-dubious"/>
<!--==================================================
@@ -201,7 +202,7 @@
<!-- Compile application -->
<target name="compile" depends="init, copy-message-resources, copy-hibernate-resources">
- <javac includeAntRuntime="false" srcdir="${java.src.dir}" destdir="${build.classes}"
+ <javac includeAntRuntime="false" srcdir="${java.src.dir}:${java.src.dubious.dir}" destdir="${build.classes}"
source="${build.javac.source}"
target="${build.javac.target}"
encoding="UTF8"
@@ -221,7 +222,6 @@
</javac>
</target>
-
<!--==================================================
Distribution
==================================================-->
=== added directory 'src-dubious'
=== added directory 'src-dubious/dubious'
=== added directory 'src-dubious/dubious/sub'
=== added directory 'src-dubious/dubious/sub/goobi'
=== added directory 'src-dubious/dubious/sub/goobi/helper'
=== renamed file 'src/de/sub/goobi/helper/Page.java' => 'src-dubious/dubious/sub/goobi/helper/Page.java'
--- src/de/sub/goobi/helper/Page.java 2012-02-22 11:26:21 +0000
+++ src-dubious/dubious/sub/goobi/helper/Page.java 2012-03-10 15:35:19 +0000
@@ -1,34 +1,14 @@
/*
- * This file is part of the Goobi Application - a Workflow tool for the support of
- * mass digitization.
- *
- * Visit the websites for more information.
- * - http://gdz.sub.uni-goettingen.de
- * - http://www.goobi.org
- * - http://launchpad.net/goobi-production
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details. You
- * should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
* Created on Oct 27, 2004
*/
-package de.sub.goobi.helper;
+package dubious.sub.goobi.helper;
//TODO: What's the licence of this file?
import java.io.Serializable;
import java.util.List;
+import de.sub.goobi.helper.Helper;
+import de.sub.goobi.helper.PaginatingCriteria;
import org.apache.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
=== added directory 'src-dubious/dubious/sub/goobi/helper/encryption'
=== renamed file 'src/de/sub/goobi/helper/encryption/DesEncrypter.java' => 'src-dubious/dubious/sub/goobi/helper/encryption/DesEncrypter.java'
--- src/de/sub/goobi/helper/encryption/DesEncrypter.java 2012-02-22 11:26:21 +0000
+++ src-dubious/dubious/sub/goobi/helper/encryption/DesEncrypter.java 2012-03-10 15:35:19 +0000
@@ -1,29 +1,16 @@
-/*
- * This file is part of the Goobi Application - a Workflow tool for the support of
- * mass digitization.
- *
- * Visit the websites for more information.
- * - http://gdz.sub.uni-goettingen.de
- * - http://www.goobi.org
- * - http://launchpad.net/goobi-production
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details. You
- * should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA 02111-1307 USA
+/**
+ * This file is based on examples published at
+ * http://www.exampledepot.com/egs/javax.crypto/DesString.html
+ *
+ * Altough, the website permits free use of it example source code,
+ * there is no clear license specified: "Copy and paste these examples directly into your applications."
+ *
+ * Website "Terms of Use" site is not functional. By now, there is no way to contact the author of this code.
+ *
+ * @copyright 2009 Example Depot. All Rights Reserved.
+ *
*/
-
-package de.sub.goobi.helper.encryption;
-
-//TODO: Check the licence of this file
-// Stolen from http://www.exampledepot.com/egs/javax.crypto/DesString.html
+package dubious.sub.goobi.helper.encryption;
import java.io.UnsupportedEncodingException;
import java.security.InvalidAlgorithmParameterException;
=== renamed file 'src/de/sub/goobi/helper/encryption/MD4.java' => 'src-dubious/dubious/sub/goobi/helper/encryption/MD4.java'
--- src/de/sub/goobi/helper/encryption/MD4.java 2011-12-20 08:07:09 +0000
+++ src-dubious/dubious/sub/goobi/helper/encryption/MD4.java 2012-03-10 15:35:19 +0000
@@ -1,27 +1,27 @@
-/*
- * This file is part of the Goobi Application - a Workflow tool for the support of
- * mass digitization.
- *
- * Visit the websites for more information.
- * - http://gdz.sub.uni-goettingen.de
- * - http://www.goobi.org
- * - http://launchpad.net/goobi-production
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details. You
- * should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA 02111-1307 USA
+/**
+ * This file is propably based on source code from www.koders.com:
+ * http://www.koders.com/java/fidCB64C00823737175F66E292309DC88FE743893EA.aspx?s=md5
+ *
+ * www.koders.com is operated by Black Duck Software, Inc.
+ *
+ * Black Duck Software, Inc.
+ * 8 New England Executive Park
+ * Burlington, MA 01803
+ * Tel: +1 781.891.5100
+ * Fax: +1 781.891.5145
+ * Email: info@xxxxxxxxxxxxxxxxxxxxx
+ * http://www.blackducksoftware.com
+ *
+ * Black Duck Software Digital Millennium Copyright Act Notice
+ * http://corp.koders.com/dmca
+ *
+ * Black Duck Software respects the intellectual property of others. Black Duck Software may, in appropriate
+ * circumstances and at its sole discretion, terminate the access of users who infringe the copyright or intellectual
+ * property rights of others.
+ *
*/
+package dubious.sub.goobi.helper.encryption;
-package de.sub.goobi.helper.encryption;
-//TODO: What's the licence of this file?
public class MD4 {
private static int A, B, C, D;
=== renamed file 'src/de/sub/goobi/helper/encryption/MD5.java' => 'src-dubious/dubious/sub/goobi/helper/encryption/MD5.java'
--- src/de/sub/goobi/helper/encryption/MD5.java 2011-12-20 08:07:09 +0000
+++ src-dubious/dubious/sub/goobi/helper/encryption/MD5.java 2012-03-10 15:35:19 +0000
@@ -1,33 +1,8 @@
-/*
- * This file is part of the Goobi Application - a Workflow tool for the support of
- * mass digitization.
- *
- * Visit the websites for more information.
- * - http://gdz.sub.uni-goettingen.de
- * - http://www.goobi.org
- * - http://launchpad.net/goobi-production
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details. You
- * should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA 02111-1307 USA
- */
-
-package de.sub.goobi.helper.encryption;
+package dubious.sub.goobi.helper.encryption;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-//TODO: What's the licence of this file?
-
-
/**
* <u>MD5-Klasse, zum erzeugen von MD5-Hashes aus Zeichenketten</u><br><br>
* <b>Class:</b> MD5<br><br>
=== added directory 'src-dubious/dubious/sub/goobi/helper/exceptions'
=== renamed file 'src/de/sub/goobi/helper/exceptions/AbstractGoobiException.java' => 'src-dubious/dubious/sub/goobi/helper/exceptions/AbstractGoobiException.java'
--- src/de/sub/goobi/helper/exceptions/AbstractGoobiException.java 2011-12-20 08:07:09 +0000
+++ src-dubious/dubious/sub/goobi/helper/exceptions/AbstractGoobiException.java 2012-03-10 15:35:19 +0000
@@ -1,40 +1,19 @@
-/*
- * This file is part of the Goobi Application - a Workflow tool for the support of
- * mass digitization.
- *
- * Visit the websites for more information.
- * - http://gdz.sub.uni-goettingen.de
- * - http://www.goobi.org
- * - http://launchpad.net/goobi-production
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details. You
- * should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA 02111-1307 USA
+/**
+ * This file is based on work of Nick Heudecker.
+ *
+ * General purpose application exception. This class is a modified version
+ * of an exception class found in Matt Raible's example app, found at
+ * http://raibledesigns.com/wiki/Wiki.jsp?page=AppFuse
+ *
+ * @author <a href="mailto:nick@xxxxxxxxxxxxxxxx";>Nick Heudecker</a>
+ *
*/
-
-package de.sub.goobi.helper.exceptions;
-
-//TODO: What's the licence of this file?
+package dubious.sub.goobi.helper.exceptions;
+
import java.io.PrintStream;
import org.apache.log4j.Logger;
-/**
- General purpose application exception. This class is a modified version
- of an exception class found in Matt Raible's example app, found at
- http://raibledesigns.com/wiki/Wiki.jsp?page=AppFuse
-
- @author <a href="mailto:nick@xxxxxxxxxxxxxxxx";>Nick Heudecker</a>
- */
-
public abstract class AbstractGoobiException extends Exception {
private static final Logger myLogger = Logger.getLogger(AbstractGoobiException.class);
private static final long serialVersionUID = 967941638835011325L;
=== renamed file 'src/de/sub/goobi/helper/exceptions/InfrastructureException.java' => 'src-dubious/dubious/sub/goobi/helper/exceptions/InfrastructureException.java'
--- src/de/sub/goobi/helper/exceptions/InfrastructureException.java 2011-12-20 08:07:09 +0000
+++ src-dubious/dubious/sub/goobi/helper/exceptions/InfrastructureException.java 2012-03-10 15:35:19 +0000
@@ -1,27 +1,27 @@
-/*
- * This file is part of the Goobi Application - a Workflow tool for the support of
- * mass digitization.
- *
- * Visit the websites for more information.
- * - http://gdz.sub.uni-goettingen.de
- * - http://www.goobi.org
- * - http://launchpad.net/goobi-production
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details. You
- * should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA 02111-1307 USA
+/**
+ * This file is based on source code from www.koders.com:
+ * http://www.koders.com/java/fid32AAA6822935312790EAEB6F7232CE6F18CC8EAB.aspx
+ *
+ * www.koders.com is operated by Black Duck Software, Inc.
+ *
+ * Black Duck Software, Inc.
+ * 8 New England Executive Park
+ * Burlington, MA 01803
+ * Tel: +1 781.891.5100
+ * Fax: +1 781.891.5145
+ * Email: info@xxxxxxxxxxxxxxxxxxxxx
+ * http://www.blackducksoftware.com
+ *
+ * Black Duck Software Digital Millennium Copyright Act Notice
+ * http://corp.koders.com/dmca
+ *
+ * Black Duck Software respects the intellectual property of others. Black Duck Software may, in appropriate
+ * circumstances and at its sole discretion, terminate the access of users who infringe the copyright or intellectual
+ * property rights of others.
+ *
*/
+package dubious.sub.goobi.helper.exceptions;
-package de.sub.goobi.helper.exceptions;
-//TODO: What's the licence of this file?
/**
* This exception is used to mark (fatal) failures in infrastructure and system code.
*
=== added directory 'src-dubious/dubious/sub/goobi/persistence'
=== renamed file 'src/de/sub/goobi/persistence/BaseDAO.java' => 'src-dubious/dubious/sub/goobi/persistence/BaseDAO.java'
--- src/de/sub/goobi/persistence/BaseDAO.java 2012-02-22 13:57:45 +0000
+++ src-dubious/dubious/sub/goobi/persistence/BaseDAO.java 2012-03-10 15:35:19 +0000
@@ -1,33 +1,20 @@
-/*
- * This file is part of the Goobi Application - a Workflow tool for the support of
- * mass digitization.
- *
- * Visit the websites for more information.
- * - http://gdz.sub.uni-goettingen.de
- * - http://www.goobi.org
- * - http://launchpad.net/goobi-production
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details. You
- * should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA 02111-1307 USA
+/**
+ * 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>
*/
-
-package de.sub.goobi.persistence;
-
-//TODO: What's the licence of this file?
-//TODO: Use Generics
+package dubious.sub.goobi.persistence;
+
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;
=== modified file 'src/de/sub/goobi/beans/Benutzer.java'
--- src/de/sub/goobi/beans/Benutzer.java 2012-02-22 07:43:02 +0000
+++ src/de/sub/goobi/beans/Benutzer.java 2012-03-10 15:35:19 +0000
@@ -32,7 +32,7 @@
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
-import de.sub.goobi.helper.encryption.DesEncrypter;
+import dubious.sub.goobi.helper.encryption.DesEncrypter;
import de.sub.goobi.helper.ldap.Ldap;
public class Benutzer implements Serializable {
=== modified file 'src/de/sub/goobi/forms/AdministrationForm.java'
--- src/de/sub/goobi/forms/AdministrationForm.java 2012-02-22 07:43:02 +0000
+++ src/de/sub/goobi/forms/AdministrationForm.java 2012-03-10 15:35:19 +0000
@@ -36,6 +36,8 @@
import java.util.Set;
import java.util.StringTokenizer;
+import dubious.sub.goobi.helper.encryption.DesEncrypter;
+import dubious.sub.goobi.helper.encryption.MD5;
import org.apache.commons.lang.SystemUtils;
import org.apache.log4j.Logger;
import org.goobi.production.flow.jobs.HistoryAnalyserJob;
@@ -70,8 +72,6 @@
import de.sub.goobi.helper.UghHelper;
import de.sub.goobi.helper.XmlArtikelZaehlen;
import de.sub.goobi.helper.XmlArtikelZaehlen.CountType;
-import de.sub.goobi.helper.encryption.DesEncrypter;
-import de.sub.goobi.helper.encryption.MD5;
import de.sub.goobi.helper.exceptions.DAOException;
import de.sub.goobi.helper.exceptions.SwapException;
import de.sub.goobi.helper.exceptions.UghHelperException;
=== modified file 'src/de/sub/goobi/forms/AktuelleSchritteForm.java'
--- src/de/sub/goobi/forms/AktuelleSchritteForm.java 2012-02-22 11:26:21 +0000
+++ src/de/sub/goobi/forms/AktuelleSchritteForm.java 2012-03-10 15:35:19 +0000
@@ -35,6 +35,7 @@
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpServletResponse;
+import dubious.sub.goobi.helper.Page;
import org.apache.log4j.Logger;
import org.apache.xmlrpc.XmlRpcException;
import org.goobi.production.api.property.xmlbasedprovider.impl.PropertyTemplate;
@@ -66,7 +67,6 @@
import de.sub.goobi.helper.FileUtils;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.HelperSchritte;
-import de.sub.goobi.helper.Page;
import de.sub.goobi.helper.WebDav;
import de.sub.goobi.helper.enums.HistoryEventType;
import de.sub.goobi.helper.enums.PropertyType;
=== modified file 'src/de/sub/goobi/forms/BasisForm.java'
--- src/de/sub/goobi/forms/BasisForm.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/forms/BasisForm.java 2012-03-10 15:35:19 +0000
@@ -24,12 +24,12 @@
import java.io.Serializable;
+import dubious.sub.goobi.helper.Page;
import org.apache.log4j.Logger;
import de.sub.goobi.beans.Benutzer;
import de.sub.goobi.persistence.BenutzerDAO;
import de.sub.goobi.helper.Helper;
-import de.sub.goobi.helper.Page;
import de.sub.goobi.helper.exceptions.DAOException;
public class BasisForm implements Serializable {
=== modified file 'src/de/sub/goobi/forms/BenutzergruppenForm.java'
--- src/de/sub/goobi/forms/BenutzergruppenForm.java 2012-02-22 07:43:02 +0000
+++ src/de/sub/goobi/forms/BenutzergruppenForm.java 2012-03-10 15:35:19 +0000
@@ -22,6 +22,7 @@
package de.sub.goobi.forms;
+import dubious.sub.goobi.helper.Page;
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
import org.hibernate.Session;
@@ -30,7 +31,6 @@
import de.sub.goobi.beans.Benutzergruppe;
import de.sub.goobi.persistence.BenutzergruppenDAO;
import de.sub.goobi.helper.Helper;
-import de.sub.goobi.helper.Page;
import de.sub.goobi.helper.exceptions.DAOException;
public class BenutzergruppenForm extends BasisForm {
=== modified file 'src/de/sub/goobi/forms/BenutzerverwaltungForm.java'
--- src/de/sub/goobi/forms/BenutzerverwaltungForm.java 2012-02-22 07:43:02 +0000
+++ src/de/sub/goobi/forms/BenutzerverwaltungForm.java 2012-03-10 15:35:19 +0000
@@ -39,6 +39,7 @@
import javax.faces.model.SelectItem;
import javax.servlet.http.HttpSession;
+import dubious.sub.goobi.helper.Page;
import org.apache.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
@@ -56,7 +57,6 @@
import de.sub.goobi.persistence.LdapGruppenDAO;
import de.sub.goobi.persistence.ProjektDAO;
import de.sub.goobi.helper.Helper;
-import de.sub.goobi.helper.Page;
import de.sub.goobi.helper.exceptions.DAOException;
import de.sub.goobi.helper.ldap.Ldap;
=== modified file 'src/de/sub/goobi/forms/LdapGruppenForm.java'
--- src/de/sub/goobi/forms/LdapGruppenForm.java 2012-02-22 07:43:02 +0000
+++ src/de/sub/goobi/forms/LdapGruppenForm.java 2012-03-10 15:35:19 +0000
@@ -22,6 +22,7 @@
package de.sub.goobi.forms;
+import dubious.sub.goobi.helper.Page;
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
import org.hibernate.Session;
@@ -30,7 +31,6 @@
import de.sub.goobi.beans.LdapGruppe;
import de.sub.goobi.persistence.LdapGruppenDAO;
import de.sub.goobi.helper.Helper;
-import de.sub.goobi.helper.Page;
import de.sub.goobi.helper.exceptions.DAOException;
public class LdapGruppenForm extends BasisForm {
=== modified file 'src/de/sub/goobi/forms/ProjekteForm.java'
--- src/de/sub/goobi/forms/ProjekteForm.java 2012-02-22 11:26:21 +0000
+++ src/de/sub/goobi/forms/ProjekteForm.java 2012-03-10 15:35:19 +0000
@@ -37,6 +37,7 @@
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
+import dubious.sub.goobi.helper.Page;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.goobi.production.chart.IProjectTask;
@@ -70,7 +71,6 @@
import de.sub.goobi.persistence.ProjektDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
-import de.sub.goobi.helper.Page;
import de.sub.goobi.helper.exceptions.DAOException;
public class ProjekteForm extends BasisForm {
=== modified file 'src/de/sub/goobi/forms/ProzessverwaltungForm.java'
--- src/de/sub/goobi/forms/ProzessverwaltungForm.java 2012-03-06 12:14:40 +0000
+++ src/de/sub/goobi/forms/ProzessverwaltungForm.java 2012-03-10 15:35:19 +0000
@@ -37,6 +37,7 @@
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
+import dubious.sub.goobi.helper.Page;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -80,7 +81,6 @@
import de.sub.goobi.helper.GoobiScript;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.HelperSchritte;
-import de.sub.goobi.helper.Page;
import de.sub.goobi.helper.WebDav;
import de.sub.goobi.helper.XmlArtikelZaehlen;
import de.sub.goobi.helper.XmlArtikelZaehlen.CountType;
=== modified file 'src/de/sub/goobi/forms/RegelsaetzeForm.java'
--- src/de/sub/goobi/forms/RegelsaetzeForm.java 2012-02-22 07:43:02 +0000
+++ src/de/sub/goobi/forms/RegelsaetzeForm.java 2012-03-10 15:35:19 +0000
@@ -22,6 +22,7 @@
package de.sub.goobi.forms;
+import dubious.sub.goobi.helper.Page;
import org.apache.log4j.Logger;
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
@@ -31,7 +32,6 @@
import de.sub.goobi.beans.Regelsatz;
import de.sub.goobi.persistence.RegelsatzDAO;
import de.sub.goobi.helper.Helper;
-import de.sub.goobi.helper.Page;
import de.sub.goobi.helper.exceptions.DAOException;
public class RegelsaetzeForm extends BasisForm {
=== removed directory 'src/de/sub/goobi/helper/encryption'
=== modified file 'src/de/sub/goobi/helper/exceptions/DAOException.java'
--- src/de/sub/goobi/helper/exceptions/DAOException.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/exceptions/DAOException.java 2012-03-10 15:35:19 +0000
@@ -22,6 +22,8 @@
package de.sub.goobi.helper.exceptions;
+import dubious.sub.goobi.helper.exceptions.AbstractGoobiException;
+
public class DAOException extends AbstractGoobiException {
private static final long serialVersionUID = 3174737519370361577L;
=== modified file 'src/de/sub/goobi/helper/exceptions/ExportFileException.java'
--- src/de/sub/goobi/helper/exceptions/ExportFileException.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/exceptions/ExportFileException.java 2012-03-10 15:35:19 +0000
@@ -22,7 +22,9 @@
package de.sub.goobi.helper.exceptions;
-public class ExportFileException extends AbstractGoobiException {
+import dubious.sub.goobi.helper.exceptions.AbstractGoobiException;
+
+public class ExportFileException extends AbstractGoobiException {
private static final long serialVersionUID = 8440137060804389036L;
public ExportFileException()
=== modified file 'src/de/sub/goobi/helper/exceptions/InvalidImagesException.java'
--- src/de/sub/goobi/helper/exceptions/InvalidImagesException.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/exceptions/InvalidImagesException.java 2012-03-10 15:35:19 +0000
@@ -22,6 +22,8 @@
package de.sub.goobi.helper.exceptions;
+import dubious.sub.goobi.helper.exceptions.AbstractGoobiException;
+
public class InvalidImagesException extends AbstractGoobiException {
private static final long serialVersionUID = -2677207359216957351L;
=== modified file 'src/de/sub/goobi/helper/exceptions/ShellException.java'
--- src/de/sub/goobi/helper/exceptions/ShellException.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/exceptions/ShellException.java 2012-03-10 15:35:19 +0000
@@ -22,6 +22,8 @@
package de.sub.goobi.helper.exceptions;
+import dubious.sub.goobi.helper.exceptions.AbstractGoobiException;
+
public class ShellException extends AbstractGoobiException {
private static final long serialVersionUID = 532300544435312682L;
=== modified file 'src/de/sub/goobi/helper/exceptions/SwapException.java'
--- src/de/sub/goobi/helper/exceptions/SwapException.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/exceptions/SwapException.java 2012-03-10 15:35:19 +0000
@@ -22,6 +22,8 @@
package de.sub.goobi.helper.exceptions;
+import dubious.sub.goobi.helper.exceptions.AbstractGoobiException;
+
public class SwapException extends AbstractGoobiException {
private static final long serialVersionUID = 3257853198839724340L;
=== modified file 'src/de/sub/goobi/helper/exceptions/UghHelperException.java'
--- src/de/sub/goobi/helper/exceptions/UghHelperException.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/exceptions/UghHelperException.java 2012-03-10 15:35:19 +0000
@@ -22,6 +22,8 @@
package de.sub.goobi.helper.exceptions;
+import dubious.sub.goobi.helper.exceptions.AbstractGoobiException;
+
public class UghHelperException extends AbstractGoobiException {
private static final long serialVersionUID = -7355142413216742677L;
=== modified file 'src/de/sub/goobi/helper/exceptions/WrongImportFileException.java'
--- src/de/sub/goobi/helper/exceptions/WrongImportFileException.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/exceptions/WrongImportFileException.java 2012-03-10 15:35:19 +0000
@@ -22,6 +22,8 @@
package de.sub.goobi.helper.exceptions;
+import dubious.sub.goobi.helper.exceptions.AbstractGoobiException;
+
public class WrongImportFileException extends AbstractGoobiException {
private static final long serialVersionUID = 3257853198839724340L;
=== modified file 'src/de/sub/goobi/helper/ldap/Ldap.java'
--- src/de/sub/goobi/helper/ldap/Ldap.java 2012-02-22 07:43:02 +0000
+++ src/de/sub/goobi/helper/ldap/Ldap.java 2012-03-10 15:35:19 +0000
@@ -46,13 +46,13 @@
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchResult;
+import dubious.sub.goobi.helper.encryption.MD4;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
import de.sub.goobi.beans.Benutzer;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
-import de.sub.goobi.helper.encryption.MD4;
public class Ldap {
private static final Logger myLogger = Logger.getLogger(Ldap.class);
=== modified file 'src/de/sub/goobi/helper/ldap/LdapUser.java'
--- src/de/sub/goobi/helper/ldap/LdapUser.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/helper/ldap/LdapUser.java 2012-03-10 15:35:19 +0000
@@ -50,13 +50,13 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
+import dubious.sub.goobi.helper.encryption.MD4;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
import de.sub.goobi.beans.Benutzer;
import de.sub.goobi.beans.LdapGruppe;
import de.sub.goobi.config.ConfigMain;
-import de.sub.goobi.helper.encryption.MD4;
/**
* This class is used by the DirObj example. It is a DirContext class that can be stored by service providers like the LDAP system providers.
=== modified file 'src/de/sub/goobi/persistence/BenutzerDAO.java'
--- src/de/sub/goobi/persistence/BenutzerDAO.java 2012-02-22 13:57:45 +0000
+++ src/de/sub/goobi/persistence/BenutzerDAO.java 2012-03-10 15:35:19 +0000
@@ -26,6 +26,7 @@
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 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/persistence/BenutzergruppenDAO.java 2012-03-10 15:35:19 +0000
@@ -26,6 +26,7 @@
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/HibernateUtilOld.java'
--- src/de/sub/goobi/persistence/HibernateUtilOld.java 2012-02-22 11:26:21 +0000
+++ src/de/sub/goobi/persistence/HibernateUtilOld.java 2012-03-10 15:35:19 +0000
@@ -22,6 +22,7 @@
package de.sub.goobi.persistence;
+import dubious.sub.goobi.helper.exceptions.InfrastructureException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.HibernateException;
@@ -31,8 +32,6 @@
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
-import de.sub.goobi.helper.exceptions.InfrastructureException;
-
//TODO: Fix for Hibernate-Session-Management, replaced with older version,
// the newer version follows on bottom of this class
=== modified file 'src/de/sub/goobi/persistence/LdapGruppenDAO.java'
--- src/de/sub/goobi/persistence/LdapGruppenDAO.java 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/persistence/LdapGruppenDAO.java 2012-03-10 15:35:19 +0000
@@ -26,6 +26,7 @@
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-02-22 07:43:02 +0000
+++ src/de/sub/goobi/persistence/ProjektDAO.java 2012-03-10 15:35:19 +0000
@@ -26,6 +26,7 @@
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 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/persistence/ProzessDAO.java 2012-03-10 15:35:19 +0000
@@ -26,6 +26,7 @@
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 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/persistence/RegelsatzDAO.java 2012-03-10 15:35:19 +0000
@@ -26,6 +26,7 @@
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 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/persistence/SchrittDAO.java 2012-03-10 15:35:19 +0000
@@ -24,6 +24,7 @@
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 2011-12-20 08:07:09 +0000
+++ src/de/sub/goobi/persistence/SimpleDAO.java 2012-03-10 15:35:19 +0000
@@ -23,6 +23,7 @@
package de.sub.goobi.persistence;
import de.sub.goobi.helper.exceptions.DAOException;
+import dubious.sub.goobi.persistence.BaseDAO;
public class SimpleDAO extends BaseDAO {
=== added directory 'test/src/dubious'
=== added directory 'test/src/dubious/sub'
=== added directory 'test/src/dubious/sub/goobi'
=== added directory 'test/src/dubious/sub/goobi/helper'
=== added directory 'test/src/dubious/sub/goobi/helper/encryption'
=== renamed file 'test/src/de/sub/goobi/helper/encryption/DesEncrypterTest.java' => 'test/src/dubious/sub/goobi/helper/encryption/DesEncrypterTest.java'
--- test/src/de/sub/goobi/helper/encryption/DesEncrypterTest.java 2012-02-15 14:39:13 +0000
+++ test/src/dubious/sub/goobi/helper/encryption/DesEncrypterTest.java 2012-03-10 15:35:19 +0000
@@ -1,14 +1,13 @@
-package de.sub.goobi.helper.encryption;
+package dubious.sub.goobi.helper.encryption;
import static org.junit.Assert.assertTrue;
import java.util.HashMap;
import java.util.Map;
+import dubious.sub.goobi.helper.encryption.DesEncrypter;
import org.junit.Test;
-import de.sub.goobi.helper.encryption.DesEncrypter;
-
public class DesEncrypterTest {
static Map<String, String> testData;
Follow ups
