slub.team team mailing list archive
-
slub.team team
-
Mailing list archive
-
Message #00037
[Merge] lp:~henning-gerhardt/goobi-production/bug-754438 into lp:goobi-production
Henning Gerhardt has proposed merging lp:~henning-gerhardt/goobi-production/bug-754438 into lp:goobi-production.
Requested reviews:
Ralf Claussnitzer (ralf-claussnitzer)
Related bugs:
Bug #754438 in Goobi.Production: "Misspelled package names"
https://bugs.launchpad.net/goobi-production/+bug/754438
For more details, see:
https://code.launchpad.net/~henning-gerhardt/goobi-production/bug-754438/+merge/85611
Renaming wrong spelled packages name.
--
https://code.launchpad.net/~henning-gerhardt/goobi-production/bug-754438/+merge/85611
Your team Saxon State Library Team is subscribed to branch lp:goobi-production.
=== modified file 'WEB-INF/faces-config.xml'
--- WEB-INF/faces-config.xml 2011-12-01 12:44:42 +0000
+++ WEB-INF/faces-config.xml 2011-12-14 08:37:30 +0000
@@ -306,28 +306,28 @@
</navigation-case>
</navigation-rule>
- <!-- RuleSet Converter for Select-Boxes -->
+ <!-- RuleSet converter for Select-Boxes -->
<converter>
<converter-id>RegelsatzConverter</converter-id>
- <converter-class>de.sub.goobi.Converter.RegelsatzConverter</converter-class>
+ <converter-class>de.sub.goobi.converter.RegelsatzConverter</converter-class>
</converter>
<!-- StatisticsTimeUnitConverter for Select-Boxes -->
<converter>
<converter-id>StatisticsTimeUnitConverter</converter-id>
- <converter-class>de.sub.goobi.Converter.StatisticsTimeUnitConverter</converter-class>
+ <converter-class>de.sub.goobi.converter.StatisticsTimeUnitConverter</converter-class>
</converter>
<!-- StatisticResultOutputConverter for Select-Boxes -->
<converter>
<converter-id>StatisticsResultOutputConverter</converter-id>
- <converter-class>de.sub.goobi.Converter.StatisticsResultOutputConverter</converter-class>
+ <converter-class>de.sub.goobi.converter.StatisticsResultOutputConverter</converter-class>
</converter>
<!-- StatisticCalculationUnitConverter for Select-Boxes -->
<converter>
<converter-id>StatisticsCalculationUnitConverter</converter-id>
- <converter-class>de.sub.goobi.Converter.StatisticsCalculationUnitConverter</converter-class>
+ <converter-class>de.sub.goobi.converter.StatisticsCalculationUnitConverter</converter-class>
</converter>
<!-- Beans (formaly known as config_Beans.xml) -->
@@ -335,112 +335,112 @@
<!-- BenutzerverwaltungForm -->
<managed-bean>
<managed-bean-name>BenutzerverwaltungForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.BenutzerverwaltungForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.BenutzerverwaltungForm</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<!-- PreferencesForm -->
<managed-bean>
<managed-bean-name>RegelsaetzeForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.RegelsaetzeForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.RegelsaetzeForm</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
<!-- LdapGruppenForm -->
<managed-bean>
<managed-bean-name>LdapGruppenForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.LdapGruppenForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.LdapGruppenForm</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
<!-- BenutzergruppenForm -->
<managed-bean>
<managed-bean-name>BenutzergruppenForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.BenutzergruppenForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.BenutzergruppenForm</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<!-- LoginForm -->
<managed-bean>
<managed-bean-name>LoginForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.LoginForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.LoginForm</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<!-- SpracheForm -->
<managed-bean>
<managed-bean-name>SpracheForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.SpracheForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.SpracheForm</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<!-- NavigationForm -->
<managed-bean>
<managed-bean-name>NavigationForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.NavigationForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.NavigationForm</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<!-- StatistikForm -->
<managed-bean>
<managed-bean-name>StatistikForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.StatistikForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.StatistikForm</managed-bean-class>
<managed-bean-scope>application</managed-bean-scope>
</managed-bean>
<!-- Bean für Administrationsaufgaben -->
<managed-bean>
<managed-bean-name>AdministrationForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.AdministrationForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.AdministrationForm</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
<!-- Bean für Prozessverwaltung -->
<managed-bean>
<managed-bean-name>ProzessverwaltungForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.ProzessverwaltungForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.ProzessverwaltungForm</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<!-- Bean für Projekte -->
<managed-bean>
<managed-bean-name>ProjekteForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.ProjekteForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.ProjekteForm</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<!-- Bean für Prozesskopie -->
<managed-bean>
<managed-bean-name>ProzesskopieForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.ProzesskopieForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.ProzesskopieForm</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<!-- Bean für Aktuelle Schritte -->
<managed-bean>
<managed-bean-name>AktuelleSchritteForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.AktuelleSchritteForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.AktuelleSchritteForm</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<!-- Helper-Bean -->
<managed-bean>
<managed-bean-name>HelperForm</managed-bean-name>
- <managed-bean-class>de.sub.goobi.Forms.HelperForm</managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.HelperForm</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<!-- ModuleServer-Bean -->
<managed-bean>
<managed-bean-name>ModuleServerForm</managed-bean-name>
- <managed-bean-class>de.sub.goobi.Forms.ModuleServerForm</managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.ModuleServerForm</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<!-- HibernateSessionLong-Bean -->
<managed-bean>
<managed-bean-name>HibernateSessionLong</managed-bean-name>
- <managed-bean-class>de.sub.goobi.Persistence.HibernateSessionLong</managed-bean-class>
+ <managed-bean-class>de.sub.goobi.persistence.HibernateSessionLong</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
=== modified file 'WEB-INF/metadata-editor-config.xml'
--- WEB-INF/metadata-editor-config.xml 2011-07-05 00:44:26 +0000
+++ WEB-INF/metadata-editor-config.xml 2011-12-14 08:37:30 +0000
@@ -43,28 +43,28 @@
<!-- Bean für Sessions -->
<managed-bean>
<managed-bean-name>SessionForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.SessionForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.SessionForm</managed-bean-class>
<managed-bean-scope>application</managed-bean-scope>
</managed-bean>
<!-- Bean für Metadaten -->
<managed-bean>
<managed-bean-name>Metadaten</managed-bean-name>
- <managed-bean-class>de.sub.goobi.Metadaten.Metadaten </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.metadaten.Metadaten</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<!-- Bean für Metadaten-Sperrung -->
<managed-bean>
<managed-bean-name>MetadatenSperrung</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Metadaten.MetadatenSperrung </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.metadaten.MetadatenSperrung</managed-bean-class>
<managed-bean-scope>application</managed-bean-scope>
</managed-bean>
<!-- Bean für lang laufende (administrative) Aufgaben -->
<managed-bean>
<managed-bean-name>LongRunningTasksForm</managed-bean-name>
- <managed-bean-class> de.sub.goobi.Forms.LongRunningTasksForm </managed-bean-class>
+ <managed-bean-class>de.sub.goobi.forms.LongRunningTasksForm</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
=== modified file 'WEB-INF/web.xml'
--- WEB-INF/web.xml 2011-12-01 12:44:42 +0000
+++ WEB-INF/web.xml 2011-12-14 08:37:30 +0000
@@ -124,7 +124,7 @@
<!--
<filter>
<filter-name>HibernateFilter</filter-name>
- <filter-class>de.sub.goobi.Persistence.HibernateSessionConversationFilter</filter-class>
+ <filter-class>de.sub.goobi.persistence.HibernateSessionConversationFilter</filter-class>
</filter>
-->
@@ -195,7 +195,7 @@
<!--
Listener für die Modularisierung <listener> <listener-class>
- de.sub.goobi.Modul.ModulListener </listener-class> </listener>
+ de.sub.goobi.modul.ModulListener </listener-class> </listener>
-->
<!-- Listener for JobManager -->
=== modified file 'config/hibernate.cfg.xml'
--- config/hibernate.cfg.xml 2011-12-01 13:34:59 +0000
+++ config/hibernate.cfg.xml 2011-12-14 08:37:30 +0000
@@ -46,22 +46,22 @@
<property name="hbm2ddl.auto">update</property>
<!-- Die einzelnen Mappings -->
- <mapping resource="de/sub/goobi/Beans/Benutzergruppe.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/Benutzereigenschaft.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/Benutzer.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/Prozess.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/Prozesseigenschaft.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/Schritt.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/Schritteigenschaft.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/Werkstueck.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/Werkstueckeigenschaft.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/Vorlage.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/Vorlageeigenschaft.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/Projekt.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/Regelsatz.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/LdapGruppe.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/ProjectFileGroup.hbm.xml" />
- <mapping resource="de/sub/goobi/Beans/HistoryEvent.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/Benutzergruppe.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/Benutzereigenschaft.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/Benutzer.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/Prozess.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/Prozesseigenschaft.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/Schritt.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/Schritteigenschaft.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/Werkstueck.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/Werkstueckeigenschaft.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/Vorlage.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/Vorlageeigenschaft.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/Projekt.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/Regelsatz.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/LdapGruppe.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/ProjectFileGroup.hbm.xml" />
+ <mapping resource="de/sub/goobi/beans/HistoryEvent.hbm.xml" />
</session-factory>
=== modified file 'src/de/sub/goobi/Import/Import.java'
--- src/de/sub/goobi/Import/Import.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/Import/Import.java 2011-12-14 08:37:30 +0000
@@ -13,7 +13,7 @@
import ugh.exceptions.TypeNotAllowedAsChildException;
import ugh.exceptions.TypeNotAllowedForParentException;
import ugh.exceptions.WriteException;
-import de.sub.goobi.Beans.Schritt;
+import de.sub.goobi.beans.Schritt;
import de.sub.goobi.helper.exceptions.DAOException;
import de.sub.goobi.helper.exceptions.SwapException;
import de.sub.goobi.helper.exceptions.WrongImportFileException;
=== modified file 'src/de/sub/goobi/Import/ImportRussland.java'
--- src/de/sub/goobi/Import/ImportRussland.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/Import/ImportRussland.java 2011-12-14 08:37:30 +0000
@@ -22,7 +22,7 @@
import ugh.exceptions.TypeNotAllowedAsChildException;
import ugh.exceptions.TypeNotAllowedForParentException;
import ugh.exceptions.WriteException;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.exceptions.DAOException;
import de.sub.goobi.helper.exceptions.SwapException;
import de.sub.goobi.helper.exceptions.WrongImportFileException;
=== modified file 'src/de/sub/goobi/Import/ImportZentralblatt.java'
--- src/de/sub/goobi/Import/ImportZentralblatt.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/Import/ImportZentralblatt.java 2011-12-14 08:37:30 +0000
@@ -24,7 +24,7 @@
import ugh.exceptions.TypeNotAllowedForParentException;
import ugh.exceptions.WriteException;
import ugh.fileformats.mets.XStream;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.exceptions.WrongImportFileException;
=== renamed directory 'src/de/sub/goobi/Beans' => 'src/de/sub/goobi/beans'
=== modified file 'src/de/sub/goobi/beans/Benutzer.hbm.xml'
--- src/de/sub/goobi/Beans/Benutzer.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Benutzer.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.Benutzer" table="benutzer">
+ <class name="de.sub.goobi.beans.Benutzer" table="benutzer">
<id name="id" column="BenutzerID" type="integer">
<generator class="native"/>
</id>
@@ -23,31 +23,31 @@
<property name="confVorgangsdatumAnzeigen" column="confVorgangsdatumAnzeigen"/>
<property name="tabellengroesse" column="Tabellengroesse" type="integer"/>
<property name="sessiontimeout" column="sessiontimeout" type="integer"/>
- <many-to-one name="ldapGruppe" class="de.sub.goobi.Beans.LdapGruppe" column="ldapgruppenID"/>
+ <many-to-one name="ldapGruppe" class="de.sub.goobi.beans.LdapGruppe" column="ldapgruppenID"/>
<set name="bearbeitungsschritte" cascade="all,delete-orphan" inverse="true" lazy="true">
<key column="BearbeitungsBenutzerID"/>
- <one-to-many class="de.sub.goobi.Beans.Schritt"/>
+ <one-to-many class="de.sub.goobi.beans.Schritt"/>
</set>
<set name="benutzergruppen" table="benutzergruppenmitgliedschaft" lazy="true">
<key column="BenutzerID"/>
- <many-to-many column="BenutzerGruppenID" class="de.sub.goobi.Beans.Benutzergruppe"/>
+ <many-to-many column="BenutzerGruppenID" class="de.sub.goobi.beans.Benutzergruppe"/>
</set>
<set name="projekte" table="projektbenutzer" lazy="true">
<key column="BenutzerID"/>
- <many-to-many column="ProjekteID" class="de.sub.goobi.Beans.Projekt"/>
+ <many-to-many column="ProjekteID" class="de.sub.goobi.beans.Projekt"/>
</set>
<set name="schritte" table="schritteberechtigtebenutzer" inverse="true">
<key column="BenutzerID"/>
- <many-to-many column="schritteID" class="de.sub.goobi.Beans.Schritt"/>
+ <many-to-many column="schritteID" class="de.sub.goobi.beans.Schritt"/>
</set>
<set name="eigenschaften" cascade="all,delete-orphan" inverse="true" order-by="titel" lazy="false">
<key column="BenutzerID"/>
- <one-to-many class="de.sub.goobi.Beans.Benutzereigenschaft"/>
+ <one-to-many class="de.sub.goobi.beans.Benutzereigenschaft"/>
</set>
</class>
=== modified file 'src/de/sub/goobi/beans/Benutzer.java'
--- src/de/sub/goobi/Beans/Benutzer.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Benutzer.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.File;
import java.io.IOException;
=== modified file 'src/de/sub/goobi/beans/Benutzereigenschaft.hbm.xml'
--- src/de/sub/goobi/Beans/Benutzereigenschaft.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Benutzereigenschaft.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.Benutzereigenschaft" table="benutzereigenschaften">
+ <class name="de.sub.goobi.beans.Benutzereigenschaft" table="benutzereigenschaften">
<id name="id" column="benutzereigenschaftenID" type="integer">
<generator class="native" />
</id>
@@ -17,7 +17,7 @@
<property name="auswahl" column="Auswahl" type="string" />
<property name="creationDate" column="creationDate" type="timestamp"/>
- <many-to-one name="benutzer" class="de.sub.goobi.Beans.Benutzer" column="BenutzerID"/>
+ <many-to-one name="benutzer" class="de.sub.goobi.beans.Benutzer" column="BenutzerID"/>
</class>
=== modified file 'src/de/sub/goobi/beans/Benutzereigenschaft.java'
--- src/de/sub/goobi/Beans/Benutzereigenschaft.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Benutzereigenschaft.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
import java.util.ArrayList;
@@ -7,8 +7,8 @@
import org.goobi.production.api.property.xmlbasedprovider.Status;
-import de.sub.goobi.Beans.Property.IGoobiEntity;
-import de.sub.goobi.Beans.Property.IGoobiProperty;
+import de.sub.goobi.beans.property.IGoobiEntity;
+import de.sub.goobi.beans.property.IGoobiProperty;
import de.sub.goobi.helper.enums.PropertyType;
public class Benutzereigenschaft implements Serializable, IGoobiProperty {
=== modified file 'src/de/sub/goobi/beans/Benutzergruppe.hbm.xml'
--- src/de/sub/goobi/Beans/Benutzergruppe.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Benutzergruppe.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.Benutzergruppe" table="benutzergruppen">
+ <class name="de.sub.goobi.beans.Benutzergruppe" table="benutzergruppen">
<id name="id" column="BenutzergruppenID" type="integer">
<generator class="native" />
</id>
@@ -15,12 +15,12 @@
<set name="benutzer" table="benutzergruppenmitgliedschaft" inverse="true">
<key column="BenutzerGruppenID"/>
- <many-to-many column="BenutzerID" class="de.sub.goobi.Beans.Benutzer"/>
+ <many-to-many column="BenutzerID" class="de.sub.goobi.beans.Benutzer"/>
</set>
<set name="schritte" table="schritteberechtigtegruppen" inverse="true">
<key column="BenutzerGruppenID"/>
- <many-to-many column="schritteID" class="de.sub.goobi.Beans.Schritt"/>
+ <many-to-many column="schritteID" class="de.sub.goobi.beans.Schritt"/>
</set>
</class>
=== modified file 'src/de/sub/goobi/beans/Benutzergruppe.java'
--- src/de/sub/goobi/Beans/Benutzergruppe.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Benutzergruppe.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
import java.util.ArrayList;
=== modified file 'src/de/sub/goobi/beans/HistoryEvent.hbm.xml'
--- src/de/sub/goobi/Beans/HistoryEvent.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/HistoryEvent.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.HistoryEvent" table="history">
+ <class name="de.sub.goobi.beans.HistoryEvent" table="history">
<id name="id" column="historyid" type="integer">
<generator class="native" />
</id>
@@ -15,7 +15,7 @@
<property name="type" column="type" type="integer" />
<property name="date" column="date" type="timestamp" />
- <many-to-one name="process" class="de.sub.goobi.Beans.Prozess" column="processID"/>
+ <many-to-one name="process" class="de.sub.goobi.beans.Prozess" column="processID"/>
</class>
=== modified file 'src/de/sub/goobi/beans/HistoryEvent.java'
--- src/de/sub/goobi/Beans/HistoryEvent.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/HistoryEvent.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
import java.util.Date;
=== modified file 'src/de/sub/goobi/beans/LdapGruppe.hbm.xml'
--- src/de/sub/goobi/Beans/LdapGruppe.hbm.xml 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/beans/LdapGruppe.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.LdapGruppe" table="ldapgruppen">
+ <class name="de.sub.goobi.beans.LdapGruppe" table="ldapgruppen">
<id name="id" column="ldapgruppenID" type="integer">
<generator class="native"/>
</id>
=== modified file 'src/de/sub/goobi/beans/LdapGruppe.java'
--- src/de/sub/goobi/Beans/LdapGruppe.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/beans/LdapGruppe.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
=== modified file 'src/de/sub/goobi/beans/ProjectFileGroup.hbm.xml'
--- src/de/sub/goobi/Beans/ProjectFileGroup.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/ProjectFileGroup.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.ProjectFileGroup" table="projectfilegroups">
+ <class name="de.sub.goobi.beans.ProjectFileGroup" table="projectfilegroups">
<id name="id" column="ProjectFileGroupID" type="integer">
<generator class="native"/>
</id>
@@ -15,7 +15,7 @@
<property name="mimetype" column="mimetype" type="string"/>
<property name="suffix" column="suffix" type="string"/>
- <many-to-one name="project" class="de.sub.goobi.Beans.Projekt" column="ProjekteID"/>
+ <many-to-one name="project" class="de.sub.goobi.beans.Projekt" column="ProjekteID"/>
</class>
=== modified file 'src/de/sub/goobi/beans/ProjectFileGroup.java'
--- src/de/sub/goobi/Beans/ProjectFileGroup.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/beans/ProjectFileGroup.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
=== modified file 'src/de/sub/goobi/beans/Projekt.hbm.xml'
--- src/de/sub/goobi/Beans/Projekt.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Projekt.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.Projekt" table="projekte">
+ <class name="de.sub.goobi.beans.Projekt" table="projekte">
<id name="id" column="ProjekteID" type="integer">
<generator class="native"/>
</id>
@@ -49,18 +49,18 @@
<set name="filegroups" cascade="all,delete-orphan" inverse="true">
<key column="ProjekteID"/>
- <one-to-many class="de.sub.goobi.Beans.ProjectFileGroup"/>
+ <one-to-many class="de.sub.goobi.beans.ProjectFileGroup"/>
</set>
<set name="benutzer" table="projektbenutzer" inverse="true">
<key column="ProjekteID"/>
- <many-to-many column="BenutzerID" class="de.sub.goobi.Beans.Benutzer"/>
+ <many-to-many column="BenutzerID" class="de.sub.goobi.beans.Benutzer"/>
</set>
<set name="prozesse" cascade="all,delete-orphan" inverse="true"
lazy="true">
<key column="ProjekteID" />
- <one-to-many class="de.sub.goobi.Beans.Prozess" />
+ <one-to-many class="de.sub.goobi.beans.Prozess" />
</set>
</class>
=== modified file 'src/de/sub/goobi/beans/Projekt.java'
--- src/de/sub/goobi/Beans/Projekt.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Projekt.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
import java.util.ArrayList;
=== modified file 'src/de/sub/goobi/beans/Prozess.hbm.xml'
--- src/de/sub/goobi/Beans/Prozess.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Prozess.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.Prozess" table="prozesse">
+ <class name="de.sub.goobi.beans.Prozess" table="prozesse">
<id name="id" column="ProzesseID" type="integer">
<generator class="native"/>
</id>
@@ -23,33 +23,33 @@
<property name="erstellungsdatum" column="erstellungsdatum" type="timestamp"/>
<property name="wikifield" column="wikifield" type="string"/>
- <many-to-one name="projekt" class="de.sub.goobi.Beans.Projekt" column="ProjekteID"/>
+ <many-to-one name="projekt" class="de.sub.goobi.beans.Projekt" column="ProjekteID"/>
- <many-to-one name="regelsatz" class="de.sub.goobi.Beans.Regelsatz" column="MetadatenKonfigurationID"/>
+ <many-to-one name="regelsatz" class="de.sub.goobi.beans.Regelsatz" column="MetadatenKonfigurationID"/>
<set name="schritte" cascade="all,delete-orphan" inverse="true" order-by="Reihenfolge" lazy="true">
<key column="ProzesseID"/>
- <one-to-many class="de.sub.goobi.Beans.Schritt"/>
+ <one-to-many class="de.sub.goobi.beans.Schritt"/>
</set>
<set name="vorlagen" cascade="all,delete-orphan" inverse="true" lazy="true">
<key column="ProzesseID"/>
- <one-to-many class="de.sub.goobi.Beans.Vorlage"/>
+ <one-to-many class="de.sub.goobi.beans.Vorlage"/>
</set>
<set name="werkstuecke" cascade="all,delete-orphan" inverse="true" lazy="true">
<key column="ProzesseID"/>
- <one-to-many class="de.sub.goobi.Beans.Werkstueck"/>
+ <one-to-many class="de.sub.goobi.beans.Werkstueck"/>
</set>
<set name="eigenschaften" cascade="all,delete-orphan" inverse="true" order-by="titel">
<key column="prozesseID"/>
- <one-to-many class="de.sub.goobi.Beans.Prozesseigenschaft"/>
+ <one-to-many class="de.sub.goobi.beans.Prozesseigenschaft"/>
</set>
<set name="history" cascade="all,delete-orphan" inverse="true" order-by="date">
<key column="processID"/>
- <one-to-many class="de.sub.goobi.Beans.HistoryEvent"/>
+ <one-to-many class="de.sub.goobi.beans.HistoryEvent"/>
</set>
</class>
=== modified file 'src/de/sub/goobi/beans/Prozess.java'
--- src/de/sub/goobi/Beans/Prozess.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Prozess.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.File;
import java.io.FilenameFilter;
@@ -29,13 +29,13 @@
import ugh.fileformats.mets.MetsMods;
import ugh.fileformats.mets.MetsModsImportExport;
import ugh.fileformats.mets.XStream;
-import de.sub.goobi.Beans.Property.DisplayPropertyList;
-import de.sub.goobi.Beans.Property.IGoobiEntity;
-import de.sub.goobi.Beans.Property.IGoobiProperty;
-import de.sub.goobi.Metadaten.MetadatenHelper;
-import de.sub.goobi.Metadaten.MetadatenSperrung;
-import de.sub.goobi.Persistence.BenutzerDAO;
-import de.sub.goobi.Persistence.ProzessDAO;
+import de.sub.goobi.beans.property.DisplayPropertyList;
+import de.sub.goobi.beans.property.IGoobiEntity;
+import de.sub.goobi.beans.property.IGoobiProperty;
+import de.sub.goobi.metadaten.MetadatenHelper;
+import de.sub.goobi.metadaten.MetadatenSperrung;
+import de.sub.goobi.persistence.BenutzerDAO;
+import de.sub.goobi.persistence.ProzessDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.FileUtils;
import de.sub.goobi.helper.Helper;
=== modified file 'src/de/sub/goobi/beans/Prozesseigenschaft.hbm.xml'
--- src/de/sub/goobi/Beans/Prozesseigenschaft.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Prozesseigenschaft.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.Prozesseigenschaft" table="prozesseeigenschaften">
+ <class name="de.sub.goobi.beans.Prozesseigenschaft" table="prozesseeigenschaften">
<id name="id" column="prozesseeigenschaftenID" type="integer">
<generator class="native" />
</id>
@@ -17,7 +17,7 @@
<property name="auswahl" column="Auswahl" type="string" />
<property name="creationDate" column="creationDate" type="timestamp"/>
<property name="container" column="container" type="integer" />
- <many-to-one name="prozess" class="de.sub.goobi.Beans.Prozess" column="prozesseID"/>
+ <many-to-one name="prozess" class="de.sub.goobi.beans.Prozess" column="prozesseID"/>
</class>
=== modified file 'src/de/sub/goobi/beans/Prozesseigenschaft.java'
--- src/de/sub/goobi/Beans/Prozesseigenschaft.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Prozesseigenschaft.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
import java.util.ArrayList;
@@ -7,8 +7,8 @@
import org.goobi.production.api.property.xmlbasedprovider.Status;
-import de.sub.goobi.Beans.Property.IGoobiEntity;
-import de.sub.goobi.Beans.Property.IGoobiProperty;
+import de.sub.goobi.beans.property.IGoobiEntity;
+import de.sub.goobi.beans.property.IGoobiProperty;
import de.sub.goobi.helper.enums.PropertyType;
public class Prozesseigenschaft implements Serializable, IGoobiProperty {
=== modified file 'src/de/sub/goobi/beans/Regelsatz.hbm.xml'
--- src/de/sub/goobi/Beans/Regelsatz.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Regelsatz.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.Regelsatz" table="metadatenkonfigurationen">
+ <class name="de.sub.goobi.beans.Regelsatz" table="metadatenkonfigurationen">
<id name="id" column="MetadatenKonfigurationID" type="integer">
<generator class="native"/>
</id>
=== modified file 'src/de/sub/goobi/beans/Regelsatz.java'
--- src/de/sub/goobi/Beans/Regelsatz.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Regelsatz.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
=== modified file 'src/de/sub/goobi/beans/Schritt.hbm.xml'
--- src/de/sub/goobi/Beans/Schritt.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Schritt.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.Schritt" table="schritte">
+ <class name="de.sub.goobi.beans.Schritt" table="schritte">
<!-- <cache usage="read-write"/> -->
<id name="id" column="SchritteID" type="integer">
<generator class="native"/>
@@ -46,22 +46,22 @@
<property name="typBeimAbschliessenVerifizieren" column="typBeimAbschliessenVerifizieren" />
<property name="typModulName" column="typModulName" type="string"/>
- <many-to-one name="bearbeitungsbenutzer" class="de.sub.goobi.Beans.Benutzer" column="BearbeitungsBenutzerID"/>
- <many-to-one name="prozess" class="de.sub.goobi.Beans.Prozess" column="ProzesseID"/>
+ <many-to-one name="bearbeitungsbenutzer" class="de.sub.goobi.beans.Benutzer" column="BearbeitungsBenutzerID"/>
+ <many-to-one name="prozess" class="de.sub.goobi.beans.Prozess" column="ProzesseID"/>
<set name="eigenschaften" cascade="all,delete-orphan" inverse="true" order-by="titel">
<key column="schritteID"/>
- <one-to-many class="de.sub.goobi.Beans.Schritteigenschaft"/>
+ <one-to-many class="de.sub.goobi.beans.Schritteigenschaft"/>
</set>
<set name="benutzer" table="schritteberechtigtebenutzer">
<key column="schritteID"/>
- <many-to-many column="BenutzerID" class="de.sub.goobi.Beans.Benutzer"/>
+ <many-to-many column="BenutzerID" class="de.sub.goobi.beans.Benutzer"/>
</set>
<set name="benutzergruppen" table="schritteberechtigtegruppen">
<key column="schritteID"/>
- <many-to-many column="BenutzerGruppenID" class="de.sub.goobi.Beans.Benutzergruppe"/>
+ <many-to-many column="BenutzerGruppenID" class="de.sub.goobi.beans.Benutzergruppe"/>
</set>
</class>
=== modified file 'src/de/sub/goobi/beans/Schritt.java'
--- src/de/sub/goobi/Beans/Schritt.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Schritt.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -11,9 +11,9 @@
import org.goobi.production.api.property.xmlbasedprovider.Status;
-import de.sub.goobi.Beans.Property.DisplayPropertyList;
-import de.sub.goobi.Beans.Property.IGoobiEntity;
-import de.sub.goobi.Beans.Property.IGoobiProperty;
+import de.sub.goobi.beans.property.DisplayPropertyList;
+import de.sub.goobi.beans.property.IGoobiEntity;
+import de.sub.goobi.beans.property.IGoobiProperty;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.enums.StepEditType;
import de.sub.goobi.helper.enums.StepStatus;
=== modified file 'src/de/sub/goobi/beans/Schritteigenschaft.hbm.xml'
--- src/de/sub/goobi/Beans/Schritteigenschaft.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Schritteigenschaft.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.Schritteigenschaft" table="schritteeigenschaften">
+ <class name="de.sub.goobi.beans.Schritteigenschaft" table="schritteeigenschaften">
<id name="id" column="schritteeigenschaftenID" type="integer">
<generator class="native" />
</id>
@@ -17,7 +17,7 @@
<property name="auswahl" column="Auswahl" type="string" />
<property name="creationDate" column="creationDate" type="timestamp"/>
<property name="container" column="container" type="integer" />
- <many-to-one name="schritt" class="de.sub.goobi.Beans.Schritt" column="schritteID"/>
+ <many-to-one name="schritt" class="de.sub.goobi.beans.Schritt" column="schritteID"/>
</class>
=== modified file 'src/de/sub/goobi/beans/Schritteigenschaft.java'
--- src/de/sub/goobi/Beans/Schritteigenschaft.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Schritteigenschaft.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
import java.util.ArrayList;
@@ -7,8 +7,8 @@
import org.goobi.production.api.property.xmlbasedprovider.Status;
-import de.sub.goobi.Beans.Property.IGoobiEntity;
-import de.sub.goobi.Beans.Property.IGoobiProperty;
+import de.sub.goobi.beans.property.IGoobiEntity;
+import de.sub.goobi.beans.property.IGoobiProperty;
import de.sub.goobi.helper.enums.PropertyType;
public class Schritteigenschaft implements Serializable, IGoobiProperty {
=== modified file 'src/de/sub/goobi/beans/Vorlage.hbm.xml'
--- src/de/sub/goobi/Beans/Vorlage.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Vorlage.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,18 +5,18 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.Vorlage" table="vorlagen">
+ <class name="de.sub.goobi.beans.Vorlage" table="vorlagen">
<id name="id" column="VorlagenID" type="integer">
<generator class="native"/>
</id>
<property name="herkunft" column="Herkunft" type="string"/>
- <many-to-one name="prozess" class="de.sub.goobi.Beans.Prozess" column="ProzesseID"/>
+ <many-to-one name="prozess" class="de.sub.goobi.beans.Prozess" column="ProzesseID"/>
<set name="eigenschaften" cascade="all,delete-orphan" inverse="true" order-by="titel">
<key column="vorlagenID"/>
- <one-to-many class="de.sub.goobi.Beans.Vorlageeigenschaft"/>
+ <one-to-many class="de.sub.goobi.beans.Vorlageeigenschaft"/>
</set>
</class>
=== modified file 'src/de/sub/goobi/beans/Vorlage.java'
--- src/de/sub/goobi/Beans/Vorlage.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Vorlage.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
import java.util.ArrayList;
@@ -8,9 +8,9 @@
import org.goobi.production.api.property.xmlbasedprovider.Status;
-import de.sub.goobi.Beans.Property.DisplayPropertyList;
-import de.sub.goobi.Beans.Property.IGoobiEntity;
-import de.sub.goobi.Beans.Property.IGoobiProperty;
+import de.sub.goobi.beans.property.DisplayPropertyList;
+import de.sub.goobi.beans.property.IGoobiEntity;
+import de.sub.goobi.beans.property.IGoobiProperty;
public class Vorlage implements Serializable, IGoobiEntity {
private static final long serialVersionUID = 1736135433162833277L;
=== modified file 'src/de/sub/goobi/beans/Vorlageeigenschaft.hbm.xml'
--- src/de/sub/goobi/Beans/Vorlageeigenschaft.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Vorlageeigenschaft.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.Vorlageeigenschaft" table="vorlageneigenschaften">
+ <class name="de.sub.goobi.beans.Vorlageeigenschaft" table="vorlageneigenschaften">
<id name="id" column="vorlageneigenschaftenID" type="integer">
<generator class="native" />
</id>
@@ -17,7 +17,7 @@
<property name="auswahl" column="Auswahl" type="string" />
<property name="creationDate" column="creationDate" type="timestamp"/>
<property name="container" column="container" type="integer" />
- <many-to-one name="vorlage" class="de.sub.goobi.Beans.Vorlage" column="vorlagenID"/>
+ <many-to-one name="vorlage" class="de.sub.goobi.beans.Vorlage" column="vorlagenID"/>
</class>
=== modified file 'src/de/sub/goobi/beans/Vorlageeigenschaft.java'
--- src/de/sub/goobi/Beans/Vorlageeigenschaft.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Vorlageeigenschaft.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
import java.util.ArrayList;
@@ -7,8 +7,8 @@
import org.goobi.production.api.property.xmlbasedprovider.Status;
-import de.sub.goobi.Beans.Property.IGoobiEntity;
-import de.sub.goobi.Beans.Property.IGoobiProperty;
+import de.sub.goobi.beans.property.IGoobiEntity;
+import de.sub.goobi.beans.property.IGoobiProperty;
import de.sub.goobi.helper.enums.PropertyType;
public class Vorlageeigenschaft implements Serializable, IGoobiProperty {
=== modified file 'src/de/sub/goobi/beans/Werkstueck.hbm.xml'
--- src/de/sub/goobi/Beans/Werkstueck.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Werkstueck.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,16 +5,16 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.Werkstueck" table="werkstuecke">
+ <class name="de.sub.goobi.beans.Werkstueck" table="werkstuecke">
<id name="id" column="WerkstueckeID" type="integer">
<generator class="native"/>
</id>
- <many-to-one name="prozess" class="de.sub.goobi.Beans.Prozess" column="ProzesseID"/>
+ <many-to-one name="prozess" class="de.sub.goobi.beans.Prozess" column="ProzesseID"/>
<set name="eigenschaften" cascade="all,delete-orphan" inverse="true" order-by="titel">
<key column="werkstueckeID"/>
- <one-to-many class="de.sub.goobi.Beans.Werkstueckeigenschaft"/>
+ <one-to-many class="de.sub.goobi.beans.Werkstueckeigenschaft"/>
</set>
</class>
=== modified file 'src/de/sub/goobi/beans/Werkstueck.java'
--- src/de/sub/goobi/Beans/Werkstueck.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Werkstueck.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
import java.util.ArrayList;
@@ -8,9 +8,9 @@
import org.goobi.production.api.property.xmlbasedprovider.Status;
-import de.sub.goobi.Beans.Property.DisplayPropertyList;
-import de.sub.goobi.Beans.Property.IGoobiEntity;
-import de.sub.goobi.Beans.Property.IGoobiProperty;
+import de.sub.goobi.beans.property.DisplayPropertyList;
+import de.sub.goobi.beans.property.IGoobiEntity;
+import de.sub.goobi.beans.property.IGoobiProperty;
public class Werkstueck implements Serializable, IGoobiEntity {
private static final long serialVersionUID = 123266825187246791L;
=== modified file 'src/de/sub/goobi/beans/Werkstueckeigenschaft.hbm.xml'
--- src/de/sub/goobi/Beans/Werkstueckeigenschaft.hbm.xml 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Werkstueckeigenschaft.hbm.xml 2011-12-14 08:37:30 +0000
@@ -5,7 +5,7 @@
<hibernate-mapping>
- <class name="de.sub.goobi.Beans.Werkstueckeigenschaft" table="werkstueckeeigenschaften">
+ <class name="de.sub.goobi.beans.Werkstueckeigenschaft" table="werkstueckeeigenschaften">
<id name="id" column="werkstueckeeigenschaftenID" type="integer">
<generator class="native" />
</id>
@@ -17,7 +17,7 @@
<property name="auswahl" column="Auswahl" type="string" />
<property name="creationDate" column="creationDate" type="timestamp"/>
<property name="container" column="container" type="integer" />
- <many-to-one name="werkstueck" class="de.sub.goobi.Beans.Werkstueck" column="werkstueckeID"/>
+ <many-to-one name="werkstueck" class="de.sub.goobi.beans.Werkstueck" column="werkstueckeID"/>
</class>
=== modified file 'src/de/sub/goobi/beans/Werkstueckeigenschaft.java'
--- src/de/sub/goobi/Beans/Werkstueckeigenschaft.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/Werkstueckeigenschaft.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans;
+package de.sub.goobi.beans;
import java.io.Serializable;
import java.util.ArrayList;
@@ -7,8 +7,8 @@
import org.goobi.production.api.property.xmlbasedprovider.Status;
-import de.sub.goobi.Beans.Property.IGoobiEntity;
-import de.sub.goobi.Beans.Property.IGoobiProperty;
+import de.sub.goobi.beans.property.IGoobiEntity;
+import de.sub.goobi.beans.property.IGoobiProperty;
import de.sub.goobi.helper.enums.PropertyType;
public class Werkstueckeigenschaft implements Serializable, IGoobiProperty {
=== renamed directory 'src/de/sub/goobi/Beans/Property' => 'src/de/sub/goobi/beans/property'
=== modified file 'src/de/sub/goobi/beans/property/DisplayPropertyList.java'
--- src/de/sub/goobi/Beans/Property/DisplayPropertyList.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/property/DisplayPropertyList.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans.Property;
+package de.sub.goobi.beans.property;
import java.io.IOException;
import java.util.ArrayList;
@@ -12,7 +12,7 @@
import org.goobi.production.api.property.xmlbasedprovider.impl.XMLBasedPropertyTemplateProvider;
import org.jdom.JDOMException;
-import de.sub.goobi.Persistence.SimpleDAO;
+import de.sub.goobi.persistence.SimpleDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.enums.PropertyType;
import de.sub.goobi.helper.exceptions.DAOException;
=== modified file 'src/de/sub/goobi/beans/property/IGoobiEntity.java'
--- src/de/sub/goobi/Beans/Property/IGoobiEntity.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/property/IGoobiEntity.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans.Property;
+package de.sub.goobi.beans.property;
import java.util.List;
=== modified file 'src/de/sub/goobi/beans/property/IGoobiProperty.java'
--- src/de/sub/goobi/Beans/Property/IGoobiProperty.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/beans/property/IGoobiProperty.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Beans.Property;
+package de.sub.goobi.beans.property;
import java.util.Date;
=== modified file 'src/de/sub/goobi/config/ConfigProjects.java'
--- src/de/sub/goobi/config/ConfigProjects.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/config/ConfigProjects.java 2011-12-14 08:37:30 +0000
@@ -11,7 +11,7 @@
import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy;
import org.apache.log4j.Logger;
-import de.sub.goobi.Beans.Projekt;
+import de.sub.goobi.beans.Projekt;
import de.sub.goobi.helper.Helper;
public class ConfigProjects {
=== renamed directory 'src/de/sub/goobi/Converter' => 'src/de/sub/goobi/converter'
=== modified file 'src/de/sub/goobi/converter/RegelsatzConverter.java'
--- src/de/sub/goobi/Converter/RegelsatzConverter.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/converter/RegelsatzConverter.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Converter;
+package de.sub.goobi.converter;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -7,8 +7,8 @@
import org.apache.log4j.Logger;
-import de.sub.goobi.Beans.Regelsatz;
-import de.sub.goobi.Persistence.RegelsatzDAO;
+import de.sub.goobi.beans.Regelsatz;
+import de.sub.goobi.persistence.RegelsatzDAO;
import de.sub.goobi.helper.exceptions.DAOException;
=== modified file 'src/de/sub/goobi/converter/StatisticsCalculationUnitConverter.java'
--- src/de/sub/goobi/Converter/StatisticsCalculationUnitConverter.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/converter/StatisticsCalculationUnitConverter.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Converter;
+package de.sub.goobi.converter;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
=== modified file 'src/de/sub/goobi/converter/StatisticsResultOutputConverter.java'
--- src/de/sub/goobi/Converter/StatisticsResultOutputConverter.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/converter/StatisticsResultOutputConverter.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Converter;
+package de.sub.goobi.converter;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
=== modified file 'src/de/sub/goobi/converter/StatisticsTimeUnitConverter.java'
--- src/de/sub/goobi/Converter/StatisticsTimeUnitConverter.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/converter/StatisticsTimeUnitConverter.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Converter;
+package de.sub.goobi.converter;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
=== renamed directory 'src/de/sub/goobi/Export' => 'src/de/sub/goobi/export'
=== modified file 'src/de/sub/goobi/export/dms/DmsImportThread.java'
--- src/de/sub/goobi/Export/dms/DmsImportThread.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/export/dms/DmsImportThread.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Export.dms;
+package de.sub.goobi.export.dms;
import java.io.BufferedReader;
import java.io.File;
@@ -6,7 +6,7 @@
import org.apache.log4j.Logger;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
=== modified file 'src/de/sub/goobi/export/dms/ExportDms.java'
--- src/de/sub/goobi/Export/dms/ExportDms.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/export/dms/ExportDms.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Export.dms;
+package de.sub.goobi.export.dms;
import java.io.File;
import java.io.IOException;
@@ -15,11 +15,11 @@
import ugh.exceptions.WriteException;
import ugh.fileformats.excel.RDFFile;
import ugh.fileformats.mets.MetsModsImportExport;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Export.download.ExportMets;
-import de.sub.goobi.Metadaten.MetadatenImagesHelper;
-import de.sub.goobi.Metadaten.MetadatenVerifizierung;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.export.download.ExportMets;
+import de.sub.goobi.metadaten.MetadatenImagesHelper;
+import de.sub.goobi.metadaten.MetadatenVerifizierung;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.config.ConfigProjects;
import de.sub.goobi.helper.Helper;
=== modified file 'src/de/sub/goobi/export/dms/ExportDms_CorrectRusdml.java'
--- src/de/sub/goobi/Export/dms/ExportDms_CorrectRusdml.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/export/dms/ExportDms_CorrectRusdml.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Export.dms;
+package de.sub.goobi.export.dms;
//TODO: Remove this class
import java.util.ArrayList;
@@ -17,7 +17,7 @@
import ugh.exceptions.DocStructHasNoTypeException;
import ugh.exceptions.MetadataTypeNotAllowedException;
import ugh.exceptions.PreferencesException;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.BeanHelper;
import de.sub.goobi.helper.exceptions.ExportFileException;
import de.sub.goobi.helper.exceptions.UghHelperException;
=== modified file 'src/de/sub/goobi/export/download/ExportMets.java'
--- src/de/sub/goobi/Export/download/ExportMets.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/export/download/ExportMets.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Export.download;
+package de.sub.goobi.export.download;
import java.io.File;
import java.io.IOException;
@@ -21,12 +21,12 @@
import ugh.exceptions.TypeNotAllowedForParentException;
import ugh.exceptions.WriteException;
import ugh.fileformats.mets.MetsModsImportExport;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.ProjectFileGroup;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Export.dms.ExportDms_CorrectRusdml;
-import de.sub.goobi.Forms.LoginForm;
-import de.sub.goobi.Metadaten.MetadatenImagesHelper;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.ProjectFileGroup;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.export.dms.ExportDms_CorrectRusdml;
+import de.sub.goobi.forms.LoginForm;
+import de.sub.goobi.metadaten.MetadatenImagesHelper;
import de.sub.goobi.config.ConfigProjects;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.VariableReplacer;
=== modified file 'src/de/sub/goobi/export/download/ExportPdf.java'
--- src/de/sub/goobi/Export/download/ExportPdf.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/export/download/ExportPdf.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Export.download;
+package de.sub.goobi.export.download;
import java.io.BufferedWriter;
import java.io.File;
@@ -24,9 +24,9 @@
import ugh.exceptions.ReadException;
import ugh.exceptions.TypeNotAllowedForParentException;
import ugh.exceptions.WriteException;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Metadaten.MetadatenHelper;
-import de.sub.goobi.Metadaten.MetadatenVerifizierung;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.metadaten.MetadatenHelper;
+import de.sub.goobi.metadaten.MetadatenVerifizierung;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.FileUtils;
import de.sub.goobi.helper.Helper;
=== modified file 'src/de/sub/goobi/export/download/Multipage.java'
--- src/de/sub/goobi/Export/download/Multipage.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/export/download/Multipage.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Export.download;
+package de.sub.goobi.export.download;
//TODO: Move parts of this into ContentServer2
@@ -23,8 +23,8 @@
import com.sun.media.jai.codec.ImageEncoder;
import com.sun.media.jai.codec.TIFFEncodeParam;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Metadaten.MetadatenImagesHelper;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.metadaten.MetadatenImagesHelper;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.exceptions.DAOException;
import de.sub.goobi.helper.exceptions.SwapException;
=== modified file 'src/de/sub/goobi/export/download/TiffHeader.java'
--- src/de/sub/goobi/Export/download/TiffHeader.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/export/download/TiffHeader.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Export.download;
+package de.sub.goobi.export.download;
import java.io.IOException;
import java.sql.SQLException;
@@ -9,9 +9,9 @@
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Werkstueck;
-import de.sub.goobi.Beans.Werkstueckeigenschaft;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Werkstueck;
+import de.sub.goobi.beans.Werkstueckeigenschaft;
//TODO: This should be transformed into a genral API for image metadata, without the need ofusing the Perl implementation (https://jira.bibforge.org/jira/browse/DPD-84)
=== renamed directory 'src/de/sub/goobi/Forms' => 'src/de/sub/goobi/forms'
=== modified file 'src/de/sub/goobi/forms/AdditionalField.java'
--- src/de/sub/goobi/Forms/AdditionalField.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/AdditionalField.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import java.util.List;
=== modified file 'src/de/sub/goobi/forms/AdministrationForm.java'
--- src/de/sub/goobi/Forms/AdministrationForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/AdministrationForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
//TODO: Use generics.
//TODO: Dont use Iterators, use for loop instead.
@@ -34,16 +34,16 @@
import ugh.dl.Prefs;
import ugh.exceptions.PreferencesException;
import ugh.exceptions.ReadException;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.Benutzergruppe;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Regelsatz;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Persistence.BenutzerDAO;
-import de.sub.goobi.Persistence.BenutzergruppenDAO;
-import de.sub.goobi.Persistence.ProzessDAO;
-import de.sub.goobi.Persistence.RegelsatzDAO;
-import de.sub.goobi.Persistence.SchrittDAO;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.Benutzergruppe;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Regelsatz;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.persistence.BenutzerDAO;
+import de.sub.goobi.persistence.BenutzergruppenDAO;
+import de.sub.goobi.persistence.ProzessDAO;
+import de.sub.goobi.persistence.RegelsatzDAO;
+import de.sub.goobi.persistence.SchrittDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.BeanHelper;
import de.sub.goobi.helper.FileUtils;
=== modified file 'src/de/sub/goobi/forms/AktuelleSchritteForm.java'
--- src/de/sub/goobi/Forms/AktuelleSchritteForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/AktuelleSchritteForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
//TODO: Use generics.
//TODO: Remove RusDML garbage
@@ -26,20 +26,20 @@
import org.hibernate.criterion.Restrictions;
import Messages.Messages;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.HistoryEvent;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Schritteigenschaft;
-import de.sub.goobi.Export.dms.ExportDms;
-import de.sub.goobi.Export.download.TiffHeader;
-import de.sub.goobi.Metadaten.MetadatenImagesHelper;
-import de.sub.goobi.Metadaten.MetadatenSperrung;
-import de.sub.goobi.Metadaten.MetadatenVerifizierung;
-import de.sub.goobi.Persistence.HibernateUtil;
-import de.sub.goobi.Persistence.ProzessDAO;
-import de.sub.goobi.Persistence.SchrittDAO;
-import de.sub.goobi.Persistence.SimpleDAO;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.HistoryEvent;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Schritteigenschaft;
+import de.sub.goobi.export.dms.ExportDms;
+import de.sub.goobi.export.download.TiffHeader;
+import de.sub.goobi.metadaten.MetadatenImagesHelper;
+import de.sub.goobi.metadaten.MetadatenSperrung;
+import de.sub.goobi.metadaten.MetadatenVerifizierung;
+import de.sub.goobi.persistence.HibernateUtil;
+import de.sub.goobi.persistence.ProzessDAO;
+import de.sub.goobi.persistence.SchrittDAO;
+import de.sub.goobi.persistence.SimpleDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.FileUtils;
import de.sub.goobi.helper.Helper;
=== modified file 'src/de/sub/goobi/forms/BasisForm.java'
--- src/de/sub/goobi/Forms/BasisForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/BasisForm.java 2011-12-14 08:37:30 +0000
@@ -1,11 +1,11 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import java.io.Serializable;
import org.apache.log4j.Logger;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Persistence.BenutzerDAO;
+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;
=== modified file 'src/de/sub/goobi/forms/BenutzergruppenForm.java'
--- src/de/sub/goobi/Forms/BenutzergruppenForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/BenutzergruppenForm.java 2011-12-14 08:37:30 +0000
@@ -1,12 +1,12 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
-import de.sub.goobi.Beans.Benutzergruppe;
-import de.sub.goobi.Persistence.BenutzergruppenDAO;
+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;
=== modified file 'src/de/sub/goobi/forms/BenutzerverwaltungForm.java'
--- src/de/sub/goobi/Forms/BenutzerverwaltungForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/BenutzerverwaltungForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import java.io.BufferedReader;
import java.io.File;
@@ -25,14 +25,14 @@
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.Benutzergruppe;
-import de.sub.goobi.Beans.LdapGruppe;
-import de.sub.goobi.Beans.Projekt;
-import de.sub.goobi.Persistence.BenutzerDAO;
-import de.sub.goobi.Persistence.BenutzergruppenDAO;
-import de.sub.goobi.Persistence.LdapGruppenDAO;
-import de.sub.goobi.Persistence.ProjektDAO;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.Benutzergruppe;
+import de.sub.goobi.beans.LdapGruppe;
+import de.sub.goobi.beans.Projekt;
+import de.sub.goobi.persistence.BenutzerDAO;
+import de.sub.goobi.persistence.BenutzergruppenDAO;
+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;
=== modified file 'src/de/sub/goobi/forms/HelperForm.java'
--- src/de/sub/goobi/Forms/HelperForm.java 2011-12-01 13:02:10 +0000
+++ src/de/sub/goobi/forms/HelperForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
//TODO: Use generics.
//TODO: use consts for files and URL fragments
@@ -17,8 +17,8 @@
import org.goobi.production.GoobiVersion;
-import de.sub.goobi.Beans.Regelsatz;
-import de.sub.goobi.Persistence.RegelsatzDAO;
+import de.sub.goobi.beans.Regelsatz;
+import de.sub.goobi.persistence.RegelsatzDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.enums.MetadataFormat;
=== modified file 'src/de/sub/goobi/forms/LdapGruppenForm.java'
--- src/de/sub/goobi/Forms/LdapGruppenForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/LdapGruppenForm.java 2011-12-14 08:37:30 +0000
@@ -1,12 +1,12 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
-import de.sub.goobi.Beans.LdapGruppe;
-import de.sub.goobi.Persistence.LdapGruppenDAO;
+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;
=== modified file 'src/de/sub/goobi/forms/LoginForm.java'
--- src/de/sub/goobi/Forms/LoginForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/LoginForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
//TODO: Move Parts of this into a authentification API
import java.io.File;
@@ -12,11 +12,11 @@
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpSession;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.Benutzergruppe;
-import de.sub.goobi.Metadaten.MetadatenSperrung;
-import de.sub.goobi.Persistence.BenutzerDAO;
-import de.sub.goobi.Persistence.BenutzergruppenDAO;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.Benutzergruppe;
+import de.sub.goobi.metadaten.MetadatenSperrung;
+import de.sub.goobi.persistence.BenutzerDAO;
+import de.sub.goobi.persistence.BenutzergruppenDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.encryption.MD5;
=== modified file 'src/de/sub/goobi/forms/LongRunningTasksForm.java'
--- src/de/sub/goobi/Forms/LongRunningTasksForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/LongRunningTasksForm.java 2011-12-14 08:37:30 +0000
@@ -1,10 +1,10 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import java.util.LinkedList;
import org.apache.log4j.Logger;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.tasks.LongRunningTask;
import de.sub.goobi.helper.tasks.LongRunningTaskManager;
=== modified file 'src/de/sub/goobi/forms/ModuleServerForm.java'
--- src/de/sub/goobi/Forms/ModuleServerForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/ModuleServerForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import java.io.File;
import java.io.IOException;
@@ -20,11 +20,11 @@
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Modul.ExtendedDataImpl;
-import de.sub.goobi.Modul.ExtendedProzessImpl;
-import de.sub.goobi.Persistence.ProzessDAO;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.modul.ExtendedDataImpl;
+import de.sub.goobi.modul.ExtendedProzessImpl;
+import de.sub.goobi.persistence.ProzessDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.exceptions.DAOException;
=== modified file 'src/de/sub/goobi/forms/NavigationForm.java'
--- src/de/sub/goobi/Forms/NavigationForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/NavigationForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import de.sub.goobi.config.ConfigMain;
=== modified file 'src/de/sub/goobi/forms/ProjekteForm.java'
--- src/de/sub/goobi/Forms/ProjekteForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/ProjekteForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
@@ -42,10 +42,10 @@
import de.intranda.commons.chart.renderer.ChartRenderer;
import de.intranda.commons.chart.results.ChartDraw.ChartType;
-import de.sub.goobi.Beans.ProjectFileGroup;
-import de.sub.goobi.Beans.Projekt;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Persistence.ProjektDAO;
+import de.sub.goobi.beans.ProjectFileGroup;
+import de.sub.goobi.beans.Projekt;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.persistence.ProjektDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.Page;
=== modified file 'src/de/sub/goobi/forms/ProzesskopieForm.java'
--- src/de/sub/goobi/Forms/ProzesskopieForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/ProzesskopieForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import java.io.File;
import java.io.IOException;
@@ -47,17 +47,17 @@
import ugh.exceptions.TypeNotAllowedForParentException;
import ugh.exceptions.WriteException;
import ugh.fileformats.mets.XStream;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.Projekt;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Vorlage;
-import de.sub.goobi.Beans.Vorlageeigenschaft;
-import de.sub.goobi.Beans.Werkstueck;
-import de.sub.goobi.Beans.Werkstueckeigenschaft;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.Projekt;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Vorlage;
+import de.sub.goobi.beans.Vorlageeigenschaft;
+import de.sub.goobi.beans.Werkstueck;
+import de.sub.goobi.beans.Werkstueckeigenschaft;
import de.sub.goobi.Import.ImportOpac;
-import de.sub.goobi.Persistence.BenutzerDAO;
-import de.sub.goobi.Persistence.ProzessDAO;
+import de.sub.goobi.persistence.BenutzerDAO;
+import de.sub.goobi.persistence.ProzessDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.config.ConfigOpac;
import de.sub.goobi.config.ConfigOpacDoctype;
=== modified file 'src/de/sub/goobi/forms/ProzessverwaltungForm.java'
--- src/de/sub/goobi/Forms/ProzessverwaltungForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/ProzessverwaltungForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import java.io.File;
import java.io.IOException;
@@ -35,24 +35,24 @@
import org.jdom.transform.XSLTransformException;
import org.jfree.chart.plot.PlotOrientation;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.Benutzergruppe;
-import de.sub.goobi.Beans.Projekt;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Prozesseigenschaft;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Schritteigenschaft;
-import de.sub.goobi.Beans.Vorlage;
-import de.sub.goobi.Beans.Vorlageeigenschaft;
-import de.sub.goobi.Beans.Werkstueck;
-import de.sub.goobi.Beans.Werkstueckeigenschaft;
-import de.sub.goobi.Export.dms.ExportDms;
-import de.sub.goobi.Export.download.ExportMets;
-import de.sub.goobi.Export.download.ExportPdf;
-import de.sub.goobi.Export.download.Multipage;
-import de.sub.goobi.Export.download.TiffHeader;
-import de.sub.goobi.Persistence.ProjektDAO;
-import de.sub.goobi.Persistence.ProzessDAO;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.Benutzergruppe;
+import de.sub.goobi.beans.Projekt;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Prozesseigenschaft;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Schritteigenschaft;
+import de.sub.goobi.beans.Vorlage;
+import de.sub.goobi.beans.Vorlageeigenschaft;
+import de.sub.goobi.beans.Werkstueck;
+import de.sub.goobi.beans.Werkstueckeigenschaft;
+import de.sub.goobi.export.dms.ExportDms;
+import de.sub.goobi.export.download.ExportMets;
+import de.sub.goobi.export.download.ExportPdf;
+import de.sub.goobi.export.download.Multipage;
+import de.sub.goobi.export.download.TiffHeader;
+import de.sub.goobi.persistence.ProjektDAO;
+import de.sub.goobi.persistence.ProzessDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.FileUtils;
import de.sub.goobi.helper.GoobiScript;
=== modified file 'src/de/sub/goobi/forms/RegelsaetzeForm.java'
--- src/de/sub/goobi/Forms/RegelsaetzeForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/RegelsaetzeForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import org.apache.log4j.Logger;
import org.hibernate.Criteria;
@@ -6,8 +6,8 @@
import org.hibernate.Session;
import org.hibernate.criterion.Order;
-import de.sub.goobi.Beans.Regelsatz;
-import de.sub.goobi.Persistence.RegelsatzDAO;
+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;
=== modified file 'src/de/sub/goobi/forms/SessionForm.java'
--- src/de/sub/goobi/Forms/SessionForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/SessionForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
//TODO: Use generics
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -11,7 +11,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import de.sub.goobi.Beans.Benutzer;
+import de.sub.goobi.beans.Benutzer;
/**
* Die Klasse SessionForm für den überblick über die aktuell offenen Sessions
=== modified file 'src/de/sub/goobi/forms/SpracheForm.java'
--- src/de/sub/goobi/Forms/SpracheForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/SpracheForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import java.util.Locale;
=== modified file 'src/de/sub/goobi/forms/StatistikForm.java'
--- src/de/sub/goobi/Forms/StatistikForm.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/forms/StatistikForm.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Forms;
+package de.sub.goobi.forms;
import java.util.ArrayList;
import java.util.Calendar;
@@ -13,10 +13,10 @@
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Persistence.BenutzerDAO;
-import de.sub.goobi.Persistence.ProzessDAO;
-import de.sub.goobi.Persistence.SchrittDAO;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.persistence.BenutzerDAO;
+import de.sub.goobi.persistence.ProzessDAO;
+import de.sub.goobi.persistence.SchrittDAO;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.exceptions.DAOException;
=== modified file 'src/de/sub/goobi/helper/BeanHelper.java'
--- src/de/sub/goobi/helper/BeanHelper.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/BeanHelper.java 2011-12-14 08:37:30 +0000
@@ -7,16 +7,16 @@
import java.util.List;
import java.util.Set;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.Benutzergruppe;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Prozesseigenschaft;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Schritteigenschaft;
-import de.sub.goobi.Beans.Vorlage;
-import de.sub.goobi.Beans.Vorlageeigenschaft;
-import de.sub.goobi.Beans.Werkstueck;
-import de.sub.goobi.Beans.Werkstueckeigenschaft;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.Benutzergruppe;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Prozesseigenschaft;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Schritteigenschaft;
+import de.sub.goobi.beans.Vorlage;
+import de.sub.goobi.beans.Vorlageeigenschaft;
+import de.sub.goobi.beans.Werkstueck;
+import de.sub.goobi.beans.Werkstueckeigenschaft;
//TODO: Document this
public class BeanHelper {
=== modified file 'src/de/sub/goobi/helper/FileUtils.java'
--- src/de/sub/goobi/helper/FileUtils.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/helper/FileUtils.java 2011-12-14 08:37:30 +0000
@@ -3,7 +3,7 @@
import java.io.File;
import java.io.FilenameFilter;
-import de.sub.goobi.Metadaten.MetadatenImagesHelper;
+import de.sub.goobi.metadaten.MetadatenImagesHelper;
/**
* File Utils collection
=== modified file 'src/de/sub/goobi/helper/GoobiScript.java'
--- src/de/sub/goobi/helper/GoobiScript.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/GoobiScript.java 2011-12-14 08:37:30 +0000
@@ -22,17 +22,17 @@
import ugh.exceptions.ReadException;
import ugh.exceptions.TypeNotAllowedForParentException;
import ugh.exceptions.WriteException;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.Benutzergruppe;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Regelsatz;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Export.dms.ExportDms;
-import de.sub.goobi.Persistence.BenutzerDAO;
-import de.sub.goobi.Persistence.BenutzergruppenDAO;
-import de.sub.goobi.Persistence.ProzessDAO;
-import de.sub.goobi.Persistence.RegelsatzDAO;
-import de.sub.goobi.Persistence.SchrittDAO;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.Benutzergruppe;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Regelsatz;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.export.dms.ExportDms;
+import de.sub.goobi.persistence.BenutzerDAO;
+import de.sub.goobi.persistence.BenutzergruppenDAO;
+import de.sub.goobi.persistence.ProzessDAO;
+import de.sub.goobi.persistence.RegelsatzDAO;
+import de.sub.goobi.persistence.SchrittDAO;
import de.sub.goobi.helper.enums.StepStatus;
import de.sub.goobi.helper.exceptions.DAOException;
import de.sub.goobi.helper.exceptions.ExportFileException;
=== modified file 'src/de/sub/goobi/helper/Helper.java'
--- src/de/sub/goobi/helper/Helper.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/Helper.java 2011-12-14 08:37:30 +0000
@@ -28,9 +28,9 @@
import org.hibernate.Session;
import org.jdom.Element;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Forms.LoginForm;
-import de.sub.goobi.Persistence.HibernateUtilOld;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.forms.LoginForm;
+import de.sub.goobi.persistence.HibernateUtilOld;
import de.sub.goobi.config.ConfigMain;
//TODO: Check if more method can be made static
=== modified file 'src/de/sub/goobi/helper/HelperSchritte.java'
--- src/de/sub/goobi/helper/HelperSchritte.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/HelperSchritte.java 2011-12-14 08:37:30 +0000
@@ -16,11 +16,11 @@
import ugh.exceptions.PreferencesException;
import ugh.exceptions.ReadException;
import ugh.exceptions.WriteException;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.HistoryEvent;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Persistence.ProzessDAO;
-import de.sub.goobi.Persistence.SchrittDAO;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.HistoryEvent;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.persistence.ProzessDAO;
+import de.sub.goobi.persistence.SchrittDAO;
import de.sub.goobi.helper.enums.HistoryEventType;
import de.sub.goobi.helper.enums.StepEditType;
import de.sub.goobi.helper.enums.StepStatus;
=== modified file 'src/de/sub/goobi/helper/Page.java'
--- src/de/sub/goobi/helper/Page.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/Page.java 2011-12-14 08:37:30 +0000
@@ -11,7 +11,7 @@
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
-import de.sub.goobi.Forms.LoginForm;
+import de.sub.goobi.forms.LoginForm;
/**
* This class provides pagination for displaying results from a large result set
=== modified file 'src/de/sub/goobi/helper/ProjectHelper.java'
--- src/de/sub/goobi/helper/ProjectHelper.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/ProjectHelper.java 2011-12-14 08:37:30 +0000
@@ -39,9 +39,9 @@
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
-import de.sub.goobi.Beans.Projekt;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
+import de.sub.goobi.beans.Projekt;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
import de.sub.goobi.helper.enums.StepStatus;
public class ProjectHelper {
=== modified file 'src/de/sub/goobi/helper/ScriptThread.java'
--- src/de/sub/goobi/helper/ScriptThread.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/ScriptThread.java 2011-12-14 08:37:30 +0000
@@ -2,7 +2,7 @@
import org.apache.log4j.Logger;
-import de.sub.goobi.Beans.Schritt;
+import de.sub.goobi.beans.Schritt;
import de.sub.goobi.helper.exceptions.DAOException;
import de.sub.goobi.helper.exceptions.SwapException;
=== modified file 'src/de/sub/goobi/helper/UghHelper.java'
--- src/de/sub/goobi/helper/UghHelper.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/UghHelper.java 2011-12-14 08:37:30 +0000
@@ -19,7 +19,7 @@
import ugh.dl.Prefs;
import ugh.exceptions.DocStructHasNoTypeException;
import ugh.exceptions.MetadataTypeNotAllowedException;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.exceptions.UghHelperException;
//TODO: Try to move this methods to UGH (ugh.util.UGHUtils would be a better place)
=== modified file 'src/de/sub/goobi/helper/VariableReplacer.java'
--- src/de/sub/goobi/helper/VariableReplacer.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/VariableReplacer.java 2011-12-14 08:37:30 +0000
@@ -16,13 +16,13 @@
import ugh.dl.Metadata;
import ugh.dl.MetadataType;
import ugh.dl.Prefs;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Prozesseigenschaft;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Vorlage;
-import de.sub.goobi.Beans.Vorlageeigenschaft;
-import de.sub.goobi.Beans.Werkstueck;
-import de.sub.goobi.Beans.Werkstueckeigenschaft;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Prozesseigenschaft;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Vorlage;
+import de.sub.goobi.beans.Vorlageeigenschaft;
+import de.sub.goobi.beans.Werkstueck;
+import de.sub.goobi.beans.Werkstueckeigenschaft;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.exceptions.DAOException;
import de.sub.goobi.helper.exceptions.SwapException;
=== modified file 'src/de/sub/goobi/helper/WebDav.java'
--- src/de/sub/goobi/helper/WebDav.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/WebDav.java 2011-12-14 08:37:30 +0000
@@ -13,9 +13,9 @@
import org.apache.log4j.Logger;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Export.download.TiffHeader;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.export.download.TiffHeader;
import de.sub.goobi.config.ConfigMain;
public class WebDav {
=== modified file 'src/de/sub/goobi/helper/XmlArtikelZaehlen.java'
--- src/de/sub/goobi/helper/XmlArtikelZaehlen.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/XmlArtikelZaehlen.java 2011-12-14 08:37:30 +0000
@@ -8,8 +8,8 @@
import ugh.dl.Metadata;
import ugh.dl.Person;
import ugh.exceptions.PreferencesException;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Persistence.ProzessDAO;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.persistence.ProzessDAO;
import de.sub.goobi.helper.exceptions.DAOException;
public class XmlArtikelZaehlen {
=== modified file 'src/de/sub/goobi/helper/ldap/Ldap.java'
--- src/de/sub/goobi/helper/ldap/Ldap.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/ldap/Ldap.java 2011-12-14 08:37:30 +0000
@@ -27,7 +27,7 @@
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
-import de.sub.goobi.Beans.Benutzer;
+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;
=== modified file 'src/de/sub/goobi/helper/ldap/LdapUser.java'
--- src/de/sub/goobi/helper/ldap/LdapUser.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/ldap/LdapUser.java 2011-12-14 08:37:30 +0000
@@ -31,8 +31,8 @@
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.beans.Benutzer;
+import de.sub.goobi.beans.LdapGruppe;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.encryption.MD4;
=== modified file 'src/de/sub/goobi/helper/servletfilter/HibernateSessionFilter2.java'
--- src/de/sub/goobi/helper/servletfilter/HibernateSessionFilter2.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/servletfilter/HibernateSessionFilter2.java 2011-12-14 08:37:30 +0000
@@ -12,11 +12,11 @@
import org.hibernate.Session;
-import de.sub.goobi.Persistence.HibernateSessionLong;
+import de.sub.goobi.persistence.HibernateSessionLong;
import de.sub.goobi.helper.exceptions.GUIExceptionWrapper;
// TODO: Previous Hibernate-Filter for old manual Hibernate-Session-Management, old version, reactivated, because
-// de.sub.goobi.Persistence.HibernateSessionConversationFilter does not work like it should
+// de.sub.goobi.persistence.HibernateSessionConversationFilter does not work like it should
public class HibernateSessionFilter2 implements Filter {
// private static final Logger mylogger = Logger.getLogger(HibernateSessionFilter2.class);
=== modified file 'src/de/sub/goobi/helper/servletfilter/SessionCounterFilter.java'
--- src/de/sub/goobi/helper/servletfilter/SessionCounterFilter.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/helper/servletfilter/SessionCounterFilter.java 2011-12-14 08:37:30 +0000
@@ -19,7 +19,7 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import de.sub.goobi.Forms.SessionForm;
+import de.sub.goobi.forms.SessionForm;
public class SessionCounterFilter implements Filter {
=== modified file 'src/de/sub/goobi/helper/tasks/CreatePdfFromServletThread.java'
--- src/de/sub/goobi/helper/tasks/CreatePdfFromServletThread.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/helper/tasks/CreatePdfFromServletThread.java 2011-12-14 08:37:30 +0000
@@ -19,10 +19,10 @@
import org.apache.log4j.Logger;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Metadaten.MetadatenHelper;
-import de.sub.goobi.Metadaten.MetadatenImagesHelper;
-import de.sub.goobi.Metadaten.MetadatenVerifizierung;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.metadaten.MetadatenHelper;
+import de.sub.goobi.metadaten.MetadatenImagesHelper;
+import de.sub.goobi.metadaten.MetadatenVerifizierung;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
=== modified file 'src/de/sub/goobi/helper/tasks/LongRunningTask.java'
--- src/de/sub/goobi/helper/tasks/LongRunningTask.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/tasks/LongRunningTask.java 2011-12-14 08:37:30 +0000
@@ -2,7 +2,7 @@
import org.apache.log4j.Logger;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.Helper;
public class LongRunningTask extends Thread {
=== modified file 'src/de/sub/goobi/helper/tasks/ProcessSwapInTask.java'
--- src/de/sub/goobi/helper/tasks/ProcessSwapInTask.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/tasks/ProcessSwapInTask.java 2011-12-14 08:37:30 +0000
@@ -9,8 +9,8 @@
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Persistence.ProzessDAO;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.persistence.ProzessDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.exceptions.DAOException;
=== modified file 'src/de/sub/goobi/helper/tasks/ProcessSwapOutTask.java'
--- src/de/sub/goobi/helper/tasks/ProcessSwapOutTask.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/tasks/ProcessSwapOutTask.java 2011-12-14 08:37:30 +0000
@@ -10,8 +10,8 @@
import org.jdom.output.Format;
import org.jdom.output.XMLOutputter;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Persistence.ProzessDAO;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.persistence.ProzessDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.exceptions.DAOException;
=== modified file 'src/de/sub/goobi/helper/tasks/TiffWriterTask.java'
--- src/de/sub/goobi/helper/tasks/TiffWriterTask.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/helper/tasks/TiffWriterTask.java 2011-12-14 08:37:30 +0000
@@ -7,7 +7,7 @@
import java.util.Arrays;
import java.util.List;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
public class TiffWriterTask extends LongRunningTask {
=== renamed directory 'src/de/sub/goobi/Metadaten' => 'src/de/sub/goobi/metadaten'
=== modified file 'src/de/sub/goobi/metadaten/MetaPerson.java'
--- src/de/sub/goobi/Metadaten/MetaPerson.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/metadaten/MetaPerson.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Metadaten;
+package de.sub.goobi.metadaten;
import java.util.ArrayList;
=== modified file 'src/de/sub/goobi/metadaten/Metadaten.java'
--- src/de/sub/goobi/Metadaten/Metadaten.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/metadaten/Metadaten.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Metadaten;
+package de.sub.goobi.metadaten;
//TODO: Use generics
//TODO: Don't use Iterators
@@ -44,9 +44,9 @@
import ugh.exceptions.TypeNotAllowedAsChildException;
import ugh.exceptions.TypeNotAllowedForParentException;
import ugh.exceptions.WriteException;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.Import.ImportOpac;
-import de.sub.goobi.Persistence.ProzessDAO;
+import de.sub.goobi.persistence.ProzessDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.FileUtils;
import de.sub.goobi.helper.Helper;
=== modified file 'src/de/sub/goobi/metadaten/MetadatenHelper.java'
--- src/de/sub/goobi/Metadaten/MetadatenHelper.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/metadaten/MetadatenHelper.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Metadaten;
+package de.sub.goobi.metadaten;
//TODO: Look if this can be merged into UGH
//TODO: Don't use arrays
@@ -35,7 +35,7 @@
import ugh.exceptions.MetadataTypeNotAllowedException;
import ugh.exceptions.TypeNotAllowedAsChildException;
import ugh.exceptions.TypeNotAllowedForParentException;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.HelperComparator;
=== modified file 'src/de/sub/goobi/metadaten/MetadatenImagesHelper.java'
--- src/de/sub/goobi/Metadaten/MetadatenImagesHelper.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/metadaten/MetadatenImagesHelper.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Metadaten;
+package de.sub.goobi.metadaten;
import java.awt.image.RenderedImage;
import java.io.BufferedInputStream;
@@ -32,7 +32,7 @@
import ugh.exceptions.MetadataTypeNotAllowedException;
import ugh.exceptions.TypeNotAllowedAsChildException;
import ugh.exceptions.TypeNotAllowedForParentException;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.exceptions.DAOException;
=== modified file 'src/de/sub/goobi/metadaten/MetadatenSperrung.java'
--- src/de/sub/goobi/Metadaten/MetadatenSperrung.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/metadaten/MetadatenSperrung.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Metadaten;
+package de.sub.goobi.metadaten;
import java.io.Serializable;
import java.util.HashMap;
=== modified file 'src/de/sub/goobi/metadaten/MetadatenVerifizierung.java'
--- src/de/sub/goobi/Metadaten/MetadatenVerifizierung.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/metadaten/MetadatenVerifizierung.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Metadaten;
+package de.sub.goobi.metadaten;
import java.io.IOException;
import java.util.ArrayList;
@@ -18,7 +18,7 @@
import ugh.exceptions.DocStructHasNoTypeException;
import ugh.exceptions.MetadataTypeNotAllowedException;
import ugh.exceptions.PreferencesException;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.config.ConfigProjects;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.UghHelper;
=== modified file 'src/de/sub/goobi/metadaten/Metadatum.java'
--- src/de/sub/goobi/Metadaten/Metadatum.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/metadaten/Metadatum.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Metadaten;
+package de.sub.goobi.metadaten;
import java.util.ArrayList;
import java.util.HashMap;
@@ -14,7 +14,7 @@
import ugh.dl.Metadata;
import ugh.dl.MetadataType;
import ugh.dl.Prefs;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.Helper;
//TODO: Use a correct comment here
=== modified file 'src/de/sub/goobi/metadaten/Pagination.java'
--- src/de/sub/goobi/Metadaten/Pagination.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/metadaten/Pagination.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Metadaten;
+package de.sub.goobi.metadaten;
/**
* This file is part of the Goobi Application - a Workflow tool for the support of mass digitization.
=== modified file 'src/de/sub/goobi/metadaten/TreeNodeStruct3.java'
--- src/de/sub/goobi/Metadaten/TreeNodeStruct3.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/metadaten/TreeNodeStruct3.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Metadaten;
+package de.sub.goobi.metadaten;
import java.util.ArrayList;
=== renamed directory 'src/de/sub/goobi/Modul' => 'src/de/sub/goobi/modul'
=== modified file 'src/de/sub/goobi/modul/ExtendedDataImpl.java'
--- src/de/sub/goobi/Modul/ExtendedDataImpl.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/modul/ExtendedDataImpl.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Modul;
+package de.sub.goobi.modul;
import java.util.ArrayList;
import java.util.HashMap;
@@ -6,14 +6,14 @@
import java.util.Iterator;
import java.util.List;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Prozesseigenschaft;
-import de.sub.goobi.Beans.Vorlage;
-import de.sub.goobi.Beans.Vorlageeigenschaft;
-import de.sub.goobi.Beans.Werkstueck;
-import de.sub.goobi.Beans.Werkstueckeigenschaft;
-import de.sub.goobi.Forms.ModuleServerForm;
-import de.sub.goobi.Persistence.ProzessDAO;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Prozesseigenschaft;
+import de.sub.goobi.beans.Vorlage;
+import de.sub.goobi.beans.Vorlageeigenschaft;
+import de.sub.goobi.beans.Werkstueck;
+import de.sub.goobi.beans.Werkstueckeigenschaft;
+import de.sub.goobi.forms.ModuleServerForm;
+import de.sub.goobi.persistence.ProzessDAO;
import de.sub.goobi.helper.BeanHelper;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.exceptions.DAOException;
=== modified file 'src/de/sub/goobi/modul/ExtendedProzessImpl.java'
--- src/de/sub/goobi/Modul/ExtendedProzessImpl.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/modul/ExtendedProzessImpl.java 2011-12-14 08:37:30 +0000
@@ -1,10 +1,10 @@
-package de.sub.goobi.Modul;
+package de.sub.goobi.modul;
import java.io.IOException;
import java.util.HashMap;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Forms.ModuleServerForm;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.forms.ModuleServerForm;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.exceptions.DAOException;
=== modified file 'src/de/sub/goobi/modul/ModulListener.java'
--- src/de/sub/goobi/Modul/ModulListener.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/modul/ModulListener.java 2011-12-14 08:37:30 +0000
@@ -1,11 +1,11 @@
-package de.sub.goobi.Modul;
+package de.sub.goobi.modul;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import org.apache.log4j.Logger;
-import de.sub.goobi.Forms.ModuleServerForm;
+import de.sub.goobi.forms.ModuleServerForm;
public class ModulListener implements ServletContextListener {
private static final Logger myLogger = Logger.getLogger(ModulListener.class);
=== renamed directory 'src/de/sub/goobi/Persistence' => 'src/de/sub/goobi/persistence'
=== modified file 'src/de/sub/goobi/persistence/BaseDAO.java'
--- src/de/sub/goobi/Persistence/BaseDAO.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/persistence/BaseDAO.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
//TODO: What's the licence of this file?
//TODO: Use Generics
=== modified file 'src/de/sub/goobi/persistence/BenutzerDAO.java'
--- src/de/sub/goobi/Persistence/BenutzerDAO.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/persistence/BenutzerDAO.java 2011-12-14 08:37:30 +0000
@@ -1,8 +1,8 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
import java.util.List;
-import de.sub.goobi.Beans.Benutzer;
+import de.sub.goobi.beans.Benutzer;
import de.sub.goobi.helper.exceptions.DAOException;
public class BenutzerDAO extends BaseDAO {
=== modified file 'src/de/sub/goobi/persistence/BenutzergruppenDAO.java'
--- src/de/sub/goobi/Persistence/BenutzergruppenDAO.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/persistence/BenutzergruppenDAO.java 2011-12-14 08:37:30 +0000
@@ -1,8 +1,8 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
import java.util.List;
-import de.sub.goobi.Beans.Benutzergruppe;
+import de.sub.goobi.beans.Benutzergruppe;
import de.sub.goobi.helper.exceptions.DAOException;
public class BenutzergruppenDAO extends BaseDAO {
=== modified file 'src/de/sub/goobi/persistence/HibernateSessionConversationFilter.java'
--- src/de/sub/goobi/Persistence/HibernateSessionConversationFilter.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/persistence/HibernateSessionConversationFilter.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
import java.io.IOException;
=== modified file 'src/de/sub/goobi/persistence/HibernateSessionConversationFilterWithoutTransaction.java'
--- src/de/sub/goobi/Persistence/HibernateSessionConversationFilterWithoutTransaction.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/persistence/HibernateSessionConversationFilterWithoutTransaction.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
import java.io.IOException;
=== modified file 'src/de/sub/goobi/persistence/HibernateSessionLong.java'
--- src/de/sub/goobi/Persistence/HibernateSessionLong.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/persistence/HibernateSessionLong.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
import org.apache.log4j.Logger;
import org.hibernate.HibernateException;
=== modified file 'src/de/sub/goobi/persistence/HibernateUtil.java'
--- src/de/sub/goobi/Persistence/HibernateUtil.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/persistence/HibernateUtil.java 2011-12-14 08:37:30 +0000
@@ -1,22 +1,22 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.Benutzergruppe;
-import de.sub.goobi.Beans.LdapGruppe;
-import de.sub.goobi.Beans.ProjectFileGroup;
-import de.sub.goobi.Beans.Projekt;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Prozesseigenschaft;
-import de.sub.goobi.Beans.Regelsatz;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Schritteigenschaft;
-import de.sub.goobi.Beans.Vorlage;
-import de.sub.goobi.Beans.Vorlageeigenschaft;
-import de.sub.goobi.Beans.Werkstueck;
-import de.sub.goobi.Beans.Werkstueckeigenschaft;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.Benutzergruppe;
+import de.sub.goobi.beans.LdapGruppe;
+import de.sub.goobi.beans.ProjectFileGroup;
+import de.sub.goobi.beans.Projekt;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Prozesseigenschaft;
+import de.sub.goobi.beans.Regelsatz;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Schritteigenschaft;
+import de.sub.goobi.beans.Vorlage;
+import de.sub.goobi.beans.Vorlageeigenschaft;
+import de.sub.goobi.beans.Werkstueck;
+import de.sub.goobi.beans.Werkstueckeigenschaft;
public class HibernateUtil {
=== modified file 'src/de/sub/goobi/persistence/HibernateUtilOld.java'
--- src/de/sub/goobi/Persistence/HibernateUtilOld.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/persistence/HibernateUtilOld.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
=== modified file 'src/de/sub/goobi/persistence/LdapGruppenDAO.java'
--- src/de/sub/goobi/Persistence/LdapGruppenDAO.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/persistence/LdapGruppenDAO.java 2011-12-14 08:37:30 +0000
@@ -1,8 +1,8 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
import java.util.List;
-import de.sub.goobi.Beans.LdapGruppe;
+import de.sub.goobi.beans.LdapGruppe;
import de.sub.goobi.helper.exceptions.DAOException;
@SuppressWarnings("serial")
=== modified file 'src/de/sub/goobi/persistence/ProjektDAO.java'
--- src/de/sub/goobi/Persistence/ProjektDAO.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/persistence/ProjektDAO.java 2011-12-14 08:37:30 +0000
@@ -1,8 +1,8 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
import java.util.List;
-import de.sub.goobi.Beans.Projekt;
+import de.sub.goobi.beans.Projekt;
import de.sub.goobi.helper.exceptions.DAOException;
public class ProjektDAO extends BaseDAO {
=== modified file 'src/de/sub/goobi/persistence/ProzessDAO.java'
--- src/de/sub/goobi/Persistence/ProzessDAO.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/persistence/ProzessDAO.java 2011-12-14 08:37:30 +0000
@@ -1,8 +1,8 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
import java.util.List;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.exceptions.DAOException;
public class ProzessDAO extends BaseDAO {
=== modified file 'src/de/sub/goobi/persistence/RegelsatzDAO.java'
--- src/de/sub/goobi/Persistence/RegelsatzDAO.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/persistence/RegelsatzDAO.java 2011-12-14 08:37:30 +0000
@@ -1,8 +1,8 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
import java.util.List;
-import de.sub.goobi.Beans.Regelsatz;
+import de.sub.goobi.beans.Regelsatz;
import de.sub.goobi.helper.exceptions.DAOException;
public class RegelsatzDAO extends BaseDAO {
=== modified file 'src/de/sub/goobi/persistence/SchrittDAO.java'
--- src/de/sub/goobi/Persistence/SchrittDAO.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/persistence/SchrittDAO.java 2011-12-14 08:37:30 +0000
@@ -1,10 +1,10 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
import java.util.List;
import org.goobi.production.search.lucene.LuceneIndex;
-import de.sub.goobi.Beans.Schritt;
+import de.sub.goobi.beans.Schritt;
import de.sub.goobi.helper.exceptions.DAOException;
public class SchrittDAO extends BaseDAO {
=== modified file 'src/de/sub/goobi/persistence/SimpleDAO.java'
--- src/de/sub/goobi/Persistence/SimpleDAO.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/persistence/SimpleDAO.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Persistence;
+package de.sub.goobi.persistence;
import de.sub.goobi.helper.exceptions.DAOException;
=== renamed directory 'src/de/sub/goobi/Statistik' => 'src/de/sub/goobi/statistik'
=== modified file 'src/de/sub/goobi/statistik/StatistikBenutzergruppen.java'
--- src/de/sub/goobi/Statistik/StatistikBenutzergruppen.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/statistik/StatistikBenutzergruppen.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Statistik;
+package de.sub.goobi.statistik;
import java.util.Iterator;
import java.util.List;
@@ -6,9 +6,9 @@
import org.jfree.data.general.Dataset;
import org.jfree.data.general.DefaultPieDataset;
-import de.sub.goobi.Beans.Benutzergruppe;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
+import de.sub.goobi.beans.Benutzergruppe;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
public class StatistikBenutzergruppen {
=== modified file 'src/de/sub/goobi/statistik/StatistikLaufzeitSchritte.java'
--- src/de/sub/goobi/Statistik/StatistikLaufzeitSchritte.java 2011-12-01 12:44:42 +0000
+++ src/de/sub/goobi/statistik/StatistikLaufzeitSchritte.java 2011-12-14 08:37:30 +0000
@@ -1,4 +1,4 @@
-package de.sub.goobi.Statistik;
+package de.sub.goobi.statistik;
import java.util.Calendar;
import java.util.Date;
@@ -7,8 +7,8 @@
import org.jfree.data.category.DefaultCategoryDataset;
import org.jfree.data.general.Dataset;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
public class StatistikLaufzeitSchritte {
=== modified file 'src/de/sub/goobi/statistik/StatistikStatus.java'
--- src/de/sub/goobi/Statistik/StatistikStatus.java 2011-07-19 17:06:09 +0000
+++ src/de/sub/goobi/statistik/StatistikStatus.java 2011-12-14 08:37:30 +0000
@@ -1,12 +1,12 @@
-package de.sub.goobi.Statistik;
+package de.sub.goobi.statistik;
import java.util.List;
import org.jfree.data.general.Dataset;
import org.jfree.data.general.DefaultPieDataset;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
public class StatistikStatus {
=== modified file 'src/org/goobi/api/display/DisplayCase.java'
--- src/org/goobi/api/display/DisplayCase.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/api/display/DisplayCase.java 2011-12-14 08:37:30 +0000
@@ -30,7 +30,7 @@
import org.goobi.api.display.enums.DisplayType;
import org.goobi.api.display.helper.ConfigDispayRules;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
public class DisplayCase {
=== modified file 'src/org/goobi/production/IProcessDataExport.java'
--- src/org/goobi/production/IProcessDataExport.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/IProcessDataExport.java 2011-12-14 08:37:30 +0000
@@ -27,7 +27,7 @@
import java.io.IOException;
import java.io.OutputStream;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
public interface IProcessDataExport {
=== modified file 'src/org/goobi/production/Import/ImportTest.java'
--- src/org/goobi/production/Import/ImportTest.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/Import/ImportTest.java 2011-12-14 08:37:30 +0000
@@ -12,8 +12,8 @@
import org.goobi.production.enums.ImportFormat;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Persistence.ProzessDAO;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.persistence.ProzessDAO;
import de.sub.goobi.helper.exceptions.DAOException;
public class ImportTest {
=== modified file 'src/org/goobi/production/Import/OpacMassImport.java'
--- src/org/goobi/production/Import/OpacMassImport.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/Import/OpacMassImport.java 2011-12-14 08:37:30 +0000
@@ -16,7 +16,7 @@
import ugh.exceptions.ReadException;
import ugh.exceptions.WriteException;
import ugh.fileformats.mets.MetsMods;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.exceptions.DAOException;
import de.sub.goobi.helper.exceptions.SwapException;
import de.unigoettingen.sub.search.opac.Catalogue;
=== modified file 'src/org/goobi/production/Import/ProductionDataImport.java'
--- src/org/goobi/production/Import/ProductionDataImport.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/Import/ProductionDataImport.java 2011-12-14 08:37:30 +0000
@@ -48,22 +48,22 @@
import com.thoughtworks.xstream.XStream;
-import de.sub.goobi.Beans.Benutzergruppe;
-import de.sub.goobi.Beans.HistoryEvent;
-import de.sub.goobi.Beans.Projekt;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Prozesseigenschaft;
-import de.sub.goobi.Beans.Regelsatz;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Schritteigenschaft;
-import de.sub.goobi.Beans.Vorlage;
-import de.sub.goobi.Beans.Vorlageeigenschaft;
-import de.sub.goobi.Beans.Werkstueck;
-import de.sub.goobi.Beans.Werkstueckeigenschaft;
-import de.sub.goobi.Persistence.BenutzergruppenDAO;
-import de.sub.goobi.Persistence.HibernateUtilOld;
-import de.sub.goobi.Persistence.ProjektDAO;
-import de.sub.goobi.Persistence.RegelsatzDAO;
+import de.sub.goobi.beans.Benutzergruppe;
+import de.sub.goobi.beans.HistoryEvent;
+import de.sub.goobi.beans.Projekt;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Prozesseigenschaft;
+import de.sub.goobi.beans.Regelsatz;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Schritteigenschaft;
+import de.sub.goobi.beans.Vorlage;
+import de.sub.goobi.beans.Vorlageeigenschaft;
+import de.sub.goobi.beans.Werkstueck;
+import de.sub.goobi.beans.Werkstueckeigenschaft;
+import de.sub.goobi.persistence.BenutzergruppenDAO;
+import de.sub.goobi.persistence.HibernateUtilOld;
+import de.sub.goobi.persistence.ProjektDAO;
+import de.sub.goobi.persistence.RegelsatzDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.enums.HistoryEventType;
import de.sub.goobi.helper.enums.PropertyType;
=== modified file 'src/org/goobi/production/api/property/xmlbasedprovider/IPropertyTemplatesProvider.java'
--- src/org/goobi/production/api/property/xmlbasedprovider/IPropertyTemplatesProvider.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/api/property/xmlbasedprovider/IPropertyTemplatesProvider.java 2011-12-14 08:37:30 +0000
@@ -28,7 +28,7 @@
import org.goobi.production.api.property.xmlbasedprovider.impl.PropertyTemplate;
-import de.sub.goobi.Beans.Property.IGoobiEntity;
+import de.sub.goobi.beans.property.IGoobiEntity;
public interface IPropertyTemplatesProvider {
=== modified file 'src/org/goobi/production/api/property/xmlbasedprovider/Status.java'
--- src/org/goobi/production/api/property/xmlbasedprovider/Status.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/api/property/xmlbasedprovider/Status.java 2011-12-14 08:37:30 +0000
@@ -24,11 +24,11 @@
* exception statement from your version.
*
*/
-import de.sub.goobi.Beans.Projekt;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Vorlage;
-import de.sub.goobi.Beans.Werkstueck;
+import de.sub.goobi.beans.Projekt;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Vorlage;
+import de.sub.goobi.beans.Werkstueck;
/**
* simple POJO class to generate PropertyTemplate for a IGoobiEntity
=== modified file 'src/org/goobi/production/api/property/xmlbasedprovider/impl/Parser.java'
--- src/org/goobi/production/api/property/xmlbasedprovider/impl/Parser.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/api/property/xmlbasedprovider/impl/Parser.java 2011-12-14 08:37:30 +0000
@@ -34,7 +34,7 @@
import org.jdom.Namespace;
import org.jdom.input.SAXBuilder;
-import de.sub.goobi.Beans.Property.IGoobiEntity;
+import de.sub.goobi.beans.property.IGoobiEntity;
import de.sub.goobi.helper.enums.PropertyType;
/******************************************************************************
=== modified file 'src/org/goobi/production/api/property/xmlbasedprovider/impl/PropertyTemplate.java'
--- src/org/goobi/production/api/property/xmlbasedprovider/impl/PropertyTemplate.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/api/property/xmlbasedprovider/impl/PropertyTemplate.java 2011-12-14 08:37:30 +0000
@@ -37,16 +37,16 @@
import org.apache.log4j.Logger;
import org.goobi.production.api.property.xmlbasedprovider.Status;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Prozesseigenschaft;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Schritteigenschaft;
-import de.sub.goobi.Beans.Vorlage;
-import de.sub.goobi.Beans.Vorlageeigenschaft;
-import de.sub.goobi.Beans.Werkstueck;
-import de.sub.goobi.Beans.Werkstueckeigenschaft;
-import de.sub.goobi.Beans.Property.IGoobiEntity;
-import de.sub.goobi.Beans.Property.IGoobiProperty;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Prozesseigenschaft;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Schritteigenschaft;
+import de.sub.goobi.beans.Vorlage;
+import de.sub.goobi.beans.Vorlageeigenschaft;
+import de.sub.goobi.beans.Werkstueck;
+import de.sub.goobi.beans.Werkstueckeigenschaft;
+import de.sub.goobi.beans.property.IGoobiEntity;
+import de.sub.goobi.beans.property.IGoobiProperty;
import de.sub.goobi.helper.enums.PropertyType;
/**********************************************************************************
@@ -322,7 +322,7 @@
/*
* (non-Javadoc)
*
- * @see org.goobi.production.api.property.xmlbasedprovider.impl.IPropertyTemplate#setProperty(de.sub.goobi.Beans.Property.IGoobiProperty)
+ * @see org.goobi.production.api.property.xmlbasedprovider.impl.IPropertyTemplate#setProperty(de.sub.goobi.beans.property.IGoobiProperty)
*/
public boolean setProperty(IGoobiProperty inProp) {
@@ -429,7 +429,7 @@
/*
* (non-Javadoc)
*
- * @see org.goobi.production.api.property.xmlbasedprovider.impl.IPropertyTemplate#setOwningEntity(de.sub.goobi.Beans.Property.IGoobiEntity)
+ * @see org.goobi.production.api.property.xmlbasedprovider.impl.IPropertyTemplate#setOwningEntity(de.sub.goobi.beans.property.IGoobiEntity)
*/
public void setOwningEntity(IGoobiEntity inEntity) {
owningEntity = inEntity;
=== modified file 'src/org/goobi/production/api/property/xmlbasedprovider/impl/XMLBasedPropertyTemplateProvider.java'
--- src/org/goobi/production/api/property/xmlbasedprovider/impl/XMLBasedPropertyTemplateProvider.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/api/property/xmlbasedprovider/impl/XMLBasedPropertyTemplateProvider.java 2011-12-14 08:37:30 +0000
@@ -32,7 +32,7 @@
import org.goobi.production.api.property.xmlbasedprovider.Status;
import org.jdom.JDOMException;
-import de.sub.goobi.Beans.Property.IGoobiEntity;
+import de.sub.goobi.beans.property.IGoobiEntity;
import de.sub.goobi.config.ConfigMain;
/**************************************************************************************************
=== modified file 'src/org/goobi/production/chart/HibernateProjectTaskList.java'
--- src/org/goobi/production/chart/HibernateProjectTaskList.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/chart/HibernateProjectTaskList.java 2011-12-14 08:37:30 +0000
@@ -35,8 +35,8 @@
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
-import de.sub.goobi.Beans.Projekt;
-import de.sub.goobi.Beans.Schritt;
+import de.sub.goobi.beans.Projekt;
+import de.sub.goobi.beans.Schritt;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.enums.StepStatus;
=== modified file 'src/org/goobi/production/chart/HibernateProjectionProjectTaskList.java'
--- src/org/goobi/production/chart/HibernateProjectionProjectTaskList.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/chart/HibernateProjectionProjectTaskList.java 2011-12-14 08:37:30 +0000
@@ -37,8 +37,8 @@
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
-import de.sub.goobi.Beans.Projekt;
-import de.sub.goobi.Beans.Schritt;
+import de.sub.goobi.beans.Projekt;
+import de.sub.goobi.beans.Schritt;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.enums.StepStatus;
=== modified file 'src/org/goobi/production/chart/IProvideProjectTaskList.java'
--- src/org/goobi/production/chart/IProvideProjectTaskList.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/chart/IProvideProjectTaskList.java 2011-12-14 08:37:30 +0000
@@ -26,7 +26,7 @@
import java.util.List;
-import de.sub.goobi.Beans.Projekt;
+import de.sub.goobi.beans.Projekt;
=== modified file 'src/org/goobi/production/chart/WorkflowProjectTaskList.java'
--- src/org/goobi/production/chart/WorkflowProjectTaskList.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/chart/WorkflowProjectTaskList.java 2011-12-14 08:37:30 +0000
@@ -29,7 +29,7 @@
import org.goobi.production.flow.statistics.StepInformation;
-import de.sub.goobi.Beans.Projekt;
+import de.sub.goobi.beans.Projekt;
=== modified file 'src/org/goobi/production/cli/CommandLineInterface.java'
--- src/org/goobi/production/cli/CommandLineInterface.java 2011-12-01 13:02:10 +0000
+++ src/org/goobi/production/cli/CommandLineInterface.java 2011-12-14 08:37:30 +0000
@@ -21,16 +21,16 @@
import ugh.exceptions.PreferencesException;
import ugh.exceptions.ReadException;
import ugh.exceptions.WriteException;
-import de.sub.goobi.Beans.Benutzergruppe;
-import de.sub.goobi.Beans.HistoryEvent;
-import de.sub.goobi.Beans.Projekt;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Export.dms.ExportDms;
-import de.sub.goobi.Persistence.BenutzergruppenDAO;
-import de.sub.goobi.Persistence.ProjektDAO;
-import de.sub.goobi.Persistence.ProzessDAO;
-import de.sub.goobi.Persistence.SchrittDAO;
+import de.sub.goobi.beans.Benutzergruppe;
+import de.sub.goobi.beans.HistoryEvent;
+import de.sub.goobi.beans.Projekt;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.export.dms.ExportDms;
+import de.sub.goobi.persistence.BenutzergruppenDAO;
+import de.sub.goobi.persistence.ProjektDAO;
+import de.sub.goobi.persistence.ProzessDAO;
+import de.sub.goobi.persistence.SchrittDAO;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.HelperSchritte;
import de.sub.goobi.helper.enums.HistoryEventType;
=== modified file 'src/org/goobi/production/cli/helper/CopyProcess.java'
--- src/org/goobi/production/cli/helper/CopyProcess.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/cli/helper/CopyProcess.java 2011-12-14 08:37:30 +0000
@@ -37,16 +37,16 @@
import ugh.exceptions.WriteException;
import ugh.fileformats.mets.MetsMods;
import ugh.fileformats.mets.MetsModsImportExport;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Vorlage;
-import de.sub.goobi.Beans.Vorlageeigenschaft;
-import de.sub.goobi.Beans.Werkstueck;
-import de.sub.goobi.Beans.Werkstueckeigenschaft;
-import de.sub.goobi.Forms.AdditionalField;
-import de.sub.goobi.Forms.LoginForm;
-import de.sub.goobi.Forms.ProzesskopieForm;
-import de.sub.goobi.Persistence.ProzessDAO;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Vorlage;
+import de.sub.goobi.beans.Vorlageeigenschaft;
+import de.sub.goobi.beans.Werkstueck;
+import de.sub.goobi.beans.Werkstueckeigenschaft;
+import de.sub.goobi.forms.AdditionalField;
+import de.sub.goobi.forms.LoginForm;
+import de.sub.goobi.forms.ProzesskopieForm;
+import de.sub.goobi.persistence.ProzessDAO;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.config.ConfigOpac;
import de.sub.goobi.config.ConfigOpacDoctype;
=== modified file 'src/org/goobi/production/export/ExportDocket.java'
--- src/org/goobi/production/export/ExportDocket.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/export/ExportDocket.java 2011-12-14 08:37:30 +0000
@@ -44,7 +44,7 @@
import org.apache.fop.apps.MimeConstants;
import org.goobi.production.IProcessDataExport;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.exceptions.ExportFileException;
/**
=== modified file 'src/org/goobi/production/export/ExportXmlLog.java'
--- src/org/goobi/production/export/ExportXmlLog.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/export/ExportXmlLog.java 2011-12-14 08:37:30 +0000
@@ -42,14 +42,14 @@
import org.jdom.transform.XSLTransformException;
import org.jdom.transform.XSLTransformer;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Prozesseigenschaft;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Schritteigenschaft;
-import de.sub.goobi.Beans.Vorlage;
-import de.sub.goobi.Beans.Vorlageeigenschaft;
-import de.sub.goobi.Beans.Werkstueck;
-import de.sub.goobi.Beans.Werkstueckeigenschaft;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Prozesseigenschaft;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Schritteigenschaft;
+import de.sub.goobi.beans.Vorlage;
+import de.sub.goobi.beans.Vorlageeigenschaft;
+import de.sub.goobi.beans.Werkstueck;
+import de.sub.goobi.beans.Werkstueckeigenschaft;
import de.sub.goobi.helper.exceptions.ExportFileException;
/**
=== modified file 'src/org/goobi/production/flow/jobs/HistoryAnalyserJob.java'
--- src/org/goobi/production/flow/jobs/HistoryAnalyserJob.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/flow/jobs/HistoryAnalyserJob.java 2011-12-14 08:37:30 +0000
@@ -35,10 +35,10 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import de.sub.goobi.Beans.HistoryEvent;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Schritteigenschaft;
+import de.sub.goobi.beans.HistoryEvent;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Schritteigenschaft;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.enums.HistoryEventType;
import de.sub.goobi.helper.exceptions.DAOException;
=== modified file 'src/org/goobi/production/flow/jobs/HistoryAnalyserJob2.java'
--- src/org/goobi/production/flow/jobs/HistoryAnalyserJob2.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/flow/jobs/HistoryAnalyserJob2.java 2011-12-14 08:37:30 +0000
@@ -35,10 +35,10 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import de.sub.goobi.Beans.HistoryEvent;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Schritteigenschaft;
+import de.sub.goobi.beans.HistoryEvent;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Schritteigenschaft;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.enums.HistoryEventType;
import de.sub.goobi.helper.exceptions.DAOException;
=== modified file 'src/org/goobi/production/flow/jobs/HistoryJob.java'
--- src/org/goobi/production/flow/jobs/HistoryJob.java 2011-07-19 17:06:09 +0000
+++ src/org/goobi/production/flow/jobs/HistoryJob.java 2011-12-14 08:37:30 +0000
@@ -16,10 +16,10 @@
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
-import de.sub.goobi.Beans.HistoryEvent;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Schritteigenschaft;
+import de.sub.goobi.beans.HistoryEvent;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Schritteigenschaft;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.enums.HistoryEventType;
import de.sub.goobi.helper.enums.PropertyType;
=== modified file 'src/org/goobi/production/flow/jobs/LuceneIndexJob.java'
--- src/org/goobi/production/flow/jobs/LuceneIndexJob.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/flow/jobs/LuceneIndexJob.java 2011-12-14 08:37:30 +0000
@@ -35,7 +35,7 @@
import org.hibernate.ScrollableResults;
import org.hibernate.Session;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.Helper;
=== modified file 'src/org/goobi/production/flow/jobs/LuceneIndexJobIDVersion.java'
--- src/org/goobi/production/flow/jobs/LuceneIndexJobIDVersion.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/flow/jobs/LuceneIndexJobIDVersion.java 2011-12-14 08:37:30 +0000
@@ -37,8 +37,8 @@
import org.hibernate.criterion.Projections;
import org.hibernate.exception.GenericJDBCException;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Persistence.ProzessDAO;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.persistence.ProzessDAO;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.exceptions.DAOException;
=== modified file 'src/org/goobi/production/flow/statistics/StatisticsManager.java'
--- src/org/goobi/production/flow/statistics/StatisticsManager.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/flow/statistics/StatisticsManager.java 2011-12-14 08:37:30 +0000
@@ -44,8 +44,8 @@
import de.intranda.commons.chart.results.DataRow;
import de.intranda.commons.chart.results.DataTable;
-import de.sub.goobi.Statistik.StatistikLaufzeitSchritte;
-import de.sub.goobi.Statistik.StatistikStatus;
+import de.sub.goobi.statistik.StatistikLaufzeitSchritte;
+import de.sub.goobi.statistik.StatistikStatus;
import de.sub.goobi.helper.Helper;
/**
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/Converter.java'
--- src/org/goobi/production/flow/statistics/hibernate/Converter.java 2011-07-19 17:06:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/Converter.java 2011-12-14 08:37:30 +0000
@@ -54,7 +54,7 @@
new DateFormatSymbols(StatisticsManager.getLocale()));
} catch (NullPointerException e) {
logger
- .error("Class statistics.hibernate.Converter Error, can't get FacesContext");
+ .error("Class statistics.hibernate.converter Error, can't get FacesContext");
}
}
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/FilterHelper.java'
--- src/org/goobi/production/flow/statistics/hibernate/FilterHelper.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/FilterHelper.java 2011-12-14 08:37:30 +0000
@@ -39,12 +39,12 @@
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
-import de.sub.goobi.Beans.Benutzer;
-import de.sub.goobi.Beans.Projekt;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Forms.LoginForm;
-import de.sub.goobi.Persistence.BenutzerDAO;
+import de.sub.goobi.beans.Benutzer;
+import de.sub.goobi.beans.Projekt;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.forms.LoginForm;
+import de.sub.goobi.persistence.BenutzerDAO;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.PaginatingCriteria;
import de.sub.goobi.helper.enums.StepStatus;
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestCorrections.java'
--- src/org/goobi/production/flow/statistics/hibernate/StatQuestCorrections.java 2011-07-19 17:06:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/StatQuestCorrections.java 2011-12-14 08:37:30 +0000
@@ -133,7 +133,7 @@
//setting row name with date/time extraction based on the group
dataRow.setName(new Converter(objArr[1]).getString() + "");
- //dataRow.setName(new Converter(objArr[2]).getString());
+ //dataRow.setName(new converter(objArr[2]).getString());
dataRow.addValue(Helper.getTranslation("Corrections/Errors"),
(new Converter(objArr[0]).getDouble()));
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestProduction.java'
--- src/org/goobi/production/flow/statistics/hibernate/StatQuestProduction.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/StatQuestProduction.java 2011-12-14 08:37:30 +0000
@@ -41,7 +41,7 @@
import de.intranda.commons.chart.renderer.IRenderer;
import de.intranda.commons.chart.results.DataRow;
import de.intranda.commons.chart.results.DataTable;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.Helper;
/**
@@ -157,7 +157,7 @@
dataRowChart.setName(new Converter(objArr[2]).getString() + "");
dataRow.setName(new Converter(objArr[2]).getString() + "");
- // dataRow.setName(new Converter(objArr[2]).getString());
+ // dataRow.setName(new converter(objArr[2]).getString());
// building up row depending on requested output having different fields
switch (this.cu) {
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestStorage.java'
--- src/org/goobi/production/flow/statistics/hibernate/StatQuestStorage.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/StatQuestStorage.java 2011-12-14 08:37:30 +0000
@@ -123,7 +123,7 @@
//setting row name with date/time extraction based on the group
dataRow.setName(new Converter(objArr[1]).getString() + "");
- //dataRow.setName(new Converter(objArr[2]).getString());
+ //dataRow.setName(new converter(objArr[2]).getString());
dataRow.addValue(Helper.getTranslation("storageDifference"),
(new Converter(objArr[0]).getGB()));
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestUsergroups.java'
--- src/org/goobi/production/flow/statistics/hibernate/StatQuestUsergroups.java 2011-07-19 17:06:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/StatQuestUsergroups.java 2011-12-14 08:37:30 +0000
@@ -39,8 +39,8 @@
import de.intranda.commons.chart.renderer.IRenderer;
import de.intranda.commons.chart.results.DataRow;
import de.intranda.commons.chart.results.DataTable;
-import de.sub.goobi.Beans.Benutzergruppe;
-import de.sub.goobi.Beans.Schritt;
+import de.sub.goobi.beans.Benutzergruppe;
+import de.sub.goobi.beans.Schritt;
import de.sub.goobi.helper.Helper;
/*****************************************************************************
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestVolumeStatus.java'
--- src/org/goobi/production/flow/statistics/hibernate/StatQuestVolumeStatus.java 2011-07-19 17:06:09 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/StatQuestVolumeStatus.java 2011-12-14 08:37:30 +0000
@@ -39,7 +39,7 @@
import de.intranda.commons.chart.renderer.IRenderer;
import de.intranda.commons.chart.results.DataRow;
import de.intranda.commons.chart.results.DataTable;
-import de.sub.goobi.Beans.Schritt;
+import de.sub.goobi.beans.Schritt;
import de.sub.goobi.helper.Helper;
/*****************************************************************************
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/UserDefinedFilter.java'
--- src/org/goobi/production/flow/statistics/hibernate/UserDefinedFilter.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/UserDefinedFilter.java 2011-12-14 08:37:30 +0000
@@ -36,7 +36,7 @@
import org.hibernate.criterion.CriteriaSpecification;
import org.hibernate.criterion.Restrictions;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.PaginatingCriteria;
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/UserDefinedStepFilter.java'
--- src/org/goobi/production/flow/statistics/hibernate/UserDefinedStepFilter.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/UserDefinedStepFilter.java 2011-12-14 08:37:30 +0000
@@ -33,7 +33,7 @@
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
-import de.sub.goobi.Beans.Schritt;
+import de.sub.goobi.beans.Schritt;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.PaginatingCriteria;
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/UserProcessesFilter.java'
--- src/org/goobi/production/flow/statistics/hibernate/UserProcessesFilter.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/UserProcessesFilter.java 2011-12-14 08:37:30 +0000
@@ -30,7 +30,7 @@
import org.hibernate.Criteria;
import org.hibernate.Session;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.PaginatingCriteria;
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/UserProjectFilter.java'
--- src/org/goobi/production/flow/statistics/hibernate/UserProjectFilter.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/UserProjectFilter.java 2011-12-14 08:37:30 +0000
@@ -34,7 +34,7 @@
import org.hibernate.criterion.CriteriaSpecification;
import org.hibernate.criterion.Restrictions;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.PaginatingCriteria;
=== modified file 'src/org/goobi/production/flow/statistics/hibernate/UserTemplatesFilter.java'
--- src/org/goobi/production/flow/statistics/hibernate/UserTemplatesFilter.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/flow/statistics/hibernate/UserTemplatesFilter.java 2011-12-14 08:37:30 +0000
@@ -30,7 +30,7 @@
import org.hibernate.Criteria;
import org.hibernate.Session;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.PaginatingCriteria;
=== modified file 'src/org/goobi/production/search/api/IIndexer.java'
--- src/org/goobi/production/search/api/IIndexer.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/search/api/IIndexer.java 2011-12-14 08:37:30 +0000
@@ -1,6 +1,6 @@
package org.goobi.production.search.api;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
/**
* This file is part of the Goobi Application - a Workflow tool for the support of mass digitization.
=== modified file 'src/org/goobi/production/search/lucene/LuceneFilter.java'
--- src/org/goobi/production/search/lucene/LuceneFilter.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/search/lucene/LuceneFilter.java 2011-12-14 08:37:30 +0000
@@ -35,7 +35,7 @@
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
-import de.sub.goobi.Beans.Prozess;
+import de.sub.goobi.beans.Prozess;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.PaginatingCriteria;
=== modified file 'src/org/goobi/production/search/lucene/LuceneIndex.java'
--- src/org/goobi/production/search/lucene/LuceneIndex.java 2011-12-01 12:44:42 +0000
+++ src/org/goobi/production/search/lucene/LuceneIndex.java 2011-12-14 08:37:30 +0000
@@ -50,14 +50,14 @@
import ugh.dl.DocStruct;
import ugh.dl.Metadata;
import ugh.dl.MetadataType;
-import de.sub.goobi.Beans.Prozess;
-import de.sub.goobi.Beans.Prozesseigenschaft;
-import de.sub.goobi.Beans.Schritt;
-import de.sub.goobi.Beans.Schritteigenschaft;
-import de.sub.goobi.Beans.Vorlage;
-import de.sub.goobi.Beans.Vorlageeigenschaft;
-import de.sub.goobi.Beans.Werkstueck;
-import de.sub.goobi.Beans.Werkstueckeigenschaft;
+import de.sub.goobi.beans.Prozess;
+import de.sub.goobi.beans.Prozesseigenschaft;
+import de.sub.goobi.beans.Schritt;
+import de.sub.goobi.beans.Schritteigenschaft;
+import de.sub.goobi.beans.Vorlage;
+import de.sub.goobi.beans.Vorlageeigenschaft;
+import de.sub.goobi.beans.Werkstueck;
+import de.sub.goobi.beans.Werkstueckeigenschaft;
import de.sub.goobi.config.ConfigMain;
import de.sub.goobi.helper.Helper;
import de.sub.goobi.helper.enums.StepStatus;
Follow ups
