Merge lp:~henning-gerhardt/goobi-production/bug-754438 into lp:goobi-production/1.7
- bug-754438
- Merge into 1.7
Proposed by
Henning Gerhardt
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 7 | ||||
Proposed branch: | lp:~henning-gerhardt/goobi-production/bug-754438 | ||||
Merge into: | lp:goobi-production/1.7 | ||||
Diff against target: |
3520 lines (+568/-568) 171 files modified
WEB-INF/faces-config.xml (+21/-21) WEB-INF/metadata-editor-config.xml (+4/-4) WEB-INF/web.xml (+2/-2) build.xml (+2/-2) config/hibernate.cfg.xml (+16/-16) newpages/inc/head.jsp (+1/-1) newpages/inc_AktuelleSchritte/Schritte_Liste.jsp (+1/-1) newpages/inc_Prozessverwaltung/Context_Prozesse_Liste.jsp (+1/-1) newpages/inc_Prozessverwaltung/Prozesse_Liste.jsp (+1/-1) newpages/inc_Prozessverwaltung/prozess_box_Schritte.jsp (+1/-1) src/de/sub/goobi/Import/Import.java (+1/-1) src/de/sub/goobi/Import/ImportRussland.java (+1/-1) src/de/sub/goobi/Import/ImportZentralblatt.java (+1/-1) src/de/sub/goobi/beans/Benutzer.hbm.xml (+7/-7) src/de/sub/goobi/beans/Benutzer.java (+1/-1) src/de/sub/goobi/beans/Benutzereigenschaft.hbm.xml (+2/-2) src/de/sub/goobi/beans/Benutzereigenschaft.java (+3/-3) src/de/sub/goobi/beans/Benutzergruppe.hbm.xml (+3/-3) src/de/sub/goobi/beans/Benutzergruppe.java (+1/-1) src/de/sub/goobi/beans/HistoryEvent.hbm.xml (+2/-2) src/de/sub/goobi/beans/HistoryEvent.java (+1/-1) src/de/sub/goobi/beans/LdapGruppe.hbm.xml (+1/-1) src/de/sub/goobi/beans/LdapGruppe.java (+1/-1) src/de/sub/goobi/beans/ProjectFileGroup.hbm.xml (+2/-2) src/de/sub/goobi/beans/ProjectFileGroup.java (+1/-1) src/de/sub/goobi/beans/Projekt.hbm.xml (+4/-4) src/de/sub/goobi/beans/Projekt.java (+1/-1) src/de/sub/goobi/beans/Prozess.hbm.xml (+8/-8) src/de/sub/goobi/beans/Prozess.java (+9/-9) src/de/sub/goobi/beans/Prozesseigenschaft.hbm.xml (+2/-2) src/de/sub/goobi/beans/Prozesseigenschaft.java (+3/-3) src/de/sub/goobi/beans/Regelsatz.hbm.xml (+1/-1) src/de/sub/goobi/beans/Regelsatz.java (+1/-1) src/de/sub/goobi/beans/Schritt.hbm.xml (+6/-6) src/de/sub/goobi/beans/Schritt.java (+4/-4) src/de/sub/goobi/beans/Schritteigenschaft.hbm.xml (+2/-2) src/de/sub/goobi/beans/Schritteigenschaft.java (+3/-3) src/de/sub/goobi/beans/Vorlage.hbm.xml (+3/-3) src/de/sub/goobi/beans/Vorlage.java (+4/-4) src/de/sub/goobi/beans/Vorlageeigenschaft.hbm.xml (+2/-2) src/de/sub/goobi/beans/Vorlageeigenschaft.java (+3/-3) src/de/sub/goobi/beans/Werkstueck.hbm.xml (+3/-3) src/de/sub/goobi/beans/Werkstueck.java (+4/-4) src/de/sub/goobi/beans/Werkstueckeigenschaft.hbm.xml (+2/-2) src/de/sub/goobi/beans/Werkstueckeigenschaft.java (+3/-3) src/de/sub/goobi/beans/property/DisplayPropertyList.java (+2/-2) src/de/sub/goobi/beans/property/IGoobiEntity.java (+1/-1) src/de/sub/goobi/beans/property/IGoobiProperty.java (+1/-1) src/de/sub/goobi/config/ConfigProjects.java (+1/-1) src/de/sub/goobi/converter/RegelsatzConverter.java (+3/-3) src/de/sub/goobi/converter/StatisticsCalculationUnitConverter.java (+1/-1) src/de/sub/goobi/converter/StatisticsResultOutputConverter.java (+1/-1) src/de/sub/goobi/converter/StatisticsTimeUnitConverter.java (+1/-1) src/de/sub/goobi/export/dms/DmsImportThread.java (+2/-2) src/de/sub/goobi/export/dms/ExportDms.java (+6/-6) src/de/sub/goobi/export/dms/ExportDms_CorrectRusdml.java (+2/-2) src/de/sub/goobi/export/download/ExportMets.java (+7/-7) src/de/sub/goobi/export/download/ExportPdf.java (+4/-4) src/de/sub/goobi/export/download/Multipage.java (+3/-3) src/de/sub/goobi/export/download/TiffHeader.java (+4/-4) src/de/sub/goobi/forms/AdditionalField.java (+1/-1) src/de/sub/goobi/forms/AdministrationForm.java (+11/-11) src/de/sub/goobi/forms/AktuelleSchritteForm.java (+16/-16) src/de/sub/goobi/forms/BasisForm.java (+3/-3) src/de/sub/goobi/forms/BenutzergruppenForm.java (+3/-3) src/de/sub/goobi/forms/BenutzerverwaltungForm.java (+9/-9) src/de/sub/goobi/forms/HelperForm.java (+3/-3) src/de/sub/goobi/forms/LdapGruppenForm.java (+3/-3) src/de/sub/goobi/forms/LoginForm.java (+6/-6) src/de/sub/goobi/forms/LongRunningTasksForm.java (+2/-2) src/de/sub/goobi/forms/ModuleServerForm.java (+10/-10) src/de/sub/goobi/forms/NavigationForm.java (+1/-1) src/de/sub/goobi/forms/ProjekteForm.java (+5/-5) src/de/sub/goobi/forms/ProzesskopieForm.java (+11/-11) src/de/sub/goobi/forms/ProzessverwaltungForm.java (+21/-21) src/de/sub/goobi/forms/RegelsaetzeForm.java (+3/-3) src/de/sub/goobi/forms/SessionForm.java (+2/-2) src/de/sub/goobi/forms/SpracheForm.java (+1/-1) src/de/sub/goobi/forms/StatistikForm.java (+5/-5) src/de/sub/goobi/helper/BeanHelper.java (+10/-10) src/de/sub/goobi/helper/FileUtils.java (+1/-1) src/de/sub/goobi/helper/GoobiScript.java (+11/-11) src/de/sub/goobi/helper/Helper.java (+5/-5) src/de/sub/goobi/helper/HelperSchritte.java (+5/-5) src/de/sub/goobi/helper/Page.java (+1/-1) src/de/sub/goobi/helper/ProjectHelper.java (+3/-3) src/de/sub/goobi/helper/ScriptThread.java (+1/-1) src/de/sub/goobi/helper/UghHelper.java (+1/-1) src/de/sub/goobi/helper/VariableReplacer.java (+7/-7) src/de/sub/goobi/helper/WebDav.java (+3/-3) src/de/sub/goobi/helper/XmlArtikelZaehlen.java (+2/-2) src/de/sub/goobi/helper/exceptions/GUIExceptionWrapper.java (+2/-2) src/de/sub/goobi/helper/ldap/Ldap.java (+1/-1) src/de/sub/goobi/helper/ldap/LdapUser.java (+2/-2) src/de/sub/goobi/helper/servletfilter/HibernateSessionFilter2.java (+2/-2) src/de/sub/goobi/helper/servletfilter/SessionCounterFilter.java (+1/-1) src/de/sub/goobi/helper/tasks/CreatePdfFromServletThread.java (+4/-4) src/de/sub/goobi/helper/tasks/LongRunningTask.java (+1/-1) src/de/sub/goobi/helper/tasks/ProcessSwapInTask.java (+2/-2) src/de/sub/goobi/helper/tasks/ProcessSwapOutTask.java (+2/-2) src/de/sub/goobi/helper/tasks/TiffWriterTask.java (+1/-1) src/de/sub/goobi/metadaten/MetaPerson.java (+1/-1) src/de/sub/goobi/metadaten/Metadaten.java (+3/-3) src/de/sub/goobi/metadaten/MetadatenHelper.java (+2/-2) src/de/sub/goobi/metadaten/MetadatenImagesHelper.java (+2/-2) src/de/sub/goobi/metadaten/MetadatenSperrung.java (+1/-1) src/de/sub/goobi/metadaten/MetadatenVerifizierung.java (+2/-2) src/de/sub/goobi/metadaten/Metadatum.java (+2/-2) src/de/sub/goobi/metadaten/Pagination.java (+1/-1) src/de/sub/goobi/metadaten/TreeNodeStruct3.java (+1/-1) src/de/sub/goobi/modul/ExtendedDataImpl.java (+9/-9) src/de/sub/goobi/modul/ExtendedProzessImpl.java (+3/-3) src/de/sub/goobi/modul/ModulListener.java (+2/-2) src/de/sub/goobi/persistence/BaseDAO.java (+1/-1) src/de/sub/goobi/persistence/BenutzerDAO.java (+2/-2) src/de/sub/goobi/persistence/BenutzergruppenDAO.java (+2/-2) src/de/sub/goobi/persistence/HibernateSessionConversationFilter.java (+1/-1) src/de/sub/goobi/persistence/HibernateSessionConversationFilterWithoutTransaction.java (+1/-1) src/de/sub/goobi/persistence/HibernateSessionLong.java (+1/-1) src/de/sub/goobi/persistence/HibernateUtil.java (+15/-15) src/de/sub/goobi/persistence/HibernateUtilOld.java (+1/-1) src/de/sub/goobi/persistence/LdapGruppenDAO.java (+2/-2) src/de/sub/goobi/persistence/ProjektDAO.java (+2/-2) src/de/sub/goobi/persistence/ProzessDAO.java (+2/-2) src/de/sub/goobi/persistence/RegelsatzDAO.java (+2/-2) src/de/sub/goobi/persistence/SchrittDAO.java (+2/-2) src/de/sub/goobi/persistence/SimpleDAO.java (+1/-1) src/de/sub/goobi/statistik/StatistikBenutzergruppen.java (+4/-4) src/de/sub/goobi/statistik/StatistikLaufzeitSchritte.java (+3/-3) src/de/sub/goobi/statistik/StatistikStatus.java (+3/-3) src/messages/Messages.java (+2/-2) src/org/goobi/api/display/DisplayCase.java (+1/-1) src/org/goobi/production/IProcessDataExport.java (+1/-1) src/org/goobi/production/Import/ImportTest.java (+2/-2) src/org/goobi/production/Import/OpacMassImport.java (+1/-1) src/org/goobi/production/Import/ProductionDataImport.java (+16/-16) src/org/goobi/production/api/property/xmlbasedprovider/IPropertyTemplatesProvider.java (+1/-1) src/org/goobi/production/api/property/xmlbasedprovider/Status.java (+5/-5) src/org/goobi/production/api/property/xmlbasedprovider/impl/Parser.java (+1/-1) src/org/goobi/production/api/property/xmlbasedprovider/impl/PropertyTemplate.java (+12/-12) src/org/goobi/production/api/property/xmlbasedprovider/impl/XMLBasedPropertyTemplateProvider.java (+1/-1) src/org/goobi/production/chart/HibernateProjectTaskList.java (+2/-2) src/org/goobi/production/chart/HibernateProjectionProjectTaskList.java (+2/-2) src/org/goobi/production/chart/IProvideProjectTaskList.java (+1/-1) src/org/goobi/production/chart/WorkflowProjectTaskList.java (+1/-1) src/org/goobi/production/cli/CommandLineInterface.java (+10/-10) src/org/goobi/production/cli/helper/CopyProcess.java (+10/-10) src/org/goobi/production/export/ExportDocket.java (+1/-1) src/org/goobi/production/export/ExportXmlLog.java (+8/-8) src/org/goobi/production/flow/jobs/HistoryAnalyserJob.java (+4/-4) src/org/goobi/production/flow/jobs/HistoryAnalyserJob2.java (+4/-4) src/org/goobi/production/flow/jobs/HistoryJob.java (+4/-4) src/org/goobi/production/flow/jobs/LuceneIndexJob.java (+1/-1) src/org/goobi/production/flow/jobs/LuceneIndexJobIDVersion.java (+2/-2) src/org/goobi/production/flow/statistics/StatisticsManager.java (+2/-2) src/org/goobi/production/flow/statistics/hibernate/Converter.java (+1/-1) src/org/goobi/production/flow/statistics/hibernate/FilterHelper.java (+6/-6) src/org/goobi/production/flow/statistics/hibernate/StatQuestCorrections.java (+1/-1) src/org/goobi/production/flow/statistics/hibernate/StatQuestProduction.java (+2/-2) src/org/goobi/production/flow/statistics/hibernate/StatQuestProjectProgressData.java (+1/-1) src/org/goobi/production/flow/statistics/hibernate/StatQuestStorage.java (+1/-1) src/org/goobi/production/flow/statistics/hibernate/StatQuestUsergroups.java (+2/-2) src/org/goobi/production/flow/statistics/hibernate/StatQuestVolumeStatus.java (+1/-1) src/org/goobi/production/flow/statistics/hibernate/UserDefinedFilter.java (+1/-1) src/org/goobi/production/flow/statistics/hibernate/UserDefinedStepFilter.java (+1/-1) src/org/goobi/production/flow/statistics/hibernate/UserProcessesFilter.java (+1/-1) src/org/goobi/production/flow/statistics/hibernate/UserProjectFilter.java (+1/-1) src/org/goobi/production/flow/statistics/hibernate/UserTemplatesFilter.java (+1/-1) src/org/goobi/production/search/api/IIndexer.java (+1/-1) src/org/goobi/production/search/lucene/LuceneFilter.java (+1/-1) src/org/goobi/production/search/lucene/LuceneIndex.java (+8/-8) |
||||
To merge this branch: | bzr merge lp:~henning-gerhardt/goobi-production/bug-754438 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ralf Claussnitzer (community) | Approve | ||
Review via email: mp+85611@code.launchpad.net |
Commit message
Description of the change
Renaming wrong spelled packages name.
To post a comment you must log in.
Revision history for this message
Ralf Claussnitzer (ralf-claussnitzer-deactivatedaccount) wrote : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'WEB-INF/faces-config.xml' |
2 | --- WEB-INF/faces-config.xml 2011-12-01 12:44:42 +0000 |
3 | +++ WEB-INF/faces-config.xml 2011-12-14 09:20:02 +0000 |
4 | @@ -306,28 +306,28 @@ |
5 | </navigation-case> |
6 | </navigation-rule> |
7 | |
8 | - <!-- RuleSet Converter for Select-Boxes --> |
9 | + <!-- RuleSet converter for Select-Boxes --> |
10 | <converter> |
11 | <converter-id>RegelsatzConverter</converter-id> |
12 | - <converter-class>de.sub.goobi.Converter.RegelsatzConverter</converter-class> |
13 | + <converter-class>de.sub.goobi.converter.RegelsatzConverter</converter-class> |
14 | </converter> |
15 | |
16 | <!-- StatisticsTimeUnitConverter for Select-Boxes --> |
17 | <converter> |
18 | <converter-id>StatisticsTimeUnitConverter</converter-id> |
19 | - <converter-class>de.sub.goobi.Converter.StatisticsTimeUnitConverter</converter-class> |
20 | + <converter-class>de.sub.goobi.converter.StatisticsTimeUnitConverter</converter-class> |
21 | </converter> |
22 | |
23 | <!-- StatisticResultOutputConverter for Select-Boxes --> |
24 | <converter> |
25 | <converter-id>StatisticsResultOutputConverter</converter-id> |
26 | - <converter-class>de.sub.goobi.Converter.StatisticsResultOutputConverter</converter-class> |
27 | + <converter-class>de.sub.goobi.converter.StatisticsResultOutputConverter</converter-class> |
28 | </converter> |
29 | |
30 | <!-- StatisticCalculationUnitConverter for Select-Boxes --> |
31 | <converter> |
32 | <converter-id>StatisticsCalculationUnitConverter</converter-id> |
33 | - <converter-class>de.sub.goobi.Converter.StatisticsCalculationUnitConverter</converter-class> |
34 | + <converter-class>de.sub.goobi.converter.StatisticsCalculationUnitConverter</converter-class> |
35 | </converter> |
36 | |
37 | <!-- Beans (formaly known as config_Beans.xml) --> |
38 | @@ -335,112 +335,112 @@ |
39 | <!-- BenutzerverwaltungForm --> |
40 | <managed-bean> |
41 | <managed-bean-name>BenutzerverwaltungForm</managed-bean-name> |
42 | - <managed-bean-class> de.sub.goobi.Forms.BenutzerverwaltungForm </managed-bean-class> |
43 | + <managed-bean-class>de.sub.goobi.forms.BenutzerverwaltungForm</managed-bean-class> |
44 | <managed-bean-scope>session</managed-bean-scope> |
45 | </managed-bean> |
46 | |
47 | <!-- PreferencesForm --> |
48 | <managed-bean> |
49 | <managed-bean-name>RegelsaetzeForm</managed-bean-name> |
50 | - <managed-bean-class> de.sub.goobi.Forms.RegelsaetzeForm </managed-bean-class> |
51 | + <managed-bean-class>de.sub.goobi.forms.RegelsaetzeForm</managed-bean-class> |
52 | <managed-bean-scope>request</managed-bean-scope> |
53 | </managed-bean> |
54 | |
55 | <!-- LdapGruppenForm --> |
56 | <managed-bean> |
57 | <managed-bean-name>LdapGruppenForm</managed-bean-name> |
58 | - <managed-bean-class> de.sub.goobi.Forms.LdapGruppenForm </managed-bean-class> |
59 | + <managed-bean-class>de.sub.goobi.forms.LdapGruppenForm</managed-bean-class> |
60 | <managed-bean-scope>request</managed-bean-scope> |
61 | </managed-bean> |
62 | |
63 | <!-- BenutzergruppenForm --> |
64 | <managed-bean> |
65 | <managed-bean-name>BenutzergruppenForm</managed-bean-name> |
66 | - <managed-bean-class> de.sub.goobi.Forms.BenutzergruppenForm </managed-bean-class> |
67 | + <managed-bean-class>de.sub.goobi.forms.BenutzergruppenForm</managed-bean-class> |
68 | <managed-bean-scope>session</managed-bean-scope> |
69 | </managed-bean> |
70 | |
71 | <!-- LoginForm --> |
72 | <managed-bean> |
73 | <managed-bean-name>LoginForm</managed-bean-name> |
74 | - <managed-bean-class> de.sub.goobi.Forms.LoginForm </managed-bean-class> |
75 | + <managed-bean-class>de.sub.goobi.forms.LoginForm</managed-bean-class> |
76 | <managed-bean-scope>session</managed-bean-scope> |
77 | </managed-bean> |
78 | |
79 | <!-- SpracheForm --> |
80 | <managed-bean> |
81 | <managed-bean-name>SpracheForm</managed-bean-name> |
82 | - <managed-bean-class> de.sub.goobi.Forms.SpracheForm </managed-bean-class> |
83 | + <managed-bean-class>de.sub.goobi.forms.SpracheForm</managed-bean-class> |
84 | <managed-bean-scope>session</managed-bean-scope> |
85 | </managed-bean> |
86 | |
87 | <!-- NavigationForm --> |
88 | <managed-bean> |
89 | <managed-bean-name>NavigationForm</managed-bean-name> |
90 | - <managed-bean-class> de.sub.goobi.Forms.NavigationForm </managed-bean-class> |
91 | + <managed-bean-class>de.sub.goobi.forms.NavigationForm</managed-bean-class> |
92 | <managed-bean-scope>session</managed-bean-scope> |
93 | </managed-bean> |
94 | |
95 | <!-- StatistikForm --> |
96 | <managed-bean> |
97 | <managed-bean-name>StatistikForm</managed-bean-name> |
98 | - <managed-bean-class> de.sub.goobi.Forms.StatistikForm </managed-bean-class> |
99 | + <managed-bean-class>de.sub.goobi.forms.StatistikForm</managed-bean-class> |
100 | <managed-bean-scope>application</managed-bean-scope> |
101 | </managed-bean> |
102 | |
103 | <!-- Bean für Administrationsaufgaben --> |
104 | <managed-bean> |
105 | <managed-bean-name>AdministrationForm</managed-bean-name> |
106 | - <managed-bean-class> de.sub.goobi.Forms.AdministrationForm </managed-bean-class> |
107 | + <managed-bean-class>de.sub.goobi.forms.AdministrationForm</managed-bean-class> |
108 | <managed-bean-scope>request</managed-bean-scope> |
109 | </managed-bean> |
110 | |
111 | <!-- Bean für Prozessverwaltung --> |
112 | <managed-bean> |
113 | <managed-bean-name>ProzessverwaltungForm</managed-bean-name> |
114 | - <managed-bean-class> de.sub.goobi.Forms.ProzessverwaltungForm </managed-bean-class> |
115 | + <managed-bean-class>de.sub.goobi.forms.ProzessverwaltungForm</managed-bean-class> |
116 | <managed-bean-scope>session</managed-bean-scope> |
117 | </managed-bean> |
118 | |
119 | <!-- Bean für Projekte --> |
120 | <managed-bean> |
121 | <managed-bean-name>ProjekteForm</managed-bean-name> |
122 | - <managed-bean-class> de.sub.goobi.Forms.ProjekteForm </managed-bean-class> |
123 | + <managed-bean-class>de.sub.goobi.forms.ProjekteForm</managed-bean-class> |
124 | <managed-bean-scope>session</managed-bean-scope> |
125 | </managed-bean> |
126 | |
127 | <!-- Bean für Prozesskopie --> |
128 | <managed-bean> |
129 | <managed-bean-name>ProzesskopieForm</managed-bean-name> |
130 | - <managed-bean-class> de.sub.goobi.Forms.ProzesskopieForm </managed-bean-class> |
131 | + <managed-bean-class>de.sub.goobi.forms.ProzesskopieForm</managed-bean-class> |
132 | <managed-bean-scope>session</managed-bean-scope> |
133 | </managed-bean> |
134 | |
135 | <!-- Bean für Aktuelle Schritte --> |
136 | <managed-bean> |
137 | <managed-bean-name>AktuelleSchritteForm</managed-bean-name> |
138 | - <managed-bean-class> de.sub.goobi.Forms.AktuelleSchritteForm </managed-bean-class> |
139 | + <managed-bean-class>de.sub.goobi.forms.AktuelleSchritteForm</managed-bean-class> |
140 | <managed-bean-scope>session</managed-bean-scope> |
141 | </managed-bean> |
142 | |
143 | <!-- Helper-Bean --> |
144 | <managed-bean> |
145 | <managed-bean-name>HelperForm</managed-bean-name> |
146 | - <managed-bean-class>de.sub.goobi.Forms.HelperForm</managed-bean-class> |
147 | + <managed-bean-class>de.sub.goobi.forms.HelperForm</managed-bean-class> |
148 | <managed-bean-scope>session</managed-bean-scope> |
149 | </managed-bean> |
150 | |
151 | <!-- ModuleServer-Bean --> |
152 | <managed-bean> |
153 | <managed-bean-name>ModuleServerForm</managed-bean-name> |
154 | - <managed-bean-class>de.sub.goobi.Forms.ModuleServerForm</managed-bean-class> |
155 | + <managed-bean-class>de.sub.goobi.forms.ModuleServerForm</managed-bean-class> |
156 | <managed-bean-scope>session</managed-bean-scope> |
157 | </managed-bean> |
158 | |
159 | <!-- HibernateSessionLong-Bean --> |
160 | <managed-bean> |
161 | <managed-bean-name>HibernateSessionLong</managed-bean-name> |
162 | - <managed-bean-class>de.sub.goobi.Persistence.HibernateSessionLong</managed-bean-class> |
163 | + <managed-bean-class>de.sub.goobi.persistence.HibernateSessionLong</managed-bean-class> |
164 | <managed-bean-scope>session</managed-bean-scope> |
165 | </managed-bean> |
166 | |
167 | |
168 | === modified file 'WEB-INF/metadata-editor-config.xml' |
169 | --- WEB-INF/metadata-editor-config.xml 2011-07-05 00:44:26 +0000 |
170 | +++ WEB-INF/metadata-editor-config.xml 2011-12-14 09:20:02 +0000 |
171 | @@ -43,28 +43,28 @@ |
172 | <!-- Bean für Sessions --> |
173 | <managed-bean> |
174 | <managed-bean-name>SessionForm</managed-bean-name> |
175 | - <managed-bean-class> de.sub.goobi.Forms.SessionForm </managed-bean-class> |
176 | + <managed-bean-class>de.sub.goobi.forms.SessionForm</managed-bean-class> |
177 | <managed-bean-scope>application</managed-bean-scope> |
178 | </managed-bean> |
179 | |
180 | <!-- Bean für Metadaten --> |
181 | <managed-bean> |
182 | <managed-bean-name>Metadaten</managed-bean-name> |
183 | - <managed-bean-class>de.sub.goobi.Metadaten.Metadaten </managed-bean-class> |
184 | + <managed-bean-class>de.sub.goobi.metadaten.Metadaten</managed-bean-class> |
185 | <managed-bean-scope>session</managed-bean-scope> |
186 | </managed-bean> |
187 | |
188 | <!-- Bean für Metadaten-Sperrung --> |
189 | <managed-bean> |
190 | <managed-bean-name>MetadatenSperrung</managed-bean-name> |
191 | - <managed-bean-class> de.sub.goobi.Metadaten.MetadatenSperrung </managed-bean-class> |
192 | + <managed-bean-class>de.sub.goobi.metadaten.MetadatenSperrung</managed-bean-class> |
193 | <managed-bean-scope>application</managed-bean-scope> |
194 | </managed-bean> |
195 | |
196 | <!-- Bean für lang laufende (administrative) Aufgaben --> |
197 | <managed-bean> |
198 | <managed-bean-name>LongRunningTasksForm</managed-bean-name> |
199 | - <managed-bean-class> de.sub.goobi.Forms.LongRunningTasksForm </managed-bean-class> |
200 | + <managed-bean-class>de.sub.goobi.forms.LongRunningTasksForm</managed-bean-class> |
201 | <managed-bean-scope>request</managed-bean-scope> |
202 | </managed-bean> |
203 | |
204 | |
205 | === modified file 'WEB-INF/web.xml' |
206 | --- WEB-INF/web.xml 2011-12-01 12:44:42 +0000 |
207 | +++ WEB-INF/web.xml 2011-12-14 09:20:02 +0000 |
208 | @@ -124,7 +124,7 @@ |
209 | <!-- |
210 | <filter> |
211 | <filter-name>HibernateFilter</filter-name> |
212 | - <filter-class>de.sub.goobi.Persistence.HibernateSessionConversationFilter</filter-class> |
213 | + <filter-class>de.sub.goobi.persistence.HibernateSessionConversationFilter</filter-class> |
214 | </filter> |
215 | --> |
216 | |
217 | @@ -195,7 +195,7 @@ |
218 | |
219 | <!-- |
220 | Listener für die Modularisierung <listener> <listener-class> |
221 | - de.sub.goobi.Modul.ModulListener </listener-class> </listener> |
222 | + de.sub.goobi.modul.ModulListener </listener-class> </listener> |
223 | --> |
224 | |
225 | <!-- Listener for JobManager --> |
226 | |
227 | === modified file 'build.xml' |
228 | --- build.xml 2011-07-20 09:06:14 +0000 |
229 | +++ build.xml 2011-12-14 09:20:02 +0000 |
230 | @@ -182,8 +182,8 @@ |
231 | |
232 | <!-- Copy message resource bundles --> |
233 | <target name="copy-message-resources" depends="init"> |
234 | - <copy todir="${build.classes}/Messages"> |
235 | - <fileset dir="${java.src.dir}/Messages"> |
236 | + <copy todir="${build.classes}/messages"> |
237 | + <fileset dir="${java.src.dir}/messages"> |
238 | <include name="*.properties"/> |
239 | </fileset> |
240 | </copy> |
241 | |
242 | === modified file 'config/hibernate.cfg.xml' |
243 | --- config/hibernate.cfg.xml 2011-12-01 13:34:59 +0000 |
244 | +++ config/hibernate.cfg.xml 2011-12-14 09:20:02 +0000 |
245 | @@ -46,22 +46,22 @@ |
246 | <property name="hbm2ddl.auto">update</property> |
247 | |
248 | <!-- Die einzelnen Mappings --> |
249 | - <mapping resource="de/sub/goobi/Beans/Benutzergruppe.hbm.xml" /> |
250 | - <mapping resource="de/sub/goobi/Beans/Benutzereigenschaft.hbm.xml" /> |
251 | - <mapping resource="de/sub/goobi/Beans/Benutzer.hbm.xml" /> |
252 | - <mapping resource="de/sub/goobi/Beans/Prozess.hbm.xml" /> |
253 | - <mapping resource="de/sub/goobi/Beans/Prozesseigenschaft.hbm.xml" /> |
254 | - <mapping resource="de/sub/goobi/Beans/Schritt.hbm.xml" /> |
255 | - <mapping resource="de/sub/goobi/Beans/Schritteigenschaft.hbm.xml" /> |
256 | - <mapping resource="de/sub/goobi/Beans/Werkstueck.hbm.xml" /> |
257 | - <mapping resource="de/sub/goobi/Beans/Werkstueckeigenschaft.hbm.xml" /> |
258 | - <mapping resource="de/sub/goobi/Beans/Vorlage.hbm.xml" /> |
259 | - <mapping resource="de/sub/goobi/Beans/Vorlageeigenschaft.hbm.xml" /> |
260 | - <mapping resource="de/sub/goobi/Beans/Projekt.hbm.xml" /> |
261 | - <mapping resource="de/sub/goobi/Beans/Regelsatz.hbm.xml" /> |
262 | - <mapping resource="de/sub/goobi/Beans/LdapGruppe.hbm.xml" /> |
263 | - <mapping resource="de/sub/goobi/Beans/ProjectFileGroup.hbm.xml" /> |
264 | - <mapping resource="de/sub/goobi/Beans/HistoryEvent.hbm.xml" /> |
265 | + <mapping resource="de/sub/goobi/beans/Benutzergruppe.hbm.xml" /> |
266 | + <mapping resource="de/sub/goobi/beans/Benutzereigenschaft.hbm.xml" /> |
267 | + <mapping resource="de/sub/goobi/beans/Benutzer.hbm.xml" /> |
268 | + <mapping resource="de/sub/goobi/beans/Prozess.hbm.xml" /> |
269 | + <mapping resource="de/sub/goobi/beans/Prozesseigenschaft.hbm.xml" /> |
270 | + <mapping resource="de/sub/goobi/beans/Schritt.hbm.xml" /> |
271 | + <mapping resource="de/sub/goobi/beans/Schritteigenschaft.hbm.xml" /> |
272 | + <mapping resource="de/sub/goobi/beans/Werkstueck.hbm.xml" /> |
273 | + <mapping resource="de/sub/goobi/beans/Werkstueckeigenschaft.hbm.xml" /> |
274 | + <mapping resource="de/sub/goobi/beans/Vorlage.hbm.xml" /> |
275 | + <mapping resource="de/sub/goobi/beans/Vorlageeigenschaft.hbm.xml" /> |
276 | + <mapping resource="de/sub/goobi/beans/Projekt.hbm.xml" /> |
277 | + <mapping resource="de/sub/goobi/beans/Regelsatz.hbm.xml" /> |
278 | + <mapping resource="de/sub/goobi/beans/LdapGruppe.hbm.xml" /> |
279 | + <mapping resource="de/sub/goobi/beans/ProjectFileGroup.hbm.xml" /> |
280 | + <mapping resource="de/sub/goobi/beans/HistoryEvent.hbm.xml" /> |
281 | |
282 | </session-factory> |
283 | |
284 | |
285 | === modified file 'newpages/inc/head.jsp' |
286 | --- newpages/inc/head.jsp 2011-07-05 00:44:26 +0000 |
287 | +++ newpages/inc/head.jsp 2011-12-14 09:20:02 +0000 |
288 | @@ -11,7 +11,7 @@ |
289 | <link rel="shortcut icon" href="favicon.ico"/> |
290 | <x:stylesheet media="screen" path="#{LoginForm.myBenutzer == null?'/css/default.css':LoginForm.myBenutzer.css}"/> |
291 | <x:stylesheet media="print" path="/css/system/print.css"/> |
292 | - <f:loadBundle basename="Messages.messages" var="msgs" /> |
293 | + <f:loadBundle basename="messages.messages" var="msgs" /> |
294 | <title><h:outputText value="#{HelperForm.applicationHeaderTitle} - #{HelperForm.version}"/></title> |
295 | <!-- <h:outputText value="internal version number: #{HelperForm.buildVersion}"/> --> |
296 | </head> |
297 | \ No newline at end of file |
298 | |
299 | === modified file 'newpages/inc_AktuelleSchritte/Schritte_Liste.jsp' |
300 | --- newpages/inc_AktuelleSchritte/Schritte_Liste.jsp 2011-07-05 00:44:26 +0000 |
301 | +++ newpages/inc_AktuelleSchritte/Schritte_Liste.jsp 2011-12-14 09:20:02 +0000 |
302 | @@ -6,7 +6,7 @@ |
303 | <%@ taglib uri="http://www.jenia.org/jsf/dynamic" prefix="jd"%> |
304 | <%@ taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j"%> |
305 | |
306 | -<a4j:loadBundle basename="Messages.messages" var="msgs" /> |
307 | +<a4j:loadBundle basename="messages.messages" var="msgs" /> |
308 | |
309 | <htm:h4> |
310 | <h:outputText value="#{msgs.meineAufgabenMsg}" /> |
311 | |
312 | === modified file 'newpages/inc_Prozessverwaltung/Context_Prozesse_Liste.jsp' |
313 | --- newpages/inc_Prozessverwaltung/Context_Prozesse_Liste.jsp 2011-12-01 12:44:42 +0000 |
314 | +++ newpages/inc_Prozessverwaltung/Context_Prozesse_Liste.jsp 2011-12-14 09:20:02 +0000 |
315 | @@ -7,7 +7,7 @@ |
316 | <%@ taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j"%> |
317 | <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> |
318 | |
319 | -<a4j:loadBundle basename="Messages.messages" var="msgs" /> |
320 | +<a4j:loadBundle basename="messages.messages" var="msgs" /> |
321 | |
322 | <htm:h4> |
323 | <h:outputText value="#{msgs.prozessvorlagen}" |
324 | |
325 | === modified file 'newpages/inc_Prozessverwaltung/Prozesse_Liste.jsp' |
326 | --- newpages/inc_Prozessverwaltung/Prozesse_Liste.jsp 2011-07-05 00:44:26 +0000 |
327 | +++ newpages/inc_Prozessverwaltung/Prozesse_Liste.jsp 2011-12-14 09:20:02 +0000 |
328 | @@ -6,7 +6,7 @@ |
329 | <%@ taglib uri="http://www.jenia.org/jsf/dynamic" prefix="jd"%> |
330 | <%@ taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j"%> |
331 | |
332 | -<a4j:loadBundle basename="Messages.messages" var="msgs" /> |
333 | +<a4j:loadBundle basename="messages.messages" var="msgs" /> |
334 | |
335 | <htm:h4> |
336 | <h:outputText value="#{msgs.prozessvorlagen}" |
337 | |
338 | === modified file 'newpages/inc_Prozessverwaltung/prozess_box_Schritte.jsp' |
339 | --- newpages/inc_Prozessverwaltung/prozess_box_Schritte.jsp 2011-07-05 00:44:26 +0000 |
340 | +++ newpages/inc_Prozessverwaltung/prozess_box_Schritte.jsp 2011-12-14 09:20:02 +0000 |
341 | @@ -6,7 +6,7 @@ |
342 | <%@ taglib uri="http://www.jenia.org/jsf/dynamic" prefix="jd"%> |
343 | <%@ taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j"%> |
344 | |
345 | -<a4j:loadBundle basename="Messages.messages" var="msgs" /> |
346 | +<a4j:loadBundle basename="messages.messages" var="msgs" /> |
347 | |
348 | <%-- ===================== GROSSE SCHRITT BOX IM GELADENEN PROZESS ====================== --%> |
349 | |
350 | |
351 | === modified file 'src/de/sub/goobi/Import/Import.java' |
352 | --- src/de/sub/goobi/Import/Import.java 2011-12-01 12:44:42 +0000 |
353 | +++ src/de/sub/goobi/Import/Import.java 2011-12-14 09:20:02 +0000 |
354 | @@ -13,7 +13,7 @@ |
355 | import ugh.exceptions.TypeNotAllowedAsChildException; |
356 | import ugh.exceptions.TypeNotAllowedForParentException; |
357 | import ugh.exceptions.WriteException; |
358 | -import de.sub.goobi.Beans.Schritt; |
359 | +import de.sub.goobi.beans.Schritt; |
360 | import de.sub.goobi.helper.exceptions.DAOException; |
361 | import de.sub.goobi.helper.exceptions.SwapException; |
362 | import de.sub.goobi.helper.exceptions.WrongImportFileException; |
363 | |
364 | === modified file 'src/de/sub/goobi/Import/ImportRussland.java' |
365 | --- src/de/sub/goobi/Import/ImportRussland.java 2011-12-01 12:44:42 +0000 |
366 | +++ src/de/sub/goobi/Import/ImportRussland.java 2011-12-14 09:20:02 +0000 |
367 | @@ -22,7 +22,7 @@ |
368 | import ugh.exceptions.TypeNotAllowedAsChildException; |
369 | import ugh.exceptions.TypeNotAllowedForParentException; |
370 | import ugh.exceptions.WriteException; |
371 | -import de.sub.goobi.Beans.Prozess; |
372 | +import de.sub.goobi.beans.Prozess; |
373 | import de.sub.goobi.helper.exceptions.DAOException; |
374 | import de.sub.goobi.helper.exceptions.SwapException; |
375 | import de.sub.goobi.helper.exceptions.WrongImportFileException; |
376 | |
377 | === modified file 'src/de/sub/goobi/Import/ImportZentralblatt.java' |
378 | --- src/de/sub/goobi/Import/ImportZentralblatt.java 2011-12-01 12:44:42 +0000 |
379 | +++ src/de/sub/goobi/Import/ImportZentralblatt.java 2011-12-14 09:20:02 +0000 |
380 | @@ -24,7 +24,7 @@ |
381 | import ugh.exceptions.TypeNotAllowedForParentException; |
382 | import ugh.exceptions.WriteException; |
383 | import ugh.fileformats.mets.XStream; |
384 | -import de.sub.goobi.Beans.Prozess; |
385 | +import de.sub.goobi.beans.Prozess; |
386 | import de.sub.goobi.helper.Helper; |
387 | import de.sub.goobi.helper.exceptions.WrongImportFileException; |
388 | |
389 | |
390 | === renamed directory 'src/de/sub/goobi/Beans' => 'src/de/sub/goobi/beans' |
391 | === modified file 'src/de/sub/goobi/beans/Benutzer.hbm.xml' |
392 | --- src/de/sub/goobi/Beans/Benutzer.hbm.xml 2011-12-01 12:44:42 +0000 |
393 | +++ src/de/sub/goobi/beans/Benutzer.hbm.xml 2011-12-14 09:20:02 +0000 |
394 | @@ -5,7 +5,7 @@ |
395 | |
396 | <hibernate-mapping> |
397 | |
398 | - <class name="de.sub.goobi.Beans.Benutzer" table="benutzer"> |
399 | + <class name="de.sub.goobi.beans.Benutzer" table="benutzer"> |
400 | <id name="id" column="BenutzerID" type="integer"> |
401 | <generator class="native"/> |
402 | </id> |
403 | @@ -23,31 +23,31 @@ |
404 | <property name="confVorgangsdatumAnzeigen" column="confVorgangsdatumAnzeigen"/> |
405 | <property name="tabellengroesse" column="Tabellengroesse" type="integer"/> |
406 | <property name="sessiontimeout" column="sessiontimeout" type="integer"/> |
407 | - <many-to-one name="ldapGruppe" class="de.sub.goobi.Beans.LdapGruppe" column="ldapgruppenID"/> |
408 | + <many-to-one name="ldapGruppe" class="de.sub.goobi.beans.LdapGruppe" column="ldapgruppenID"/> |
409 | |
410 | <set name="bearbeitungsschritte" cascade="all,delete-orphan" inverse="true" lazy="true"> |
411 | <key column="BearbeitungsBenutzerID"/> |
412 | - <one-to-many class="de.sub.goobi.Beans.Schritt"/> |
413 | + <one-to-many class="de.sub.goobi.beans.Schritt"/> |
414 | </set> |
415 | |
416 | <set name="benutzergruppen" table="benutzergruppenmitgliedschaft" lazy="true"> |
417 | <key column="BenutzerID"/> |
418 | - <many-to-many column="BenutzerGruppenID" class="de.sub.goobi.Beans.Benutzergruppe"/> |
419 | + <many-to-many column="BenutzerGruppenID" class="de.sub.goobi.beans.Benutzergruppe"/> |
420 | </set> |
421 | |
422 | <set name="projekte" table="projektbenutzer" lazy="true"> |
423 | <key column="BenutzerID"/> |
424 | - <many-to-many column="ProjekteID" class="de.sub.goobi.Beans.Projekt"/> |
425 | + <many-to-many column="ProjekteID" class="de.sub.goobi.beans.Projekt"/> |
426 | </set> |
427 | |
428 | <set name="schritte" table="schritteberechtigtebenutzer" inverse="true"> |
429 | <key column="BenutzerID"/> |
430 | - <many-to-many column="schritteID" class="de.sub.goobi.Beans.Schritt"/> |
431 | + <many-to-many column="schritteID" class="de.sub.goobi.beans.Schritt"/> |
432 | </set> |
433 | |
434 | <set name="eigenschaften" cascade="all,delete-orphan" inverse="true" order-by="titel" lazy="false"> |
435 | <key column="BenutzerID"/> |
436 | - <one-to-many class="de.sub.goobi.Beans.Benutzereigenschaft"/> |
437 | + <one-to-many class="de.sub.goobi.beans.Benutzereigenschaft"/> |
438 | </set> |
439 | |
440 | </class> |
441 | |
442 | === modified file 'src/de/sub/goobi/beans/Benutzer.java' |
443 | --- src/de/sub/goobi/Beans/Benutzer.java 2011-12-01 12:44:42 +0000 |
444 | +++ src/de/sub/goobi/beans/Benutzer.java 2011-12-14 09:20:02 +0000 |
445 | @@ -1,4 +1,4 @@ |
446 | -package de.sub.goobi.Beans; |
447 | +package de.sub.goobi.beans; |
448 | |
449 | import java.io.File; |
450 | import java.io.IOException; |
451 | |
452 | === modified file 'src/de/sub/goobi/beans/Benutzereigenschaft.hbm.xml' |
453 | --- src/de/sub/goobi/Beans/Benutzereigenschaft.hbm.xml 2011-12-01 12:44:42 +0000 |
454 | +++ src/de/sub/goobi/beans/Benutzereigenschaft.hbm.xml 2011-12-14 09:20:02 +0000 |
455 | @@ -5,7 +5,7 @@ |
456 | |
457 | <hibernate-mapping> |
458 | |
459 | - <class name="de.sub.goobi.Beans.Benutzereigenschaft" table="benutzereigenschaften"> |
460 | + <class name="de.sub.goobi.beans.Benutzereigenschaft" table="benutzereigenschaften"> |
461 | <id name="id" column="benutzereigenschaftenID" type="integer"> |
462 | <generator class="native" /> |
463 | </id> |
464 | @@ -17,7 +17,7 @@ |
465 | <property name="auswahl" column="Auswahl" type="string" /> |
466 | <property name="creationDate" column="creationDate" type="timestamp"/> |
467 | |
468 | - <many-to-one name="benutzer" class="de.sub.goobi.Beans.Benutzer" column="BenutzerID"/> |
469 | + <many-to-one name="benutzer" class="de.sub.goobi.beans.Benutzer" column="BenutzerID"/> |
470 | |
471 | </class> |
472 | |
473 | |
474 | === modified file 'src/de/sub/goobi/beans/Benutzereigenschaft.java' |
475 | --- src/de/sub/goobi/Beans/Benutzereigenschaft.java 2011-12-01 12:44:42 +0000 |
476 | +++ src/de/sub/goobi/beans/Benutzereigenschaft.java 2011-12-14 09:20:02 +0000 |
477 | @@ -1,4 +1,4 @@ |
478 | -package de.sub.goobi.Beans; |
479 | +package de.sub.goobi.beans; |
480 | |
481 | import java.io.Serializable; |
482 | import java.util.ArrayList; |
483 | @@ -7,8 +7,8 @@ |
484 | |
485 | import org.goobi.production.api.property.xmlbasedprovider.Status; |
486 | |
487 | -import de.sub.goobi.Beans.Property.IGoobiEntity; |
488 | -import de.sub.goobi.Beans.Property.IGoobiProperty; |
489 | +import de.sub.goobi.beans.property.IGoobiEntity; |
490 | +import de.sub.goobi.beans.property.IGoobiProperty; |
491 | import de.sub.goobi.helper.enums.PropertyType; |
492 | |
493 | public class Benutzereigenschaft implements Serializable, IGoobiProperty { |
494 | |
495 | === modified file 'src/de/sub/goobi/beans/Benutzergruppe.hbm.xml' |
496 | --- src/de/sub/goobi/Beans/Benutzergruppe.hbm.xml 2011-12-01 12:44:42 +0000 |
497 | +++ src/de/sub/goobi/beans/Benutzergruppe.hbm.xml 2011-12-14 09:20:02 +0000 |
498 | @@ -5,7 +5,7 @@ |
499 | |
500 | <hibernate-mapping> |
501 | |
502 | - <class name="de.sub.goobi.Beans.Benutzergruppe" table="benutzergruppen"> |
503 | + <class name="de.sub.goobi.beans.Benutzergruppe" table="benutzergruppen"> |
504 | <id name="id" column="BenutzergruppenID" type="integer"> |
505 | <generator class="native" /> |
506 | </id> |
507 | @@ -15,12 +15,12 @@ |
508 | |
509 | <set name="benutzer" table="benutzergruppenmitgliedschaft" inverse="true"> |
510 | <key column="BenutzerGruppenID"/> |
511 | - <many-to-many column="BenutzerID" class="de.sub.goobi.Beans.Benutzer"/> |
512 | + <many-to-many column="BenutzerID" class="de.sub.goobi.beans.Benutzer"/> |
513 | </set> |
514 | |
515 | <set name="schritte" table="schritteberechtigtegruppen" inverse="true"> |
516 | <key column="BenutzerGruppenID"/> |
517 | - <many-to-many column="schritteID" class="de.sub.goobi.Beans.Schritt"/> |
518 | + <many-to-many column="schritteID" class="de.sub.goobi.beans.Schritt"/> |
519 | </set> |
520 | |
521 | </class> |
522 | |
523 | === modified file 'src/de/sub/goobi/beans/Benutzergruppe.java' |
524 | --- src/de/sub/goobi/Beans/Benutzergruppe.java 2011-12-01 12:44:42 +0000 |
525 | +++ src/de/sub/goobi/beans/Benutzergruppe.java 2011-12-14 09:20:02 +0000 |
526 | @@ -1,4 +1,4 @@ |
527 | -package de.sub.goobi.Beans; |
528 | +package de.sub.goobi.beans; |
529 | |
530 | import java.io.Serializable; |
531 | import java.util.ArrayList; |
532 | |
533 | === modified file 'src/de/sub/goobi/beans/HistoryEvent.hbm.xml' |
534 | --- src/de/sub/goobi/Beans/HistoryEvent.hbm.xml 2011-12-01 12:44:42 +0000 |
535 | +++ src/de/sub/goobi/beans/HistoryEvent.hbm.xml 2011-12-14 09:20:02 +0000 |
536 | @@ -5,7 +5,7 @@ |
537 | |
538 | <hibernate-mapping> |
539 | |
540 | - <class name="de.sub.goobi.Beans.HistoryEvent" table="history"> |
541 | + <class name="de.sub.goobi.beans.HistoryEvent" table="history"> |
542 | <id name="id" column="historyid" type="integer"> |
543 | <generator class="native" /> |
544 | </id> |
545 | @@ -15,7 +15,7 @@ |
546 | <property name="type" column="type" type="integer" /> |
547 | <property name="date" column="date" type="timestamp" /> |
548 | |
549 | - <many-to-one name="process" class="de.sub.goobi.Beans.Prozess" column="processID"/> |
550 | + <many-to-one name="process" class="de.sub.goobi.beans.Prozess" column="processID"/> |
551 | |
552 | </class> |
553 | |
554 | |
555 | === modified file 'src/de/sub/goobi/beans/HistoryEvent.java' |
556 | --- src/de/sub/goobi/Beans/HistoryEvent.java 2011-12-01 12:44:42 +0000 |
557 | +++ src/de/sub/goobi/beans/HistoryEvent.java 2011-12-14 09:20:02 +0000 |
558 | @@ -1,4 +1,4 @@ |
559 | -package de.sub.goobi.Beans; |
560 | +package de.sub.goobi.beans; |
561 | |
562 | import java.io.Serializable; |
563 | import java.util.Date; |
564 | |
565 | === modified file 'src/de/sub/goobi/beans/LdapGruppe.hbm.xml' |
566 | --- src/de/sub/goobi/Beans/LdapGruppe.hbm.xml 2011-07-19 17:06:09 +0000 |
567 | +++ src/de/sub/goobi/beans/LdapGruppe.hbm.xml 2011-12-14 09:20:02 +0000 |
568 | @@ -5,7 +5,7 @@ |
569 | |
570 | <hibernate-mapping> |
571 | |
572 | - <class name="de.sub.goobi.Beans.LdapGruppe" table="ldapgruppen"> |
573 | + <class name="de.sub.goobi.beans.LdapGruppe" table="ldapgruppen"> |
574 | <id name="id" column="ldapgruppenID" type="integer"> |
575 | <generator class="native"/> |
576 | </id> |
577 | |
578 | === modified file 'src/de/sub/goobi/beans/LdapGruppe.java' |
579 | --- src/de/sub/goobi/Beans/LdapGruppe.java 2011-07-19 17:06:09 +0000 |
580 | +++ src/de/sub/goobi/beans/LdapGruppe.java 2011-12-14 09:20:02 +0000 |
581 | @@ -1,4 +1,4 @@ |
582 | -package de.sub.goobi.Beans; |
583 | +package de.sub.goobi.beans; |
584 | |
585 | import java.io.Serializable; |
586 | |
587 | |
588 | === modified file 'src/de/sub/goobi/beans/ProjectFileGroup.hbm.xml' |
589 | --- src/de/sub/goobi/Beans/ProjectFileGroup.hbm.xml 2011-12-01 12:44:42 +0000 |
590 | +++ src/de/sub/goobi/beans/ProjectFileGroup.hbm.xml 2011-12-14 09:20:02 +0000 |
591 | @@ -5,7 +5,7 @@ |
592 | |
593 | <hibernate-mapping> |
594 | |
595 | - <class name="de.sub.goobi.Beans.ProjectFileGroup" table="projectfilegroups"> |
596 | + <class name="de.sub.goobi.beans.ProjectFileGroup" table="projectfilegroups"> |
597 | <id name="id" column="ProjectFileGroupID" type="integer"> |
598 | <generator class="native"/> |
599 | </id> |
600 | @@ -15,7 +15,7 @@ |
601 | <property name="mimetype" column="mimetype" type="string"/> |
602 | <property name="suffix" column="suffix" type="string"/> |
603 | |
604 | - <many-to-one name="project" class="de.sub.goobi.Beans.Projekt" column="ProjekteID"/> |
605 | + <many-to-one name="project" class="de.sub.goobi.beans.Projekt" column="ProjekteID"/> |
606 | |
607 | </class> |
608 | |
609 | |
610 | === modified file 'src/de/sub/goobi/beans/ProjectFileGroup.java' |
611 | --- src/de/sub/goobi/Beans/ProjectFileGroup.java 2011-07-19 17:06:09 +0000 |
612 | +++ src/de/sub/goobi/beans/ProjectFileGroup.java 2011-12-14 09:20:02 +0000 |
613 | @@ -1,4 +1,4 @@ |
614 | -package de.sub.goobi.Beans; |
615 | +package de.sub.goobi.beans; |
616 | |
617 | import java.io.Serializable; |
618 | |
619 | |
620 | === modified file 'src/de/sub/goobi/beans/Projekt.hbm.xml' |
621 | --- src/de/sub/goobi/Beans/Projekt.hbm.xml 2011-12-01 12:44:42 +0000 |
622 | +++ src/de/sub/goobi/beans/Projekt.hbm.xml 2011-12-14 09:20:02 +0000 |
623 | @@ -5,7 +5,7 @@ |
624 | |
625 | <hibernate-mapping> |
626 | |
627 | - <class name="de.sub.goobi.Beans.Projekt" table="projekte"> |
628 | + <class name="de.sub.goobi.beans.Projekt" table="projekte"> |
629 | <id name="id" column="ProjekteID" type="integer"> |
630 | <generator class="native"/> |
631 | </id> |
632 | @@ -49,18 +49,18 @@ |
633 | |
634 | <set name="filegroups" cascade="all,delete-orphan" inverse="true"> |
635 | <key column="ProjekteID"/> |
636 | - <one-to-many class="de.sub.goobi.Beans.ProjectFileGroup"/> |
637 | + <one-to-many class="de.sub.goobi.beans.ProjectFileGroup"/> |
638 | </set> |
639 | |
640 | <set name="benutzer" table="projektbenutzer" inverse="true"> |
641 | <key column="ProjekteID"/> |
642 | - <many-to-many column="BenutzerID" class="de.sub.goobi.Beans.Benutzer"/> |
643 | + <many-to-many column="BenutzerID" class="de.sub.goobi.beans.Benutzer"/> |
644 | </set> |
645 | |
646 | <set name="prozesse" cascade="all,delete-orphan" inverse="true" |
647 | lazy="true"> |
648 | <key column="ProjekteID" /> |
649 | - <one-to-many class="de.sub.goobi.Beans.Prozess" /> |
650 | + <one-to-many class="de.sub.goobi.beans.Prozess" /> |
651 | </set> |
652 | </class> |
653 | |
654 | |
655 | === modified file 'src/de/sub/goobi/beans/Projekt.java' |
656 | --- src/de/sub/goobi/Beans/Projekt.java 2011-12-01 12:44:42 +0000 |
657 | +++ src/de/sub/goobi/beans/Projekt.java 2011-12-14 09:20:02 +0000 |
658 | @@ -1,4 +1,4 @@ |
659 | -package de.sub.goobi.Beans; |
660 | +package de.sub.goobi.beans; |
661 | |
662 | import java.io.Serializable; |
663 | import java.util.ArrayList; |
664 | |
665 | === modified file 'src/de/sub/goobi/beans/Prozess.hbm.xml' |
666 | --- src/de/sub/goobi/Beans/Prozess.hbm.xml 2011-12-01 12:44:42 +0000 |
667 | +++ src/de/sub/goobi/beans/Prozess.hbm.xml 2011-12-14 09:20:02 +0000 |
668 | @@ -5,7 +5,7 @@ |
669 | |
670 | <hibernate-mapping> |
671 | |
672 | - <class name="de.sub.goobi.Beans.Prozess" table="prozesse"> |
673 | + <class name="de.sub.goobi.beans.Prozess" table="prozesse"> |
674 | <id name="id" column="ProzesseID" type="integer"> |
675 | <generator class="native"/> |
676 | </id> |
677 | @@ -23,33 +23,33 @@ |
678 | <property name="erstellungsdatum" column="erstellungsdatum" type="timestamp"/> |
679 | <property name="wikifield" column="wikifield" type="string"/> |
680 | |
681 | - <many-to-one name="projekt" class="de.sub.goobi.Beans.Projekt" column="ProjekteID"/> |
682 | + <many-to-one name="projekt" class="de.sub.goobi.beans.Projekt" column="ProjekteID"/> |
683 | |
684 | - <many-to-one name="regelsatz" class="de.sub.goobi.Beans.Regelsatz" column="MetadatenKonfigurationID"/> |
685 | + <many-to-one name="regelsatz" class="de.sub.goobi.beans.Regelsatz" column="MetadatenKonfigurationID"/> |
686 | |
687 | <set name="schritte" cascade="all,delete-orphan" inverse="true" order-by="Reihenfolge" lazy="true"> |
688 | <key column="ProzesseID"/> |
689 | - <one-to-many class="de.sub.goobi.Beans.Schritt"/> |
690 | + <one-to-many class="de.sub.goobi.beans.Schritt"/> |
691 | </set> |
692 | |
693 | <set name="vorlagen" cascade="all,delete-orphan" inverse="true" lazy="true"> |
694 | <key column="ProzesseID"/> |
695 | - <one-to-many class="de.sub.goobi.Beans.Vorlage"/> |
696 | + <one-to-many class="de.sub.goobi.beans.Vorlage"/> |
697 | </set> |
698 | |
699 | <set name="werkstuecke" cascade="all,delete-orphan" inverse="true" lazy="true"> |
700 | <key column="ProzesseID"/> |
701 | - <one-to-many class="de.sub.goobi.Beans.Werkstueck"/> |
702 | + <one-to-many class="de.sub.goobi.beans.Werkstueck"/> |
703 | </set> |
704 | |
705 | <set name="eigenschaften" cascade="all,delete-orphan" inverse="true" order-by="titel"> |
706 | <key column="prozesseID"/> |
707 | - <one-to-many class="de.sub.goobi.Beans.Prozesseigenschaft"/> |
708 | + <one-to-many class="de.sub.goobi.beans.Prozesseigenschaft"/> |
709 | </set> |
710 | |
711 | <set name="history" cascade="all,delete-orphan" inverse="true" order-by="date"> |
712 | <key column="processID"/> |
713 | - <one-to-many class="de.sub.goobi.Beans.HistoryEvent"/> |
714 | + <one-to-many class="de.sub.goobi.beans.HistoryEvent"/> |
715 | </set> |
716 | |
717 | </class> |
718 | |
719 | === modified file 'src/de/sub/goobi/beans/Prozess.java' |
720 | --- src/de/sub/goobi/Beans/Prozess.java 2011-12-01 12:44:42 +0000 |
721 | +++ src/de/sub/goobi/beans/Prozess.java 2011-12-14 09:20:02 +0000 |
722 | @@ -1,4 +1,4 @@ |
723 | -package de.sub.goobi.Beans; |
724 | +package de.sub.goobi.beans; |
725 | |
726 | import java.io.File; |
727 | import java.io.FilenameFilter; |
728 | @@ -29,13 +29,13 @@ |
729 | import ugh.fileformats.mets.MetsMods; |
730 | import ugh.fileformats.mets.MetsModsImportExport; |
731 | import ugh.fileformats.mets.XStream; |
732 | -import de.sub.goobi.Beans.Property.DisplayPropertyList; |
733 | -import de.sub.goobi.Beans.Property.IGoobiEntity; |
734 | -import de.sub.goobi.Beans.Property.IGoobiProperty; |
735 | -import de.sub.goobi.Metadaten.MetadatenHelper; |
736 | -import de.sub.goobi.Metadaten.MetadatenSperrung; |
737 | -import de.sub.goobi.Persistence.BenutzerDAO; |
738 | -import de.sub.goobi.Persistence.ProzessDAO; |
739 | +import de.sub.goobi.beans.property.DisplayPropertyList; |
740 | +import de.sub.goobi.beans.property.IGoobiEntity; |
741 | +import de.sub.goobi.beans.property.IGoobiProperty; |
742 | +import de.sub.goobi.metadaten.MetadatenHelper; |
743 | +import de.sub.goobi.metadaten.MetadatenSperrung; |
744 | +import de.sub.goobi.persistence.BenutzerDAO; |
745 | +import de.sub.goobi.persistence.ProzessDAO; |
746 | import de.sub.goobi.config.ConfigMain; |
747 | import de.sub.goobi.helper.FileUtils; |
748 | import de.sub.goobi.helper.Helper; |
749 | @@ -193,7 +193,7 @@ |
750 | try { |
751 | rueckgabe = new BenutzerDAO().get(new Integer(benutzerID)); |
752 | } catch (Exception e) { |
753 | - // TODO Meldung in Messages implementieren |
754 | + // TODO Meldung in messages implementieren |
755 | Helper.setFehlerMeldung(Helper.getTranslation("userNotFound"), e); |
756 | } |
757 | } |
758 | |
759 | === modified file 'src/de/sub/goobi/beans/Prozesseigenschaft.hbm.xml' |
760 | --- src/de/sub/goobi/Beans/Prozesseigenschaft.hbm.xml 2011-12-01 12:44:42 +0000 |
761 | +++ src/de/sub/goobi/beans/Prozesseigenschaft.hbm.xml 2011-12-14 09:20:02 +0000 |
762 | @@ -5,7 +5,7 @@ |
763 | |
764 | <hibernate-mapping> |
765 | |
766 | - <class name="de.sub.goobi.Beans.Prozesseigenschaft" table="prozesseeigenschaften"> |
767 | + <class name="de.sub.goobi.beans.Prozesseigenschaft" table="prozesseeigenschaften"> |
768 | <id name="id" column="prozesseeigenschaftenID" type="integer"> |
769 | <generator class="native" /> |
770 | </id> |
771 | @@ -17,7 +17,7 @@ |
772 | <property name="auswahl" column="Auswahl" type="string" /> |
773 | <property name="creationDate" column="creationDate" type="timestamp"/> |
774 | <property name="container" column="container" type="integer" /> |
775 | - <many-to-one name="prozess" class="de.sub.goobi.Beans.Prozess" column="prozesseID"/> |
776 | + <many-to-one name="prozess" class="de.sub.goobi.beans.Prozess" column="prozesseID"/> |
777 | |
778 | </class> |
779 | |
780 | |
781 | === modified file 'src/de/sub/goobi/beans/Prozesseigenschaft.java' |
782 | --- src/de/sub/goobi/Beans/Prozesseigenschaft.java 2011-12-01 12:44:42 +0000 |
783 | +++ src/de/sub/goobi/beans/Prozesseigenschaft.java 2011-12-14 09:20:02 +0000 |
784 | @@ -1,4 +1,4 @@ |
785 | -package de.sub.goobi.Beans; |
786 | +package de.sub.goobi.beans; |
787 | |
788 | import java.io.Serializable; |
789 | import java.util.ArrayList; |
790 | @@ -7,8 +7,8 @@ |
791 | |
792 | import org.goobi.production.api.property.xmlbasedprovider.Status; |
793 | |
794 | -import de.sub.goobi.Beans.Property.IGoobiEntity; |
795 | -import de.sub.goobi.Beans.Property.IGoobiProperty; |
796 | +import de.sub.goobi.beans.property.IGoobiEntity; |
797 | +import de.sub.goobi.beans.property.IGoobiProperty; |
798 | import de.sub.goobi.helper.enums.PropertyType; |
799 | |
800 | public class Prozesseigenschaft implements Serializable, IGoobiProperty { |
801 | |
802 | === modified file 'src/de/sub/goobi/beans/Regelsatz.hbm.xml' |
803 | --- src/de/sub/goobi/Beans/Regelsatz.hbm.xml 2011-12-01 12:44:42 +0000 |
804 | +++ src/de/sub/goobi/beans/Regelsatz.hbm.xml 2011-12-14 09:20:02 +0000 |
805 | @@ -5,7 +5,7 @@ |
806 | |
807 | <hibernate-mapping> |
808 | |
809 | - <class name="de.sub.goobi.Beans.Regelsatz" table="metadatenkonfigurationen"> |
810 | + <class name="de.sub.goobi.beans.Regelsatz" table="metadatenkonfigurationen"> |
811 | <id name="id" column="MetadatenKonfigurationID" type="integer"> |
812 | <generator class="native"/> |
813 | </id> |
814 | |
815 | === modified file 'src/de/sub/goobi/beans/Regelsatz.java' |
816 | --- src/de/sub/goobi/Beans/Regelsatz.java 2011-12-01 12:44:42 +0000 |
817 | +++ src/de/sub/goobi/beans/Regelsatz.java 2011-12-14 09:20:02 +0000 |
818 | @@ -1,4 +1,4 @@ |
819 | -package de.sub.goobi.Beans; |
820 | +package de.sub.goobi.beans; |
821 | |
822 | import java.io.Serializable; |
823 | |
824 | |
825 | === modified file 'src/de/sub/goobi/beans/Schritt.hbm.xml' |
826 | --- src/de/sub/goobi/Beans/Schritt.hbm.xml 2011-12-01 12:44:42 +0000 |
827 | +++ src/de/sub/goobi/beans/Schritt.hbm.xml 2011-12-14 09:20:02 +0000 |
828 | @@ -5,7 +5,7 @@ |
829 | |
830 | <hibernate-mapping> |
831 | |
832 | - <class name="de.sub.goobi.Beans.Schritt" table="schritte"> |
833 | + <class name="de.sub.goobi.beans.Schritt" table="schritte"> |
834 | <!-- <cache usage="read-write"/> --> |
835 | <id name="id" column="SchritteID" type="integer"> |
836 | <generator class="native"/> |
837 | @@ -46,22 +46,22 @@ |
838 | <property name="typBeimAbschliessenVerifizieren" column="typBeimAbschliessenVerifizieren" /> |
839 | <property name="typModulName" column="typModulName" type="string"/> |
840 | |
841 | - <many-to-one name="bearbeitungsbenutzer" class="de.sub.goobi.Beans.Benutzer" column="BearbeitungsBenutzerID"/> |
842 | - <many-to-one name="prozess" class="de.sub.goobi.Beans.Prozess" column="ProzesseID"/> |
843 | + <many-to-one name="bearbeitungsbenutzer" class="de.sub.goobi.beans.Benutzer" column="BearbeitungsBenutzerID"/> |
844 | + <many-to-one name="prozess" class="de.sub.goobi.beans.Prozess" column="ProzesseID"/> |
845 | |
846 | <set name="eigenschaften" cascade="all,delete-orphan" inverse="true" order-by="titel"> |
847 | <key column="schritteID"/> |
848 | - <one-to-many class="de.sub.goobi.Beans.Schritteigenschaft"/> |
849 | + <one-to-many class="de.sub.goobi.beans.Schritteigenschaft"/> |
850 | </set> |
851 | |
852 | <set name="benutzer" table="schritteberechtigtebenutzer"> |
853 | <key column="schritteID"/> |
854 | - <many-to-many column="BenutzerID" class="de.sub.goobi.Beans.Benutzer"/> |
855 | + <many-to-many column="BenutzerID" class="de.sub.goobi.beans.Benutzer"/> |
856 | </set> |
857 | |
858 | <set name="benutzergruppen" table="schritteberechtigtegruppen"> |
859 | <key column="schritteID"/> |
860 | - <many-to-many column="BenutzerGruppenID" class="de.sub.goobi.Beans.Benutzergruppe"/> |
861 | + <many-to-many column="BenutzerGruppenID" class="de.sub.goobi.beans.Benutzergruppe"/> |
862 | </set> |
863 | |
864 | </class> |
865 | |
866 | === modified file 'src/de/sub/goobi/beans/Schritt.java' |
867 | --- src/de/sub/goobi/Beans/Schritt.java 2011-12-01 12:44:42 +0000 |
868 | +++ src/de/sub/goobi/beans/Schritt.java 2011-12-14 09:20:02 +0000 |
869 | @@ -1,4 +1,4 @@ |
870 | -package de.sub.goobi.Beans; |
871 | +package de.sub.goobi.beans; |
872 | |
873 | import java.io.Serializable; |
874 | import java.text.SimpleDateFormat; |
875 | @@ -11,9 +11,9 @@ |
876 | |
877 | import org.goobi.production.api.property.xmlbasedprovider.Status; |
878 | |
879 | -import de.sub.goobi.Beans.Property.DisplayPropertyList; |
880 | -import de.sub.goobi.Beans.Property.IGoobiEntity; |
881 | -import de.sub.goobi.Beans.Property.IGoobiProperty; |
882 | +import de.sub.goobi.beans.property.DisplayPropertyList; |
883 | +import de.sub.goobi.beans.property.IGoobiEntity; |
884 | +import de.sub.goobi.beans.property.IGoobiProperty; |
885 | import de.sub.goobi.helper.Helper; |
886 | import de.sub.goobi.helper.enums.StepEditType; |
887 | import de.sub.goobi.helper.enums.StepStatus; |
888 | |
889 | === modified file 'src/de/sub/goobi/beans/Schritteigenschaft.hbm.xml' |
890 | --- src/de/sub/goobi/Beans/Schritteigenschaft.hbm.xml 2011-12-01 12:44:42 +0000 |
891 | +++ src/de/sub/goobi/beans/Schritteigenschaft.hbm.xml 2011-12-14 09:20:02 +0000 |
892 | @@ -5,7 +5,7 @@ |
893 | |
894 | <hibernate-mapping> |
895 | |
896 | - <class name="de.sub.goobi.Beans.Schritteigenschaft" table="schritteeigenschaften"> |
897 | + <class name="de.sub.goobi.beans.Schritteigenschaft" table="schritteeigenschaften"> |
898 | <id name="id" column="schritteeigenschaftenID" type="integer"> |
899 | <generator class="native" /> |
900 | </id> |
901 | @@ -17,7 +17,7 @@ |
902 | <property name="auswahl" column="Auswahl" type="string" /> |
903 | <property name="creationDate" column="creationDate" type="timestamp"/> |
904 | <property name="container" column="container" type="integer" /> |
905 | - <many-to-one name="schritt" class="de.sub.goobi.Beans.Schritt" column="schritteID"/> |
906 | + <many-to-one name="schritt" class="de.sub.goobi.beans.Schritt" column="schritteID"/> |
907 | |
908 | </class> |
909 | |
910 | |
911 | === modified file 'src/de/sub/goobi/beans/Schritteigenschaft.java' |
912 | --- src/de/sub/goobi/Beans/Schritteigenschaft.java 2011-12-01 12:44:42 +0000 |
913 | +++ src/de/sub/goobi/beans/Schritteigenschaft.java 2011-12-14 09:20:02 +0000 |
914 | @@ -1,4 +1,4 @@ |
915 | -package de.sub.goobi.Beans; |
916 | +package de.sub.goobi.beans; |
917 | |
918 | import java.io.Serializable; |
919 | import java.util.ArrayList; |
920 | @@ -7,8 +7,8 @@ |
921 | |
922 | import org.goobi.production.api.property.xmlbasedprovider.Status; |
923 | |
924 | -import de.sub.goobi.Beans.Property.IGoobiEntity; |
925 | -import de.sub.goobi.Beans.Property.IGoobiProperty; |
926 | +import de.sub.goobi.beans.property.IGoobiEntity; |
927 | +import de.sub.goobi.beans.property.IGoobiProperty; |
928 | import de.sub.goobi.helper.enums.PropertyType; |
929 | |
930 | public class Schritteigenschaft implements Serializable, IGoobiProperty { |
931 | |
932 | === modified file 'src/de/sub/goobi/beans/Vorlage.hbm.xml' |
933 | --- src/de/sub/goobi/Beans/Vorlage.hbm.xml 2011-12-01 12:44:42 +0000 |
934 | +++ src/de/sub/goobi/beans/Vorlage.hbm.xml 2011-12-14 09:20:02 +0000 |
935 | @@ -5,18 +5,18 @@ |
936 | |
937 | <hibernate-mapping> |
938 | |
939 | - <class name="de.sub.goobi.Beans.Vorlage" table="vorlagen"> |
940 | + <class name="de.sub.goobi.beans.Vorlage" table="vorlagen"> |
941 | <id name="id" column="VorlagenID" type="integer"> |
942 | <generator class="native"/> |
943 | </id> |
944 | |
945 | <property name="herkunft" column="Herkunft" type="string"/> |
946 | |
947 | - <many-to-one name="prozess" class="de.sub.goobi.Beans.Prozess" column="ProzesseID"/> |
948 | + <many-to-one name="prozess" class="de.sub.goobi.beans.Prozess" column="ProzesseID"/> |
949 | |
950 | <set name="eigenschaften" cascade="all,delete-orphan" inverse="true" order-by="titel"> |
951 | <key column="vorlagenID"/> |
952 | - <one-to-many class="de.sub.goobi.Beans.Vorlageeigenschaft"/> |
953 | + <one-to-many class="de.sub.goobi.beans.Vorlageeigenschaft"/> |
954 | </set> |
955 | |
956 | </class> |
957 | |
958 | === modified file 'src/de/sub/goobi/beans/Vorlage.java' |
959 | --- src/de/sub/goobi/Beans/Vorlage.java 2011-12-01 12:44:42 +0000 |
960 | +++ src/de/sub/goobi/beans/Vorlage.java 2011-12-14 09:20:02 +0000 |
961 | @@ -1,4 +1,4 @@ |
962 | -package de.sub.goobi.Beans; |
963 | +package de.sub.goobi.beans; |
964 | |
965 | import java.io.Serializable; |
966 | import java.util.ArrayList; |
967 | @@ -8,9 +8,9 @@ |
968 | |
969 | import org.goobi.production.api.property.xmlbasedprovider.Status; |
970 | |
971 | -import de.sub.goobi.Beans.Property.DisplayPropertyList; |
972 | -import de.sub.goobi.Beans.Property.IGoobiEntity; |
973 | -import de.sub.goobi.Beans.Property.IGoobiProperty; |
974 | +import de.sub.goobi.beans.property.DisplayPropertyList; |
975 | +import de.sub.goobi.beans.property.IGoobiEntity; |
976 | +import de.sub.goobi.beans.property.IGoobiProperty; |
977 | |
978 | public class Vorlage implements Serializable, IGoobiEntity { |
979 | private static final long serialVersionUID = 1736135433162833277L; |
980 | |
981 | === modified file 'src/de/sub/goobi/beans/Vorlageeigenschaft.hbm.xml' |
982 | --- src/de/sub/goobi/Beans/Vorlageeigenschaft.hbm.xml 2011-12-01 12:44:42 +0000 |
983 | +++ src/de/sub/goobi/beans/Vorlageeigenschaft.hbm.xml 2011-12-14 09:20:02 +0000 |
984 | @@ -5,7 +5,7 @@ |
985 | |
986 | <hibernate-mapping> |
987 | |
988 | - <class name="de.sub.goobi.Beans.Vorlageeigenschaft" table="vorlageneigenschaften"> |
989 | + <class name="de.sub.goobi.beans.Vorlageeigenschaft" table="vorlageneigenschaften"> |
990 | <id name="id" column="vorlageneigenschaftenID" type="integer"> |
991 | <generator class="native" /> |
992 | </id> |
993 | @@ -17,7 +17,7 @@ |
994 | <property name="auswahl" column="Auswahl" type="string" /> |
995 | <property name="creationDate" column="creationDate" type="timestamp"/> |
996 | <property name="container" column="container" type="integer" /> |
997 | - <many-to-one name="vorlage" class="de.sub.goobi.Beans.Vorlage" column="vorlagenID"/> |
998 | + <many-to-one name="vorlage" class="de.sub.goobi.beans.Vorlage" column="vorlagenID"/> |
999 | |
1000 | </class> |
1001 | |
1002 | |
1003 | === modified file 'src/de/sub/goobi/beans/Vorlageeigenschaft.java' |
1004 | --- src/de/sub/goobi/Beans/Vorlageeigenschaft.java 2011-12-01 12:44:42 +0000 |
1005 | +++ src/de/sub/goobi/beans/Vorlageeigenschaft.java 2011-12-14 09:20:02 +0000 |
1006 | @@ -1,4 +1,4 @@ |
1007 | -package de.sub.goobi.Beans; |
1008 | +package de.sub.goobi.beans; |
1009 | |
1010 | import java.io.Serializable; |
1011 | import java.util.ArrayList; |
1012 | @@ -7,8 +7,8 @@ |
1013 | |
1014 | import org.goobi.production.api.property.xmlbasedprovider.Status; |
1015 | |
1016 | -import de.sub.goobi.Beans.Property.IGoobiEntity; |
1017 | -import de.sub.goobi.Beans.Property.IGoobiProperty; |
1018 | +import de.sub.goobi.beans.property.IGoobiEntity; |
1019 | +import de.sub.goobi.beans.property.IGoobiProperty; |
1020 | import de.sub.goobi.helper.enums.PropertyType; |
1021 | |
1022 | public class Vorlageeigenschaft implements Serializable, IGoobiProperty { |
1023 | |
1024 | === modified file 'src/de/sub/goobi/beans/Werkstueck.hbm.xml' |
1025 | --- src/de/sub/goobi/Beans/Werkstueck.hbm.xml 2011-12-01 12:44:42 +0000 |
1026 | +++ src/de/sub/goobi/beans/Werkstueck.hbm.xml 2011-12-14 09:20:02 +0000 |
1027 | @@ -5,16 +5,16 @@ |
1028 | |
1029 | <hibernate-mapping> |
1030 | |
1031 | - <class name="de.sub.goobi.Beans.Werkstueck" table="werkstuecke"> |
1032 | + <class name="de.sub.goobi.beans.Werkstueck" table="werkstuecke"> |
1033 | <id name="id" column="WerkstueckeID" type="integer"> |
1034 | <generator class="native"/> |
1035 | </id> |
1036 | |
1037 | - <many-to-one name="prozess" class="de.sub.goobi.Beans.Prozess" column="ProzesseID"/> |
1038 | + <many-to-one name="prozess" class="de.sub.goobi.beans.Prozess" column="ProzesseID"/> |
1039 | |
1040 | <set name="eigenschaften" cascade="all,delete-orphan" inverse="true" order-by="titel"> |
1041 | <key column="werkstueckeID"/> |
1042 | - <one-to-many class="de.sub.goobi.Beans.Werkstueckeigenschaft"/> |
1043 | + <one-to-many class="de.sub.goobi.beans.Werkstueckeigenschaft"/> |
1044 | </set> |
1045 | |
1046 | </class> |
1047 | |
1048 | === modified file 'src/de/sub/goobi/beans/Werkstueck.java' |
1049 | --- src/de/sub/goobi/Beans/Werkstueck.java 2011-12-01 12:44:42 +0000 |
1050 | +++ src/de/sub/goobi/beans/Werkstueck.java 2011-12-14 09:20:02 +0000 |
1051 | @@ -1,4 +1,4 @@ |
1052 | -package de.sub.goobi.Beans; |
1053 | +package de.sub.goobi.beans; |
1054 | |
1055 | import java.io.Serializable; |
1056 | import java.util.ArrayList; |
1057 | @@ -8,9 +8,9 @@ |
1058 | |
1059 | import org.goobi.production.api.property.xmlbasedprovider.Status; |
1060 | |
1061 | -import de.sub.goobi.Beans.Property.DisplayPropertyList; |
1062 | -import de.sub.goobi.Beans.Property.IGoobiEntity; |
1063 | -import de.sub.goobi.Beans.Property.IGoobiProperty; |
1064 | +import de.sub.goobi.beans.property.DisplayPropertyList; |
1065 | +import de.sub.goobi.beans.property.IGoobiEntity; |
1066 | +import de.sub.goobi.beans.property.IGoobiProperty; |
1067 | |
1068 | public class Werkstueck implements Serializable, IGoobiEntity { |
1069 | private static final long serialVersionUID = 123266825187246791L; |
1070 | |
1071 | === modified file 'src/de/sub/goobi/beans/Werkstueckeigenschaft.hbm.xml' |
1072 | --- src/de/sub/goobi/Beans/Werkstueckeigenschaft.hbm.xml 2011-12-01 12:44:42 +0000 |
1073 | +++ src/de/sub/goobi/beans/Werkstueckeigenschaft.hbm.xml 2011-12-14 09:20:02 +0000 |
1074 | @@ -5,7 +5,7 @@ |
1075 | |
1076 | <hibernate-mapping> |
1077 | |
1078 | - <class name="de.sub.goobi.Beans.Werkstueckeigenschaft" table="werkstueckeeigenschaften"> |
1079 | + <class name="de.sub.goobi.beans.Werkstueckeigenschaft" table="werkstueckeeigenschaften"> |
1080 | <id name="id" column="werkstueckeeigenschaftenID" type="integer"> |
1081 | <generator class="native" /> |
1082 | </id> |
1083 | @@ -17,7 +17,7 @@ |
1084 | <property name="auswahl" column="Auswahl" type="string" /> |
1085 | <property name="creationDate" column="creationDate" type="timestamp"/> |
1086 | <property name="container" column="container" type="integer" /> |
1087 | - <many-to-one name="werkstueck" class="de.sub.goobi.Beans.Werkstueck" column="werkstueckeID"/> |
1088 | + <many-to-one name="werkstueck" class="de.sub.goobi.beans.Werkstueck" column="werkstueckeID"/> |
1089 | |
1090 | </class> |
1091 | |
1092 | |
1093 | === modified file 'src/de/sub/goobi/beans/Werkstueckeigenschaft.java' |
1094 | --- src/de/sub/goobi/Beans/Werkstueckeigenschaft.java 2011-12-01 12:44:42 +0000 |
1095 | +++ src/de/sub/goobi/beans/Werkstueckeigenschaft.java 2011-12-14 09:20:02 +0000 |
1096 | @@ -1,4 +1,4 @@ |
1097 | -package de.sub.goobi.Beans; |
1098 | +package de.sub.goobi.beans; |
1099 | |
1100 | import java.io.Serializable; |
1101 | import java.util.ArrayList; |
1102 | @@ -7,8 +7,8 @@ |
1103 | |
1104 | import org.goobi.production.api.property.xmlbasedprovider.Status; |
1105 | |
1106 | -import de.sub.goobi.Beans.Property.IGoobiEntity; |
1107 | -import de.sub.goobi.Beans.Property.IGoobiProperty; |
1108 | +import de.sub.goobi.beans.property.IGoobiEntity; |
1109 | +import de.sub.goobi.beans.property.IGoobiProperty; |
1110 | import de.sub.goobi.helper.enums.PropertyType; |
1111 | |
1112 | public class Werkstueckeigenschaft implements Serializable, IGoobiProperty { |
1113 | |
1114 | === renamed directory 'src/de/sub/goobi/Beans/Property' => 'src/de/sub/goobi/beans/property' |
1115 | === modified file 'src/de/sub/goobi/beans/property/DisplayPropertyList.java' |
1116 | --- src/de/sub/goobi/Beans/Property/DisplayPropertyList.java 2011-12-01 12:44:42 +0000 |
1117 | +++ src/de/sub/goobi/beans/property/DisplayPropertyList.java 2011-12-14 09:20:02 +0000 |
1118 | @@ -1,4 +1,4 @@ |
1119 | -package de.sub.goobi.Beans.Property; |
1120 | +package de.sub.goobi.beans.property; |
1121 | |
1122 | import java.io.IOException; |
1123 | import java.util.ArrayList; |
1124 | @@ -12,7 +12,7 @@ |
1125 | import org.goobi.production.api.property.xmlbasedprovider.impl.XMLBasedPropertyTemplateProvider; |
1126 | import org.jdom.JDOMException; |
1127 | |
1128 | -import de.sub.goobi.Persistence.SimpleDAO; |
1129 | +import de.sub.goobi.persistence.SimpleDAO; |
1130 | import de.sub.goobi.config.ConfigMain; |
1131 | import de.sub.goobi.helper.enums.PropertyType; |
1132 | import de.sub.goobi.helper.exceptions.DAOException; |
1133 | |
1134 | === modified file 'src/de/sub/goobi/beans/property/IGoobiEntity.java' |
1135 | --- src/de/sub/goobi/Beans/Property/IGoobiEntity.java 2011-12-01 12:44:42 +0000 |
1136 | +++ src/de/sub/goobi/beans/property/IGoobiEntity.java 2011-12-14 09:20:02 +0000 |
1137 | @@ -1,4 +1,4 @@ |
1138 | -package de.sub.goobi.Beans.Property; |
1139 | +package de.sub.goobi.beans.property; |
1140 | |
1141 | import java.util.List; |
1142 | |
1143 | |
1144 | === modified file 'src/de/sub/goobi/beans/property/IGoobiProperty.java' |
1145 | --- src/de/sub/goobi/Beans/Property/IGoobiProperty.java 2011-12-01 12:44:42 +0000 |
1146 | +++ src/de/sub/goobi/beans/property/IGoobiProperty.java 2011-12-14 09:20:02 +0000 |
1147 | @@ -1,4 +1,4 @@ |
1148 | -package de.sub.goobi.Beans.Property; |
1149 | +package de.sub.goobi.beans.property; |
1150 | |
1151 | import java.util.Date; |
1152 | |
1153 | |
1154 | === modified file 'src/de/sub/goobi/config/ConfigProjects.java' |
1155 | --- src/de/sub/goobi/config/ConfigProjects.java 2011-12-01 12:44:42 +0000 |
1156 | +++ src/de/sub/goobi/config/ConfigProjects.java 2011-12-14 09:20:02 +0000 |
1157 | @@ -11,7 +11,7 @@ |
1158 | import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy; |
1159 | import org.apache.log4j.Logger; |
1160 | |
1161 | -import de.sub.goobi.Beans.Projekt; |
1162 | +import de.sub.goobi.beans.Projekt; |
1163 | import de.sub.goobi.helper.Helper; |
1164 | |
1165 | public class ConfigProjects { |
1166 | |
1167 | === renamed directory 'src/de/sub/goobi/Converter' => 'src/de/sub/goobi/converter' |
1168 | === modified file 'src/de/sub/goobi/converter/RegelsatzConverter.java' |
1169 | --- src/de/sub/goobi/Converter/RegelsatzConverter.java 2011-12-01 12:44:42 +0000 |
1170 | +++ src/de/sub/goobi/converter/RegelsatzConverter.java 2011-12-14 09:20:02 +0000 |
1171 | @@ -1,4 +1,4 @@ |
1172 | -package de.sub.goobi.Converter; |
1173 | +package de.sub.goobi.converter; |
1174 | |
1175 | import javax.faces.component.UIComponent; |
1176 | import javax.faces.context.FacesContext; |
1177 | @@ -7,8 +7,8 @@ |
1178 | |
1179 | import org.apache.log4j.Logger; |
1180 | |
1181 | -import de.sub.goobi.Beans.Regelsatz; |
1182 | -import de.sub.goobi.Persistence.RegelsatzDAO; |
1183 | +import de.sub.goobi.beans.Regelsatz; |
1184 | +import de.sub.goobi.persistence.RegelsatzDAO; |
1185 | import de.sub.goobi.helper.exceptions.DAOException; |
1186 | |
1187 | |
1188 | |
1189 | === modified file 'src/de/sub/goobi/converter/StatisticsCalculationUnitConverter.java' |
1190 | --- src/de/sub/goobi/Converter/StatisticsCalculationUnitConverter.java 2011-07-19 17:06:09 +0000 |
1191 | +++ src/de/sub/goobi/converter/StatisticsCalculationUnitConverter.java 2011-12-14 09:20:02 +0000 |
1192 | @@ -1,4 +1,4 @@ |
1193 | -package de.sub.goobi.Converter; |
1194 | +package de.sub.goobi.converter; |
1195 | |
1196 | import javax.faces.component.UIComponent; |
1197 | import javax.faces.context.FacesContext; |
1198 | |
1199 | === modified file 'src/de/sub/goobi/converter/StatisticsResultOutputConverter.java' |
1200 | --- src/de/sub/goobi/Converter/StatisticsResultOutputConverter.java 2011-07-19 17:06:09 +0000 |
1201 | +++ src/de/sub/goobi/converter/StatisticsResultOutputConverter.java 2011-12-14 09:20:02 +0000 |
1202 | @@ -1,4 +1,4 @@ |
1203 | -package de.sub.goobi.Converter; |
1204 | +package de.sub.goobi.converter; |
1205 | |
1206 | import javax.faces.component.UIComponent; |
1207 | import javax.faces.context.FacesContext; |
1208 | |
1209 | === modified file 'src/de/sub/goobi/converter/StatisticsTimeUnitConverter.java' |
1210 | --- src/de/sub/goobi/Converter/StatisticsTimeUnitConverter.java 2011-07-19 17:06:09 +0000 |
1211 | +++ src/de/sub/goobi/converter/StatisticsTimeUnitConverter.java 2011-12-14 09:20:02 +0000 |
1212 | @@ -1,4 +1,4 @@ |
1213 | -package de.sub.goobi.Converter; |
1214 | +package de.sub.goobi.converter; |
1215 | |
1216 | import javax.faces.component.UIComponent; |
1217 | import javax.faces.context.FacesContext; |
1218 | |
1219 | === renamed directory 'src/de/sub/goobi/Export' => 'src/de/sub/goobi/export' |
1220 | === modified file 'src/de/sub/goobi/export/dms/DmsImportThread.java' |
1221 | --- src/de/sub/goobi/Export/dms/DmsImportThread.java 2011-12-01 12:44:42 +0000 |
1222 | +++ src/de/sub/goobi/export/dms/DmsImportThread.java 2011-12-14 09:20:02 +0000 |
1223 | @@ -1,4 +1,4 @@ |
1224 | -package de.sub.goobi.Export.dms; |
1225 | +package de.sub.goobi.export.dms; |
1226 | |
1227 | import java.io.BufferedReader; |
1228 | import java.io.File; |
1229 | @@ -6,7 +6,7 @@ |
1230 | |
1231 | import org.apache.log4j.Logger; |
1232 | |
1233 | -import de.sub.goobi.Beans.Prozess; |
1234 | +import de.sub.goobi.beans.Prozess; |
1235 | import de.sub.goobi.config.ConfigMain; |
1236 | import de.sub.goobi.helper.Helper; |
1237 | |
1238 | |
1239 | === modified file 'src/de/sub/goobi/export/dms/ExportDms.java' |
1240 | --- src/de/sub/goobi/Export/dms/ExportDms.java 2011-12-01 12:44:42 +0000 |
1241 | +++ src/de/sub/goobi/export/dms/ExportDms.java 2011-12-14 09:20:02 +0000 |
1242 | @@ -1,4 +1,4 @@ |
1243 | -package de.sub.goobi.Export.dms; |
1244 | +package de.sub.goobi.export.dms; |
1245 | |
1246 | import java.io.File; |
1247 | import java.io.IOException; |
1248 | @@ -15,11 +15,11 @@ |
1249 | import ugh.exceptions.WriteException; |
1250 | import ugh.fileformats.excel.RDFFile; |
1251 | import ugh.fileformats.mets.MetsModsImportExport; |
1252 | -import de.sub.goobi.Beans.Benutzer; |
1253 | -import de.sub.goobi.Beans.Prozess; |
1254 | -import de.sub.goobi.Export.download.ExportMets; |
1255 | -import de.sub.goobi.Metadaten.MetadatenImagesHelper; |
1256 | -import de.sub.goobi.Metadaten.MetadatenVerifizierung; |
1257 | +import de.sub.goobi.beans.Benutzer; |
1258 | +import de.sub.goobi.beans.Prozess; |
1259 | +import de.sub.goobi.export.download.ExportMets; |
1260 | +import de.sub.goobi.metadaten.MetadatenImagesHelper; |
1261 | +import de.sub.goobi.metadaten.MetadatenVerifizierung; |
1262 | import de.sub.goobi.config.ConfigMain; |
1263 | import de.sub.goobi.config.ConfigProjects; |
1264 | import de.sub.goobi.helper.Helper; |
1265 | |
1266 | === modified file 'src/de/sub/goobi/export/dms/ExportDms_CorrectRusdml.java' |
1267 | --- src/de/sub/goobi/Export/dms/ExportDms_CorrectRusdml.java 2011-12-01 12:44:42 +0000 |
1268 | +++ src/de/sub/goobi/export/dms/ExportDms_CorrectRusdml.java 2011-12-14 09:20:02 +0000 |
1269 | @@ -1,4 +1,4 @@ |
1270 | -package de.sub.goobi.Export.dms; |
1271 | +package de.sub.goobi.export.dms; |
1272 | |
1273 | //TODO: Remove this class |
1274 | import java.util.ArrayList; |
1275 | @@ -17,7 +17,7 @@ |
1276 | import ugh.exceptions.DocStructHasNoTypeException; |
1277 | import ugh.exceptions.MetadataTypeNotAllowedException; |
1278 | import ugh.exceptions.PreferencesException; |
1279 | -import de.sub.goobi.Beans.Prozess; |
1280 | +import de.sub.goobi.beans.Prozess; |
1281 | import de.sub.goobi.helper.BeanHelper; |
1282 | import de.sub.goobi.helper.exceptions.ExportFileException; |
1283 | import de.sub.goobi.helper.exceptions.UghHelperException; |
1284 | |
1285 | === modified file 'src/de/sub/goobi/export/download/ExportMets.java' |
1286 | --- src/de/sub/goobi/Export/download/ExportMets.java 2011-12-01 12:44:42 +0000 |
1287 | +++ src/de/sub/goobi/export/download/ExportMets.java 2011-12-14 09:20:02 +0000 |
1288 | @@ -1,4 +1,4 @@ |
1289 | -package de.sub.goobi.Export.download; |
1290 | +package de.sub.goobi.export.download; |
1291 | |
1292 | import java.io.File; |
1293 | import java.io.IOException; |
1294 | @@ -21,12 +21,12 @@ |
1295 | import ugh.exceptions.TypeNotAllowedForParentException; |
1296 | import ugh.exceptions.WriteException; |
1297 | import ugh.fileformats.mets.MetsModsImportExport; |
1298 | -import de.sub.goobi.Beans.Benutzer; |
1299 | -import de.sub.goobi.Beans.ProjectFileGroup; |
1300 | -import de.sub.goobi.Beans.Prozess; |
1301 | -import de.sub.goobi.Export.dms.ExportDms_CorrectRusdml; |
1302 | -import de.sub.goobi.Forms.LoginForm; |
1303 | -import de.sub.goobi.Metadaten.MetadatenImagesHelper; |
1304 | +import de.sub.goobi.beans.Benutzer; |
1305 | +import de.sub.goobi.beans.ProjectFileGroup; |
1306 | +import de.sub.goobi.beans.Prozess; |
1307 | +import de.sub.goobi.export.dms.ExportDms_CorrectRusdml; |
1308 | +import de.sub.goobi.forms.LoginForm; |
1309 | +import de.sub.goobi.metadaten.MetadatenImagesHelper; |
1310 | import de.sub.goobi.config.ConfigProjects; |
1311 | import de.sub.goobi.helper.Helper; |
1312 | import de.sub.goobi.helper.VariableReplacer; |
1313 | |
1314 | === modified file 'src/de/sub/goobi/export/download/ExportPdf.java' |
1315 | --- src/de/sub/goobi/Export/download/ExportPdf.java 2011-12-01 12:44:42 +0000 |
1316 | +++ src/de/sub/goobi/export/download/ExportPdf.java 2011-12-14 09:20:02 +0000 |
1317 | @@ -1,4 +1,4 @@ |
1318 | -package de.sub.goobi.Export.download; |
1319 | +package de.sub.goobi.export.download; |
1320 | |
1321 | import java.io.BufferedWriter; |
1322 | import java.io.File; |
1323 | @@ -24,9 +24,9 @@ |
1324 | import ugh.exceptions.ReadException; |
1325 | import ugh.exceptions.TypeNotAllowedForParentException; |
1326 | import ugh.exceptions.WriteException; |
1327 | -import de.sub.goobi.Beans.Prozess; |
1328 | -import de.sub.goobi.Metadaten.MetadatenHelper; |
1329 | -import de.sub.goobi.Metadaten.MetadatenVerifizierung; |
1330 | +import de.sub.goobi.beans.Prozess; |
1331 | +import de.sub.goobi.metadaten.MetadatenHelper; |
1332 | +import de.sub.goobi.metadaten.MetadatenVerifizierung; |
1333 | import de.sub.goobi.config.ConfigMain; |
1334 | import de.sub.goobi.helper.FileUtils; |
1335 | import de.sub.goobi.helper.Helper; |
1336 | |
1337 | === modified file 'src/de/sub/goobi/export/download/Multipage.java' |
1338 | --- src/de/sub/goobi/Export/download/Multipage.java 2011-12-01 12:44:42 +0000 |
1339 | +++ src/de/sub/goobi/export/download/Multipage.java 2011-12-14 09:20:02 +0000 |
1340 | @@ -1,4 +1,4 @@ |
1341 | -package de.sub.goobi.Export.download; |
1342 | +package de.sub.goobi.export.download; |
1343 | |
1344 | //TODO: Move parts of this into ContentServer2 |
1345 | |
1346 | @@ -23,8 +23,8 @@ |
1347 | import com.sun.media.jai.codec.ImageEncoder; |
1348 | import com.sun.media.jai.codec.TIFFEncodeParam; |
1349 | |
1350 | -import de.sub.goobi.Beans.Prozess; |
1351 | -import de.sub.goobi.Metadaten.MetadatenImagesHelper; |
1352 | +import de.sub.goobi.beans.Prozess; |
1353 | +import de.sub.goobi.metadaten.MetadatenImagesHelper; |
1354 | import de.sub.goobi.helper.Helper; |
1355 | import de.sub.goobi.helper.exceptions.DAOException; |
1356 | import de.sub.goobi.helper.exceptions.SwapException; |
1357 | |
1358 | === modified file 'src/de/sub/goobi/export/download/TiffHeader.java' |
1359 | --- src/de/sub/goobi/Export/download/TiffHeader.java 2011-12-01 12:44:42 +0000 |
1360 | +++ src/de/sub/goobi/export/download/TiffHeader.java 2011-12-14 09:20:02 +0000 |
1361 | @@ -1,4 +1,4 @@ |
1362 | -package de.sub.goobi.Export.download; |
1363 | +package de.sub.goobi.export.download; |
1364 | |
1365 | import java.io.IOException; |
1366 | import java.sql.SQLException; |
1367 | @@ -9,9 +9,9 @@ |
1368 | import javax.servlet.ServletOutputStream; |
1369 | import javax.servlet.http.HttpServletResponse; |
1370 | |
1371 | -import de.sub.goobi.Beans.Prozess; |
1372 | -import de.sub.goobi.Beans.Werkstueck; |
1373 | -import de.sub.goobi.Beans.Werkstueckeigenschaft; |
1374 | +import de.sub.goobi.beans.Prozess; |
1375 | +import de.sub.goobi.beans.Werkstueck; |
1376 | +import de.sub.goobi.beans.Werkstueckeigenschaft; |
1377 | |
1378 | //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) |
1379 | |
1380 | |
1381 | === renamed directory 'src/de/sub/goobi/Forms' => 'src/de/sub/goobi/forms' |
1382 | === modified file 'src/de/sub/goobi/forms/AdditionalField.java' |
1383 | --- src/de/sub/goobi/Forms/AdditionalField.java 2011-12-01 12:44:42 +0000 |
1384 | +++ src/de/sub/goobi/forms/AdditionalField.java 2011-12-14 09:20:02 +0000 |
1385 | @@ -1,4 +1,4 @@ |
1386 | -package de.sub.goobi.Forms; |
1387 | +package de.sub.goobi.forms; |
1388 | |
1389 | import java.util.List; |
1390 | |
1391 | |
1392 | === modified file 'src/de/sub/goobi/forms/AdministrationForm.java' |
1393 | --- src/de/sub/goobi/Forms/AdministrationForm.java 2011-12-01 12:44:42 +0000 |
1394 | +++ src/de/sub/goobi/forms/AdministrationForm.java 2011-12-14 09:20:02 +0000 |
1395 | @@ -1,4 +1,4 @@ |
1396 | -package de.sub.goobi.Forms; |
1397 | +package de.sub.goobi.forms; |
1398 | |
1399 | //TODO: Use generics. |
1400 | //TODO: Dont use Iterators, use for loop instead. |
1401 | @@ -34,16 +34,16 @@ |
1402 | import ugh.dl.Prefs; |
1403 | import ugh.exceptions.PreferencesException; |
1404 | import ugh.exceptions.ReadException; |
1405 | -import de.sub.goobi.Beans.Benutzer; |
1406 | -import de.sub.goobi.Beans.Benutzergruppe; |
1407 | -import de.sub.goobi.Beans.Prozess; |
1408 | -import de.sub.goobi.Beans.Regelsatz; |
1409 | -import de.sub.goobi.Beans.Schritt; |
1410 | -import de.sub.goobi.Persistence.BenutzerDAO; |
1411 | -import de.sub.goobi.Persistence.BenutzergruppenDAO; |
1412 | -import de.sub.goobi.Persistence.ProzessDAO; |
1413 | -import de.sub.goobi.Persistence.RegelsatzDAO; |
1414 | -import de.sub.goobi.Persistence.SchrittDAO; |
1415 | +import de.sub.goobi.beans.Benutzer; |
1416 | +import de.sub.goobi.beans.Benutzergruppe; |
1417 | +import de.sub.goobi.beans.Prozess; |
1418 | +import de.sub.goobi.beans.Regelsatz; |
1419 | +import de.sub.goobi.beans.Schritt; |
1420 | +import de.sub.goobi.persistence.BenutzerDAO; |
1421 | +import de.sub.goobi.persistence.BenutzergruppenDAO; |
1422 | +import de.sub.goobi.persistence.ProzessDAO; |
1423 | +import de.sub.goobi.persistence.RegelsatzDAO; |
1424 | +import de.sub.goobi.persistence.SchrittDAO; |
1425 | import de.sub.goobi.config.ConfigMain; |
1426 | import de.sub.goobi.helper.BeanHelper; |
1427 | import de.sub.goobi.helper.FileUtils; |
1428 | |
1429 | === modified file 'src/de/sub/goobi/forms/AktuelleSchritteForm.java' |
1430 | --- src/de/sub/goobi/Forms/AktuelleSchritteForm.java 2011-12-01 12:44:42 +0000 |
1431 | +++ src/de/sub/goobi/forms/AktuelleSchritteForm.java 2011-12-14 09:20:02 +0000 |
1432 | @@ -1,4 +1,4 @@ |
1433 | -package de.sub.goobi.Forms; |
1434 | +package de.sub.goobi.forms; |
1435 | |
1436 | //TODO: Use generics. |
1437 | //TODO: Remove RusDML garbage |
1438 | @@ -25,21 +25,21 @@ |
1439 | import org.hibernate.criterion.Order; |
1440 | import org.hibernate.criterion.Restrictions; |
1441 | |
1442 | -import Messages.Messages; |
1443 | -import de.sub.goobi.Beans.Benutzer; |
1444 | -import de.sub.goobi.Beans.HistoryEvent; |
1445 | -import de.sub.goobi.Beans.Prozess; |
1446 | -import de.sub.goobi.Beans.Schritt; |
1447 | -import de.sub.goobi.Beans.Schritteigenschaft; |
1448 | -import de.sub.goobi.Export.dms.ExportDms; |
1449 | -import de.sub.goobi.Export.download.TiffHeader; |
1450 | -import de.sub.goobi.Metadaten.MetadatenImagesHelper; |
1451 | -import de.sub.goobi.Metadaten.MetadatenSperrung; |
1452 | -import de.sub.goobi.Metadaten.MetadatenVerifizierung; |
1453 | -import de.sub.goobi.Persistence.HibernateUtil; |
1454 | -import de.sub.goobi.Persistence.ProzessDAO; |
1455 | -import de.sub.goobi.Persistence.SchrittDAO; |
1456 | -import de.sub.goobi.Persistence.SimpleDAO; |
1457 | +import messages.Messages; |
1458 | +import de.sub.goobi.beans.Benutzer; |
1459 | +import de.sub.goobi.beans.HistoryEvent; |
1460 | +import de.sub.goobi.beans.Prozess; |
1461 | +import de.sub.goobi.beans.Schritt; |
1462 | +import de.sub.goobi.beans.Schritteigenschaft; |
1463 | +import de.sub.goobi.export.dms.ExportDms; |
1464 | +import de.sub.goobi.export.download.TiffHeader; |
1465 | +import de.sub.goobi.metadaten.MetadatenImagesHelper; |
1466 | +import de.sub.goobi.metadaten.MetadatenSperrung; |
1467 | +import de.sub.goobi.metadaten.MetadatenVerifizierung; |
1468 | +import de.sub.goobi.persistence.HibernateUtil; |
1469 | +import de.sub.goobi.persistence.ProzessDAO; |
1470 | +import de.sub.goobi.persistence.SchrittDAO; |
1471 | +import de.sub.goobi.persistence.SimpleDAO; |
1472 | import de.sub.goobi.config.ConfigMain; |
1473 | import de.sub.goobi.helper.FileUtils; |
1474 | import de.sub.goobi.helper.Helper; |
1475 | |
1476 | === modified file 'src/de/sub/goobi/forms/BasisForm.java' |
1477 | --- src/de/sub/goobi/Forms/BasisForm.java 2011-12-01 12:44:42 +0000 |
1478 | +++ src/de/sub/goobi/forms/BasisForm.java 2011-12-14 09:20:02 +0000 |
1479 | @@ -1,11 +1,11 @@ |
1480 | -package de.sub.goobi.Forms; |
1481 | +package de.sub.goobi.forms; |
1482 | |
1483 | import java.io.Serializable; |
1484 | |
1485 | import org.apache.log4j.Logger; |
1486 | |
1487 | -import de.sub.goobi.Beans.Benutzer; |
1488 | -import de.sub.goobi.Persistence.BenutzerDAO; |
1489 | +import de.sub.goobi.beans.Benutzer; |
1490 | +import de.sub.goobi.persistence.BenutzerDAO; |
1491 | import de.sub.goobi.helper.Helper; |
1492 | import de.sub.goobi.helper.Page; |
1493 | import de.sub.goobi.helper.exceptions.DAOException; |
1494 | |
1495 | === modified file 'src/de/sub/goobi/forms/BenutzergruppenForm.java' |
1496 | --- src/de/sub/goobi/Forms/BenutzergruppenForm.java 2011-12-01 12:44:42 +0000 |
1497 | +++ src/de/sub/goobi/forms/BenutzergruppenForm.java 2011-12-14 09:20:02 +0000 |
1498 | @@ -1,12 +1,12 @@ |
1499 | -package de.sub.goobi.Forms; |
1500 | +package de.sub.goobi.forms; |
1501 | |
1502 | import org.hibernate.Criteria; |
1503 | import org.hibernate.HibernateException; |
1504 | import org.hibernate.Session; |
1505 | import org.hibernate.criterion.Order; |
1506 | |
1507 | -import de.sub.goobi.Beans.Benutzergruppe; |
1508 | -import de.sub.goobi.Persistence.BenutzergruppenDAO; |
1509 | +import de.sub.goobi.beans.Benutzergruppe; |
1510 | +import de.sub.goobi.persistence.BenutzergruppenDAO; |
1511 | import de.sub.goobi.helper.Helper; |
1512 | import de.sub.goobi.helper.Page; |
1513 | import de.sub.goobi.helper.exceptions.DAOException; |
1514 | |
1515 | === modified file 'src/de/sub/goobi/forms/BenutzerverwaltungForm.java' |
1516 | --- src/de/sub/goobi/Forms/BenutzerverwaltungForm.java 2011-12-01 12:44:42 +0000 |
1517 | +++ src/de/sub/goobi/forms/BenutzerverwaltungForm.java 2011-12-14 09:20:02 +0000 |
1518 | @@ -1,4 +1,4 @@ |
1519 | -package de.sub.goobi.Forms; |
1520 | +package de.sub.goobi.forms; |
1521 | |
1522 | import java.io.BufferedReader; |
1523 | import java.io.File; |
1524 | @@ -25,14 +25,14 @@ |
1525 | import org.hibernate.criterion.Order; |
1526 | import org.hibernate.criterion.Restrictions; |
1527 | |
1528 | -import de.sub.goobi.Beans.Benutzer; |
1529 | -import de.sub.goobi.Beans.Benutzergruppe; |
1530 | -import de.sub.goobi.Beans.LdapGruppe; |
1531 | -import de.sub.goobi.Beans.Projekt; |
1532 | -import de.sub.goobi.Persistence.BenutzerDAO; |
1533 | -import de.sub.goobi.Persistence.BenutzergruppenDAO; |
1534 | -import de.sub.goobi.Persistence.LdapGruppenDAO; |
1535 | -import de.sub.goobi.Persistence.ProjektDAO; |
1536 | +import de.sub.goobi.beans.Benutzer; |
1537 | +import de.sub.goobi.beans.Benutzergruppe; |
1538 | +import de.sub.goobi.beans.LdapGruppe; |
1539 | +import de.sub.goobi.beans.Projekt; |
1540 | +import de.sub.goobi.persistence.BenutzerDAO; |
1541 | +import de.sub.goobi.persistence.BenutzergruppenDAO; |
1542 | +import de.sub.goobi.persistence.LdapGruppenDAO; |
1543 | +import de.sub.goobi.persistence.ProjektDAO; |
1544 | import de.sub.goobi.helper.Helper; |
1545 | import de.sub.goobi.helper.Page; |
1546 | import de.sub.goobi.helper.exceptions.DAOException; |
1547 | |
1548 | === modified file 'src/de/sub/goobi/forms/HelperForm.java' |
1549 | --- src/de/sub/goobi/Forms/HelperForm.java 2011-12-01 13:02:10 +0000 |
1550 | +++ src/de/sub/goobi/forms/HelperForm.java 2011-12-14 09:20:02 +0000 |
1551 | @@ -1,4 +1,4 @@ |
1552 | -package de.sub.goobi.Forms; |
1553 | +package de.sub.goobi.forms; |
1554 | |
1555 | //TODO: Use generics. |
1556 | //TODO: use consts for files and URL fragments |
1557 | @@ -17,8 +17,8 @@ |
1558 | |
1559 | import org.goobi.production.GoobiVersion; |
1560 | |
1561 | -import de.sub.goobi.Beans.Regelsatz; |
1562 | -import de.sub.goobi.Persistence.RegelsatzDAO; |
1563 | +import de.sub.goobi.beans.Regelsatz; |
1564 | +import de.sub.goobi.persistence.RegelsatzDAO; |
1565 | import de.sub.goobi.config.ConfigMain; |
1566 | import de.sub.goobi.helper.Helper; |
1567 | import de.sub.goobi.helper.enums.MetadataFormat; |
1568 | |
1569 | === modified file 'src/de/sub/goobi/forms/LdapGruppenForm.java' |
1570 | --- src/de/sub/goobi/Forms/LdapGruppenForm.java 2011-12-01 12:44:42 +0000 |
1571 | +++ src/de/sub/goobi/forms/LdapGruppenForm.java 2011-12-14 09:20:02 +0000 |
1572 | @@ -1,12 +1,12 @@ |
1573 | -package de.sub.goobi.Forms; |
1574 | +package de.sub.goobi.forms; |
1575 | |
1576 | import org.hibernate.Criteria; |
1577 | import org.hibernate.HibernateException; |
1578 | import org.hibernate.Session; |
1579 | import org.hibernate.criterion.Order; |
1580 | |
1581 | -import de.sub.goobi.Beans.LdapGruppe; |
1582 | -import de.sub.goobi.Persistence.LdapGruppenDAO; |
1583 | +import de.sub.goobi.beans.LdapGruppe; |
1584 | +import de.sub.goobi.persistence.LdapGruppenDAO; |
1585 | import de.sub.goobi.helper.Helper; |
1586 | import de.sub.goobi.helper.Page; |
1587 | import de.sub.goobi.helper.exceptions.DAOException; |
1588 | |
1589 | === modified file 'src/de/sub/goobi/forms/LoginForm.java' |
1590 | --- src/de/sub/goobi/Forms/LoginForm.java 2011-12-01 12:44:42 +0000 |
1591 | +++ src/de/sub/goobi/forms/LoginForm.java 2011-12-14 09:20:02 +0000 |
1592 | @@ -1,4 +1,4 @@ |
1593 | -package de.sub.goobi.Forms; |
1594 | +package de.sub.goobi.forms; |
1595 | |
1596 | //TODO: Move Parts of this into a authentification API |
1597 | import java.io.File; |
1598 | @@ -12,11 +12,11 @@ |
1599 | import javax.faces.context.FacesContext; |
1600 | import javax.servlet.http.HttpSession; |
1601 | |
1602 | -import de.sub.goobi.Beans.Benutzer; |
1603 | -import de.sub.goobi.Beans.Benutzergruppe; |
1604 | -import de.sub.goobi.Metadaten.MetadatenSperrung; |
1605 | -import de.sub.goobi.Persistence.BenutzerDAO; |
1606 | -import de.sub.goobi.Persistence.BenutzergruppenDAO; |
1607 | +import de.sub.goobi.beans.Benutzer; |
1608 | +import de.sub.goobi.beans.Benutzergruppe; |
1609 | +import de.sub.goobi.metadaten.MetadatenSperrung; |
1610 | +import de.sub.goobi.persistence.BenutzerDAO; |
1611 | +import de.sub.goobi.persistence.BenutzergruppenDAO; |
1612 | import de.sub.goobi.config.ConfigMain; |
1613 | import de.sub.goobi.helper.Helper; |
1614 | import de.sub.goobi.helper.encryption.MD5; |
1615 | |
1616 | === modified file 'src/de/sub/goobi/forms/LongRunningTasksForm.java' |
1617 | --- src/de/sub/goobi/Forms/LongRunningTasksForm.java 2011-12-01 12:44:42 +0000 |
1618 | +++ src/de/sub/goobi/forms/LongRunningTasksForm.java 2011-12-14 09:20:02 +0000 |
1619 | @@ -1,10 +1,10 @@ |
1620 | -package de.sub.goobi.Forms; |
1621 | +package de.sub.goobi.forms; |
1622 | |
1623 | import java.util.LinkedList; |
1624 | |
1625 | import org.apache.log4j.Logger; |
1626 | |
1627 | -import de.sub.goobi.Beans.Prozess; |
1628 | +import de.sub.goobi.beans.Prozess; |
1629 | import de.sub.goobi.helper.tasks.LongRunningTask; |
1630 | import de.sub.goobi.helper.tasks.LongRunningTaskManager; |
1631 | |
1632 | |
1633 | === modified file 'src/de/sub/goobi/forms/ModuleServerForm.java' |
1634 | --- src/de/sub/goobi/Forms/ModuleServerForm.java 2011-12-01 12:44:42 +0000 |
1635 | +++ src/de/sub/goobi/forms/ModuleServerForm.java 2011-12-14 09:20:02 +0000 |
1636 | @@ -1,4 +1,4 @@ |
1637 | -package de.sub.goobi.Forms; |
1638 | +package de.sub.goobi.forms; |
1639 | |
1640 | import java.io.File; |
1641 | import java.io.IOException; |
1642 | @@ -20,11 +20,11 @@ |
1643 | import org.jdom.JDOMException; |
1644 | import org.jdom.input.SAXBuilder; |
1645 | |
1646 | -import de.sub.goobi.Beans.Prozess; |
1647 | -import de.sub.goobi.Beans.Schritt; |
1648 | -import de.sub.goobi.Modul.ExtendedDataImpl; |
1649 | -import de.sub.goobi.Modul.ExtendedProzessImpl; |
1650 | -import de.sub.goobi.Persistence.ProzessDAO; |
1651 | +import de.sub.goobi.beans.Prozess; |
1652 | +import de.sub.goobi.beans.Schritt; |
1653 | +import de.sub.goobi.modul.ExtendedDataImpl; |
1654 | +import de.sub.goobi.modul.ExtendedProzessImpl; |
1655 | +import de.sub.goobi.persistence.ProzessDAO; |
1656 | import de.sub.goobi.config.ConfigMain; |
1657 | import de.sub.goobi.helper.Helper; |
1658 | import de.sub.goobi.helper.exceptions.DAOException; |
1659 | @@ -303,10 +303,10 @@ |
1660 | } |
1661 | |
1662 | /** |
1663 | - * Mit dieser Methode werden die Messages abgearbeitet |
1664 | + * Mit dieser Methode werden die messages abgearbeitet |
1665 | * |
1666 | * @param message |
1667 | - * Messages |
1668 | + * messages |
1669 | * @param modules |
1670 | * GoobiModuleManager ================================================================ |
1671 | */ |
1672 | @@ -328,7 +328,7 @@ |
1673 | * beschrieben |
1674 | */ |
1675 | if (message.body.type.equals("trigger")) { |
1676 | - // behandlung aller trigger Messages |
1677 | + // behandlung aller trigger messages |
1678 | /* |
1679 | * Behandlung von "trigger - END" |
1680 | */ |
1681 | @@ -342,7 +342,7 @@ |
1682 | } |
1683 | } |
1684 | } else if (message.body.type.equals("log")) { |
1685 | - // behandlung aller log Messages |
1686 | + // behandlung aller log messages |
1687 | } |
1688 | } |
1689 | } |
1690 | |
1691 | === modified file 'src/de/sub/goobi/forms/NavigationForm.java' |
1692 | --- src/de/sub/goobi/Forms/NavigationForm.java 2011-12-01 12:44:42 +0000 |
1693 | +++ src/de/sub/goobi/forms/NavigationForm.java 2011-12-14 09:20:02 +0000 |
1694 | @@ -1,4 +1,4 @@ |
1695 | -package de.sub.goobi.Forms; |
1696 | +package de.sub.goobi.forms; |
1697 | |
1698 | import de.sub.goobi.config.ConfigMain; |
1699 | |
1700 | |
1701 | === modified file 'src/de/sub/goobi/forms/ProjekteForm.java' |
1702 | --- src/de/sub/goobi/Forms/ProjekteForm.java 2011-12-01 12:44:42 +0000 |
1703 | +++ src/de/sub/goobi/forms/ProjekteForm.java 2011-12-14 09:20:02 +0000 |
1704 | @@ -1,4 +1,4 @@ |
1705 | -package de.sub.goobi.Forms; |
1706 | +package de.sub.goobi.forms; |
1707 | |
1708 | import java.awt.Graphics2D; |
1709 | import java.awt.image.BufferedImage; |
1710 | @@ -42,10 +42,10 @@ |
1711 | |
1712 | import de.intranda.commons.chart.renderer.ChartRenderer; |
1713 | import de.intranda.commons.chart.results.ChartDraw.ChartType; |
1714 | -import de.sub.goobi.Beans.ProjectFileGroup; |
1715 | -import de.sub.goobi.Beans.Projekt; |
1716 | -import de.sub.goobi.Beans.Prozess; |
1717 | -import de.sub.goobi.Persistence.ProjektDAO; |
1718 | +import de.sub.goobi.beans.ProjectFileGroup; |
1719 | +import de.sub.goobi.beans.Projekt; |
1720 | +import de.sub.goobi.beans.Prozess; |
1721 | +import de.sub.goobi.persistence.ProjektDAO; |
1722 | import de.sub.goobi.config.ConfigMain; |
1723 | import de.sub.goobi.helper.Helper; |
1724 | import de.sub.goobi.helper.Page; |
1725 | |
1726 | === modified file 'src/de/sub/goobi/forms/ProzesskopieForm.java' |
1727 | --- src/de/sub/goobi/Forms/ProzesskopieForm.java 2011-12-01 12:44:42 +0000 |
1728 | +++ src/de/sub/goobi/forms/ProzesskopieForm.java 2011-12-14 09:20:02 +0000 |
1729 | @@ -1,4 +1,4 @@ |
1730 | -package de.sub.goobi.Forms; |
1731 | +package de.sub.goobi.forms; |
1732 | |
1733 | import java.io.File; |
1734 | import java.io.IOException; |
1735 | @@ -47,17 +47,17 @@ |
1736 | import ugh.exceptions.TypeNotAllowedForParentException; |
1737 | import ugh.exceptions.WriteException; |
1738 | import ugh.fileformats.mets.XStream; |
1739 | -import de.sub.goobi.Beans.Benutzer; |
1740 | -import de.sub.goobi.Beans.Projekt; |
1741 | -import de.sub.goobi.Beans.Prozess; |
1742 | -import de.sub.goobi.Beans.Schritt; |
1743 | -import de.sub.goobi.Beans.Vorlage; |
1744 | -import de.sub.goobi.Beans.Vorlageeigenschaft; |
1745 | -import de.sub.goobi.Beans.Werkstueck; |
1746 | -import de.sub.goobi.Beans.Werkstueckeigenschaft; |
1747 | +import de.sub.goobi.beans.Benutzer; |
1748 | +import de.sub.goobi.beans.Projekt; |
1749 | +import de.sub.goobi.beans.Prozess; |
1750 | +import de.sub.goobi.beans.Schritt; |
1751 | +import de.sub.goobi.beans.Vorlage; |
1752 | +import de.sub.goobi.beans.Vorlageeigenschaft; |
1753 | +import de.sub.goobi.beans.Werkstueck; |
1754 | +import de.sub.goobi.beans.Werkstueckeigenschaft; |
1755 | import de.sub.goobi.Import.ImportOpac; |
1756 | -import de.sub.goobi.Persistence.BenutzerDAO; |
1757 | -import de.sub.goobi.Persistence.ProzessDAO; |
1758 | +import de.sub.goobi.persistence.BenutzerDAO; |
1759 | +import de.sub.goobi.persistence.ProzessDAO; |
1760 | import de.sub.goobi.config.ConfigMain; |
1761 | import de.sub.goobi.config.ConfigOpac; |
1762 | import de.sub.goobi.config.ConfigOpacDoctype; |
1763 | |
1764 | === modified file 'src/de/sub/goobi/forms/ProzessverwaltungForm.java' |
1765 | --- src/de/sub/goobi/Forms/ProzessverwaltungForm.java 2011-12-01 12:44:42 +0000 |
1766 | +++ src/de/sub/goobi/forms/ProzessverwaltungForm.java 2011-12-14 09:20:02 +0000 |
1767 | @@ -1,4 +1,4 @@ |
1768 | -package de.sub.goobi.Forms; |
1769 | +package de.sub.goobi.forms; |
1770 | |
1771 | import java.io.File; |
1772 | import java.io.IOException; |
1773 | @@ -35,24 +35,24 @@ |
1774 | import org.jdom.transform.XSLTransformException; |
1775 | import org.jfree.chart.plot.PlotOrientation; |
1776 | |
1777 | -import de.sub.goobi.Beans.Benutzer; |
1778 | -import de.sub.goobi.Beans.Benutzergruppe; |
1779 | -import de.sub.goobi.Beans.Projekt; |
1780 | -import de.sub.goobi.Beans.Prozess; |
1781 | -import de.sub.goobi.Beans.Prozesseigenschaft; |
1782 | -import de.sub.goobi.Beans.Schritt; |
1783 | -import de.sub.goobi.Beans.Schritteigenschaft; |
1784 | -import de.sub.goobi.Beans.Vorlage; |
1785 | -import de.sub.goobi.Beans.Vorlageeigenschaft; |
1786 | -import de.sub.goobi.Beans.Werkstueck; |
1787 | -import de.sub.goobi.Beans.Werkstueckeigenschaft; |
1788 | -import de.sub.goobi.Export.dms.ExportDms; |
1789 | -import de.sub.goobi.Export.download.ExportMets; |
1790 | -import de.sub.goobi.Export.download.ExportPdf; |
1791 | -import de.sub.goobi.Export.download.Multipage; |
1792 | -import de.sub.goobi.Export.download.TiffHeader; |
1793 | -import de.sub.goobi.Persistence.ProjektDAO; |
1794 | -import de.sub.goobi.Persistence.ProzessDAO; |
1795 | +import de.sub.goobi.beans.Benutzer; |
1796 | +import de.sub.goobi.beans.Benutzergruppe; |
1797 | +import de.sub.goobi.beans.Projekt; |
1798 | +import de.sub.goobi.beans.Prozess; |
1799 | +import de.sub.goobi.beans.Prozesseigenschaft; |
1800 | +import de.sub.goobi.beans.Schritt; |
1801 | +import de.sub.goobi.beans.Schritteigenschaft; |
1802 | +import de.sub.goobi.beans.Vorlage; |
1803 | +import de.sub.goobi.beans.Vorlageeigenschaft; |
1804 | +import de.sub.goobi.beans.Werkstueck; |
1805 | +import de.sub.goobi.beans.Werkstueckeigenschaft; |
1806 | +import de.sub.goobi.export.dms.ExportDms; |
1807 | +import de.sub.goobi.export.download.ExportMets; |
1808 | +import de.sub.goobi.export.download.ExportPdf; |
1809 | +import de.sub.goobi.export.download.Multipage; |
1810 | +import de.sub.goobi.export.download.TiffHeader; |
1811 | +import de.sub.goobi.persistence.ProjektDAO; |
1812 | +import de.sub.goobi.persistence.ProzessDAO; |
1813 | import de.sub.goobi.config.ConfigMain; |
1814 | import de.sub.goobi.helper.FileUtils; |
1815 | import de.sub.goobi.helper.GoobiScript; |
1816 | @@ -655,7 +655,7 @@ |
1817 | Helper.setMeldung(null, "ExportFinished", ""); |
1818 | } |
1819 | |
1820 | - // TODO move messages into Messages |
1821 | + // TODO move messages into messages |
1822 | public String UploadFromHomeAlle() { |
1823 | WebDav myDav = new WebDav(); |
1824 | List<String> folder = myDav.UploadFromHomeAlle("fertig/"); |
1825 | @@ -664,7 +664,7 @@ |
1826 | return ""; |
1827 | } |
1828 | |
1829 | - // TODO move messages into Messages |
1830 | + // TODO move messages into messages |
1831 | public String UploadFromHome() { |
1832 | WebDav myDav = new WebDav(); |
1833 | myDav.UploadFromHome(myProzess); |
1834 | |
1835 | === modified file 'src/de/sub/goobi/forms/RegelsaetzeForm.java' |
1836 | --- src/de/sub/goobi/Forms/RegelsaetzeForm.java 2011-12-01 12:44:42 +0000 |
1837 | +++ src/de/sub/goobi/forms/RegelsaetzeForm.java 2011-12-14 09:20:02 +0000 |
1838 | @@ -1,4 +1,4 @@ |
1839 | -package de.sub.goobi.Forms; |
1840 | +package de.sub.goobi.forms; |
1841 | |
1842 | import org.apache.log4j.Logger; |
1843 | import org.hibernate.Criteria; |
1844 | @@ -6,8 +6,8 @@ |
1845 | import org.hibernate.Session; |
1846 | import org.hibernate.criterion.Order; |
1847 | |
1848 | -import de.sub.goobi.Beans.Regelsatz; |
1849 | -import de.sub.goobi.Persistence.RegelsatzDAO; |
1850 | +import de.sub.goobi.beans.Regelsatz; |
1851 | +import de.sub.goobi.persistence.RegelsatzDAO; |
1852 | import de.sub.goobi.helper.Helper; |
1853 | import de.sub.goobi.helper.Page; |
1854 | import de.sub.goobi.helper.exceptions.DAOException; |
1855 | |
1856 | === modified file 'src/de/sub/goobi/forms/SessionForm.java' |
1857 | --- src/de/sub/goobi/Forms/SessionForm.java 2011-12-01 12:44:42 +0000 |
1858 | +++ src/de/sub/goobi/forms/SessionForm.java 2011-12-14 09:20:02 +0000 |
1859 | @@ -1,4 +1,4 @@ |
1860 | -package de.sub.goobi.Forms; |
1861 | +package de.sub.goobi.forms; |
1862 | //TODO: Use generics |
1863 | import java.text.SimpleDateFormat; |
1864 | import java.util.ArrayList; |
1865 | @@ -11,7 +11,7 @@ |
1866 | import javax.servlet.http.HttpServletRequest; |
1867 | import javax.servlet.http.HttpSession; |
1868 | |
1869 | -import de.sub.goobi.Beans.Benutzer; |
1870 | +import de.sub.goobi.beans.Benutzer; |
1871 | |
1872 | /** |
1873 | * Die Klasse SessionForm für den überblick über die aktuell offenen Sessions |
1874 | |
1875 | === modified file 'src/de/sub/goobi/forms/SpracheForm.java' |
1876 | --- src/de/sub/goobi/Forms/SpracheForm.java 2011-12-01 12:44:42 +0000 |
1877 | +++ src/de/sub/goobi/forms/SpracheForm.java 2011-12-14 09:20:02 +0000 |
1878 | @@ -1,4 +1,4 @@ |
1879 | -package de.sub.goobi.Forms; |
1880 | +package de.sub.goobi.forms; |
1881 | |
1882 | import java.util.Locale; |
1883 | |
1884 | |
1885 | === modified file 'src/de/sub/goobi/forms/StatistikForm.java' |
1886 | --- src/de/sub/goobi/Forms/StatistikForm.java 2011-12-01 12:44:42 +0000 |
1887 | +++ src/de/sub/goobi/forms/StatistikForm.java 2011-12-14 09:20:02 +0000 |
1888 | @@ -1,4 +1,4 @@ |
1889 | -package de.sub.goobi.Forms; |
1890 | +package de.sub.goobi.forms; |
1891 | |
1892 | import java.util.ArrayList; |
1893 | import java.util.Calendar; |
1894 | @@ -13,10 +13,10 @@ |
1895 | import org.hibernate.Session; |
1896 | import org.hibernate.criterion.Restrictions; |
1897 | |
1898 | -import de.sub.goobi.Beans.Schritt; |
1899 | -import de.sub.goobi.Persistence.BenutzerDAO; |
1900 | -import de.sub.goobi.Persistence.ProzessDAO; |
1901 | -import de.sub.goobi.Persistence.SchrittDAO; |
1902 | +import de.sub.goobi.beans.Schritt; |
1903 | +import de.sub.goobi.persistence.BenutzerDAO; |
1904 | +import de.sub.goobi.persistence.ProzessDAO; |
1905 | +import de.sub.goobi.persistence.SchrittDAO; |
1906 | import de.sub.goobi.helper.Helper; |
1907 | import de.sub.goobi.helper.exceptions.DAOException; |
1908 | |
1909 | |
1910 | === modified file 'src/de/sub/goobi/helper/BeanHelper.java' |
1911 | --- src/de/sub/goobi/helper/BeanHelper.java 2011-12-01 12:44:42 +0000 |
1912 | +++ src/de/sub/goobi/helper/BeanHelper.java 2011-12-14 09:20:02 +0000 |
1913 | @@ -7,16 +7,16 @@ |
1914 | import java.util.List; |
1915 | import java.util.Set; |
1916 | |
1917 | -import de.sub.goobi.Beans.Benutzer; |
1918 | -import de.sub.goobi.Beans.Benutzergruppe; |
1919 | -import de.sub.goobi.Beans.Prozess; |
1920 | -import de.sub.goobi.Beans.Prozesseigenschaft; |
1921 | -import de.sub.goobi.Beans.Schritt; |
1922 | -import de.sub.goobi.Beans.Schritteigenschaft; |
1923 | -import de.sub.goobi.Beans.Vorlage; |
1924 | -import de.sub.goobi.Beans.Vorlageeigenschaft; |
1925 | -import de.sub.goobi.Beans.Werkstueck; |
1926 | -import de.sub.goobi.Beans.Werkstueckeigenschaft; |
1927 | +import de.sub.goobi.beans.Benutzer; |
1928 | +import de.sub.goobi.beans.Benutzergruppe; |
1929 | +import de.sub.goobi.beans.Prozess; |
1930 | +import de.sub.goobi.beans.Prozesseigenschaft; |
1931 | +import de.sub.goobi.beans.Schritt; |
1932 | +import de.sub.goobi.beans.Schritteigenschaft; |
1933 | +import de.sub.goobi.beans.Vorlage; |
1934 | +import de.sub.goobi.beans.Vorlageeigenschaft; |
1935 | +import de.sub.goobi.beans.Werkstueck; |
1936 | +import de.sub.goobi.beans.Werkstueckeigenschaft; |
1937 | |
1938 | //TODO: Document this |
1939 | public class BeanHelper { |
1940 | |
1941 | === modified file 'src/de/sub/goobi/helper/FileUtils.java' |
1942 | --- src/de/sub/goobi/helper/FileUtils.java 2011-07-19 17:06:09 +0000 |
1943 | +++ src/de/sub/goobi/helper/FileUtils.java 2011-12-14 09:20:02 +0000 |
1944 | @@ -3,7 +3,7 @@ |
1945 | import java.io.File; |
1946 | import java.io.FilenameFilter; |
1947 | |
1948 | -import de.sub.goobi.Metadaten.MetadatenImagesHelper; |
1949 | +import de.sub.goobi.metadaten.MetadatenImagesHelper; |
1950 | |
1951 | /** |
1952 | * File Utils collection |
1953 | |
1954 | === modified file 'src/de/sub/goobi/helper/GoobiScript.java' |
1955 | --- src/de/sub/goobi/helper/GoobiScript.java 2011-12-01 12:44:42 +0000 |
1956 | +++ src/de/sub/goobi/helper/GoobiScript.java 2011-12-14 09:20:02 +0000 |
1957 | @@ -22,17 +22,17 @@ |
1958 | import ugh.exceptions.ReadException; |
1959 | import ugh.exceptions.TypeNotAllowedForParentException; |
1960 | import ugh.exceptions.WriteException; |
1961 | -import de.sub.goobi.Beans.Benutzer; |
1962 | -import de.sub.goobi.Beans.Benutzergruppe; |
1963 | -import de.sub.goobi.Beans.Prozess; |
1964 | -import de.sub.goobi.Beans.Regelsatz; |
1965 | -import de.sub.goobi.Beans.Schritt; |
1966 | -import de.sub.goobi.Export.dms.ExportDms; |
1967 | -import de.sub.goobi.Persistence.BenutzerDAO; |
1968 | -import de.sub.goobi.Persistence.BenutzergruppenDAO; |
1969 | -import de.sub.goobi.Persistence.ProzessDAO; |
1970 | -import de.sub.goobi.Persistence.RegelsatzDAO; |
1971 | -import de.sub.goobi.Persistence.SchrittDAO; |
1972 | +import de.sub.goobi.beans.Benutzer; |
1973 | +import de.sub.goobi.beans.Benutzergruppe; |
1974 | +import de.sub.goobi.beans.Prozess; |
1975 | +import de.sub.goobi.beans.Regelsatz; |
1976 | +import de.sub.goobi.beans.Schritt; |
1977 | +import de.sub.goobi.export.dms.ExportDms; |
1978 | +import de.sub.goobi.persistence.BenutzerDAO; |
1979 | +import de.sub.goobi.persistence.BenutzergruppenDAO; |
1980 | +import de.sub.goobi.persistence.ProzessDAO; |
1981 | +import de.sub.goobi.persistence.RegelsatzDAO; |
1982 | +import de.sub.goobi.persistence.SchrittDAO; |
1983 | import de.sub.goobi.helper.enums.StepStatus; |
1984 | import de.sub.goobi.helper.exceptions.DAOException; |
1985 | import de.sub.goobi.helper.exceptions.ExportFileException; |
1986 | |
1987 | === modified file 'src/de/sub/goobi/helper/Helper.java' |
1988 | --- src/de/sub/goobi/helper/Helper.java 2011-12-01 12:44:42 +0000 |
1989 | +++ src/de/sub/goobi/helper/Helper.java 2011-12-14 09:20:02 +0000 |
1990 | @@ -28,9 +28,9 @@ |
1991 | import org.hibernate.Session; |
1992 | import org.jdom.Element; |
1993 | |
1994 | -import de.sub.goobi.Beans.Benutzer; |
1995 | -import de.sub.goobi.Forms.LoginForm; |
1996 | -import de.sub.goobi.Persistence.HibernateUtilOld; |
1997 | +import de.sub.goobi.beans.Benutzer; |
1998 | +import de.sub.goobi.forms.LoginForm; |
1999 | +import de.sub.goobi.persistence.HibernateUtilOld; |
2000 | import de.sub.goobi.config.ConfigMain; |
2001 | |
2002 | //TODO: Check if more method can be made static |
2003 | @@ -161,7 +161,7 @@ |
2004 | } |
2005 | return; |
2006 | } |
2007 | -// ResourceBundle bundle = ResourceBundle.getBundle("Messages.messages", context.getViewRoot().getLocale()); |
2008 | +// ResourceBundle bundle = ResourceBundle.getBundle("messages.messages", context.getViewRoot().getLocale()); |
2009 | String msg = ""; |
2010 | String beschr = ""; |
2011 | try { |
2012 | @@ -318,7 +318,7 @@ |
2013 | } |
2014 | |
2015 | public static void loadLanguageBundle() { |
2016 | - bundle = ResourceBundle.getBundle("Messages.messages", FacesContext.getCurrentInstance().getViewRoot().getLocale()); |
2017 | + bundle = ResourceBundle.getBundle("messages.messages", FacesContext.getCurrentInstance().getViewRoot().getLocale()); |
2018 | File file = new File(ConfigMain.getParameter("localMessages")); |
2019 | if (file.exists()) { |
2020 | // Load local message bundle from file system only if file exists; if value not exists in bundle, use default bundle from classpath |
2021 | |
2022 | === modified file 'src/de/sub/goobi/helper/HelperSchritte.java' |
2023 | --- src/de/sub/goobi/helper/HelperSchritte.java 2011-12-01 12:44:42 +0000 |
2024 | +++ src/de/sub/goobi/helper/HelperSchritte.java 2011-12-14 09:20:02 +0000 |
2025 | @@ -16,11 +16,11 @@ |
2026 | import ugh.exceptions.PreferencesException; |
2027 | import ugh.exceptions.ReadException; |
2028 | import ugh.exceptions.WriteException; |
2029 | -import de.sub.goobi.Beans.Benutzer; |
2030 | -import de.sub.goobi.Beans.HistoryEvent; |
2031 | -import de.sub.goobi.Beans.Schritt; |
2032 | -import de.sub.goobi.Persistence.ProzessDAO; |
2033 | -import de.sub.goobi.Persistence.SchrittDAO; |
2034 | +import de.sub.goobi.beans.Benutzer; |
2035 | +import de.sub.goobi.beans.HistoryEvent; |
2036 | +import de.sub.goobi.beans.Schritt; |
2037 | +import de.sub.goobi.persistence.ProzessDAO; |
2038 | +import de.sub.goobi.persistence.SchrittDAO; |
2039 | import de.sub.goobi.helper.enums.HistoryEventType; |
2040 | import de.sub.goobi.helper.enums.StepEditType; |
2041 | import de.sub.goobi.helper.enums.StepStatus; |
2042 | |
2043 | === modified file 'src/de/sub/goobi/helper/Page.java' |
2044 | --- src/de/sub/goobi/helper/Page.java 2011-12-01 12:44:42 +0000 |
2045 | +++ src/de/sub/goobi/helper/Page.java 2011-12-14 09:20:02 +0000 |
2046 | @@ -11,7 +11,7 @@ |
2047 | import org.hibernate.Criteria; |
2048 | import org.hibernate.HibernateException; |
2049 | |
2050 | -import de.sub.goobi.Forms.LoginForm; |
2051 | +import de.sub.goobi.forms.LoginForm; |
2052 | |
2053 | /** |
2054 | * This class provides pagination for displaying results from a large result set |
2055 | |
2056 | === modified file 'src/de/sub/goobi/helper/ProjectHelper.java' |
2057 | --- src/de/sub/goobi/helper/ProjectHelper.java 2011-12-01 12:44:42 +0000 |
2058 | +++ src/de/sub/goobi/helper/ProjectHelper.java 2011-12-14 09:20:02 +0000 |
2059 | @@ -39,9 +39,9 @@ |
2060 | import org.hibernate.criterion.Projections; |
2061 | import org.hibernate.criterion.Restrictions; |
2062 | |
2063 | -import de.sub.goobi.Beans.Projekt; |
2064 | -import de.sub.goobi.Beans.Prozess; |
2065 | -import de.sub.goobi.Beans.Schritt; |
2066 | +import de.sub.goobi.beans.Projekt; |
2067 | +import de.sub.goobi.beans.Prozess; |
2068 | +import de.sub.goobi.beans.Schritt; |
2069 | import de.sub.goobi.helper.enums.StepStatus; |
2070 | |
2071 | public class ProjectHelper { |
2072 | |
2073 | === modified file 'src/de/sub/goobi/helper/ScriptThread.java' |
2074 | --- src/de/sub/goobi/helper/ScriptThread.java 2011-12-01 12:44:42 +0000 |
2075 | +++ src/de/sub/goobi/helper/ScriptThread.java 2011-12-14 09:20:02 +0000 |
2076 | @@ -2,7 +2,7 @@ |
2077 | |
2078 | import org.apache.log4j.Logger; |
2079 | |
2080 | -import de.sub.goobi.Beans.Schritt; |
2081 | +import de.sub.goobi.beans.Schritt; |
2082 | import de.sub.goobi.helper.exceptions.DAOException; |
2083 | import de.sub.goobi.helper.exceptions.SwapException; |
2084 | |
2085 | |
2086 | === modified file 'src/de/sub/goobi/helper/UghHelper.java' |
2087 | --- src/de/sub/goobi/helper/UghHelper.java 2011-12-01 12:44:42 +0000 |
2088 | +++ src/de/sub/goobi/helper/UghHelper.java 2011-12-14 09:20:02 +0000 |
2089 | @@ -19,7 +19,7 @@ |
2090 | import ugh.dl.Prefs; |
2091 | import ugh.exceptions.DocStructHasNoTypeException; |
2092 | import ugh.exceptions.MetadataTypeNotAllowedException; |
2093 | -import de.sub.goobi.Beans.Prozess; |
2094 | +import de.sub.goobi.beans.Prozess; |
2095 | import de.sub.goobi.helper.exceptions.UghHelperException; |
2096 | |
2097 | //TODO: Try to move this methods to UGH (ugh.util.UGHUtils would be a better place) |
2098 | |
2099 | === modified file 'src/de/sub/goobi/helper/VariableReplacer.java' |
2100 | --- src/de/sub/goobi/helper/VariableReplacer.java 2011-12-01 12:44:42 +0000 |
2101 | +++ src/de/sub/goobi/helper/VariableReplacer.java 2011-12-14 09:20:02 +0000 |
2102 | @@ -16,13 +16,13 @@ |
2103 | import ugh.dl.Metadata; |
2104 | import ugh.dl.MetadataType; |
2105 | import ugh.dl.Prefs; |
2106 | -import de.sub.goobi.Beans.Prozess; |
2107 | -import de.sub.goobi.Beans.Prozesseigenschaft; |
2108 | -import de.sub.goobi.Beans.Schritt; |
2109 | -import de.sub.goobi.Beans.Vorlage; |
2110 | -import de.sub.goobi.Beans.Vorlageeigenschaft; |
2111 | -import de.sub.goobi.Beans.Werkstueck; |
2112 | -import de.sub.goobi.Beans.Werkstueckeigenschaft; |
2113 | +import de.sub.goobi.beans.Prozess; |
2114 | +import de.sub.goobi.beans.Prozesseigenschaft; |
2115 | +import de.sub.goobi.beans.Schritt; |
2116 | +import de.sub.goobi.beans.Vorlage; |
2117 | +import de.sub.goobi.beans.Vorlageeigenschaft; |
2118 | +import de.sub.goobi.beans.Werkstueck; |
2119 | +import de.sub.goobi.beans.Werkstueckeigenschaft; |
2120 | import de.sub.goobi.config.ConfigMain; |
2121 | import de.sub.goobi.helper.exceptions.DAOException; |
2122 | import de.sub.goobi.helper.exceptions.SwapException; |
2123 | |
2124 | === modified file 'src/de/sub/goobi/helper/WebDav.java' |
2125 | --- src/de/sub/goobi/helper/WebDav.java 2011-12-01 12:44:42 +0000 |
2126 | +++ src/de/sub/goobi/helper/WebDav.java 2011-12-14 09:20:02 +0000 |
2127 | @@ -13,9 +13,9 @@ |
2128 | |
2129 | import org.apache.log4j.Logger; |
2130 | |
2131 | -import de.sub.goobi.Beans.Benutzer; |
2132 | -import de.sub.goobi.Beans.Prozess; |
2133 | -import de.sub.goobi.Export.download.TiffHeader; |
2134 | +import de.sub.goobi.beans.Benutzer; |
2135 | +import de.sub.goobi.beans.Prozess; |
2136 | +import de.sub.goobi.export.download.TiffHeader; |
2137 | import de.sub.goobi.config.ConfigMain; |
2138 | |
2139 | public class WebDav { |
2140 | |
2141 | === modified file 'src/de/sub/goobi/helper/XmlArtikelZaehlen.java' |
2142 | --- src/de/sub/goobi/helper/XmlArtikelZaehlen.java 2011-12-01 12:44:42 +0000 |
2143 | +++ src/de/sub/goobi/helper/XmlArtikelZaehlen.java 2011-12-14 09:20:02 +0000 |
2144 | @@ -8,8 +8,8 @@ |
2145 | import ugh.dl.Metadata; |
2146 | import ugh.dl.Person; |
2147 | import ugh.exceptions.PreferencesException; |
2148 | -import de.sub.goobi.Beans.Prozess; |
2149 | -import de.sub.goobi.Persistence.ProzessDAO; |
2150 | +import de.sub.goobi.beans.Prozess; |
2151 | +import de.sub.goobi.persistence.ProzessDAO; |
2152 | import de.sub.goobi.helper.exceptions.DAOException; |
2153 | |
2154 | public class XmlArtikelZaehlen { |
2155 | |
2156 | === modified file 'src/de/sub/goobi/helper/exceptions/GUIExceptionWrapper.java' |
2157 | --- src/de/sub/goobi/helper/exceptions/GUIExceptionWrapper.java 2011-07-19 17:06:09 +0000 |
2158 | +++ src/de/sub/goobi/helper/exceptions/GUIExceptionWrapper.java 2011-12-14 09:20:02 +0000 |
2159 | @@ -18,7 +18,7 @@ |
2160 | * @author Wulf |
2161 | * @version 12/10/2009 |
2162 | * |
2163 | - * Variables in Messages Bundle: |
2164 | + * Variables in messages Bundle: |
2165 | * err_emailBody -> message in the email before the stack trace |
2166 | * err_emailMessage -> message displayed if email is enabled in GoobiConfig: err_userHandling=true |
2167 | * err_fallBackMessage -> messgae displayed if feature is turned off in GoobiConfig |
2168 | @@ -52,7 +52,7 @@ |
2169 | * |
2170 | * ###################### |
2171 | * |
2172 | - * the displayed messages are taken from the Messages Package |
2173 | + * the displayed messages are taken from the messages Package |
2174 | * |
2175 | * Here the current example for messgaes_en.properties |
2176 | * |
2177 | |
2178 | === modified file 'src/de/sub/goobi/helper/ldap/Ldap.java' |
2179 | --- src/de/sub/goobi/helper/ldap/Ldap.java 2011-12-01 12:44:42 +0000 |
2180 | +++ src/de/sub/goobi/helper/ldap/Ldap.java 2011-12-14 09:20:02 +0000 |
2181 | @@ -27,7 +27,7 @@ |
2182 | import org.apache.commons.codec.binary.Base64; |
2183 | import org.apache.log4j.Logger; |
2184 | |
2185 | -import de.sub.goobi.Beans.Benutzer; |
2186 | +import de.sub.goobi.beans.Benutzer; |
2187 | import de.sub.goobi.config.ConfigMain; |
2188 | import de.sub.goobi.helper.Helper; |
2189 | import de.sub.goobi.helper.encryption.MD4; |
2190 | |
2191 | === modified file 'src/de/sub/goobi/helper/ldap/LdapUser.java' |
2192 | --- src/de/sub/goobi/helper/ldap/LdapUser.java 2011-12-01 12:44:42 +0000 |
2193 | +++ src/de/sub/goobi/helper/ldap/LdapUser.java 2011-12-14 09:20:02 +0000 |
2194 | @@ -31,8 +31,8 @@ |
2195 | import org.apache.commons.codec.binary.Base64; |
2196 | import org.apache.log4j.Logger; |
2197 | |
2198 | -import de.sub.goobi.Beans.Benutzer; |
2199 | -import de.sub.goobi.Beans.LdapGruppe; |
2200 | +import de.sub.goobi.beans.Benutzer; |
2201 | +import de.sub.goobi.beans.LdapGruppe; |
2202 | import de.sub.goobi.config.ConfigMain; |
2203 | import de.sub.goobi.helper.encryption.MD4; |
2204 | |
2205 | |
2206 | === modified file 'src/de/sub/goobi/helper/servletfilter/HibernateSessionFilter2.java' |
2207 | --- src/de/sub/goobi/helper/servletfilter/HibernateSessionFilter2.java 2011-12-01 12:44:42 +0000 |
2208 | +++ src/de/sub/goobi/helper/servletfilter/HibernateSessionFilter2.java 2011-12-14 09:20:02 +0000 |
2209 | @@ -12,11 +12,11 @@ |
2210 | |
2211 | import org.hibernate.Session; |
2212 | |
2213 | -import de.sub.goobi.Persistence.HibernateSessionLong; |
2214 | +import de.sub.goobi.persistence.HibernateSessionLong; |
2215 | import de.sub.goobi.helper.exceptions.GUIExceptionWrapper; |
2216 | |
2217 | // TODO: Previous Hibernate-Filter for old manual Hibernate-Session-Management, old version, reactivated, because |
2218 | -// de.sub.goobi.Persistence.HibernateSessionConversationFilter does not work like it should |
2219 | +// de.sub.goobi.persistence.HibernateSessionConversationFilter does not work like it should |
2220 | public class HibernateSessionFilter2 implements Filter { |
2221 | // private static final Logger mylogger = Logger.getLogger(HibernateSessionFilter2.class); |
2222 | |
2223 | |
2224 | === modified file 'src/de/sub/goobi/helper/servletfilter/SessionCounterFilter.java' |
2225 | --- src/de/sub/goobi/helper/servletfilter/SessionCounterFilter.java 2011-07-19 17:06:09 +0000 |
2226 | +++ src/de/sub/goobi/helper/servletfilter/SessionCounterFilter.java 2011-12-14 09:20:02 +0000 |
2227 | @@ -19,7 +19,7 @@ |
2228 | import javax.servlet.ServletResponse; |
2229 | import javax.servlet.http.HttpServletRequest; |
2230 | |
2231 | -import de.sub.goobi.Forms.SessionForm; |
2232 | +import de.sub.goobi.forms.SessionForm; |
2233 | |
2234 | |
2235 | public class SessionCounterFilter implements Filter { |
2236 | |
2237 | === modified file 'src/de/sub/goobi/helper/tasks/CreatePdfFromServletThread.java' |
2238 | --- src/de/sub/goobi/helper/tasks/CreatePdfFromServletThread.java 2011-07-19 17:06:09 +0000 |
2239 | +++ src/de/sub/goobi/helper/tasks/CreatePdfFromServletThread.java 2011-12-14 09:20:02 +0000 |
2240 | @@ -19,10 +19,10 @@ |
2241 | |
2242 | import org.apache.log4j.Logger; |
2243 | |
2244 | -import de.sub.goobi.Beans.Prozess; |
2245 | -import de.sub.goobi.Metadaten.MetadatenHelper; |
2246 | -import de.sub.goobi.Metadaten.MetadatenImagesHelper; |
2247 | -import de.sub.goobi.Metadaten.MetadatenVerifizierung; |
2248 | +import de.sub.goobi.beans.Prozess; |
2249 | +import de.sub.goobi.metadaten.MetadatenHelper; |
2250 | +import de.sub.goobi.metadaten.MetadatenImagesHelper; |
2251 | +import de.sub.goobi.metadaten.MetadatenVerifizierung; |
2252 | import de.sub.goobi.config.ConfigMain; |
2253 | import de.sub.goobi.helper.Helper; |
2254 | |
2255 | |
2256 | === modified file 'src/de/sub/goobi/helper/tasks/LongRunningTask.java' |
2257 | --- src/de/sub/goobi/helper/tasks/LongRunningTask.java 2011-12-01 12:44:42 +0000 |
2258 | +++ src/de/sub/goobi/helper/tasks/LongRunningTask.java 2011-12-14 09:20:02 +0000 |
2259 | @@ -2,7 +2,7 @@ |
2260 | |
2261 | import org.apache.log4j.Logger; |
2262 | |
2263 | -import de.sub.goobi.Beans.Prozess; |
2264 | +import de.sub.goobi.beans.Prozess; |
2265 | import de.sub.goobi.helper.Helper; |
2266 | |
2267 | public class LongRunningTask extends Thread { |
2268 | |
2269 | === modified file 'src/de/sub/goobi/helper/tasks/ProcessSwapInTask.java' |
2270 | --- src/de/sub/goobi/helper/tasks/ProcessSwapInTask.java 2011-12-01 12:44:42 +0000 |
2271 | +++ src/de/sub/goobi/helper/tasks/ProcessSwapInTask.java 2011-12-14 09:20:02 +0000 |
2272 | @@ -9,8 +9,8 @@ |
2273 | import org.jdom.Element; |
2274 | import org.jdom.input.SAXBuilder; |
2275 | |
2276 | -import de.sub.goobi.Beans.Prozess; |
2277 | -import de.sub.goobi.Persistence.ProzessDAO; |
2278 | +import de.sub.goobi.beans.Prozess; |
2279 | +import de.sub.goobi.persistence.ProzessDAO; |
2280 | import de.sub.goobi.config.ConfigMain; |
2281 | import de.sub.goobi.helper.Helper; |
2282 | import de.sub.goobi.helper.exceptions.DAOException; |
2283 | |
2284 | === modified file 'src/de/sub/goobi/helper/tasks/ProcessSwapOutTask.java' |
2285 | --- src/de/sub/goobi/helper/tasks/ProcessSwapOutTask.java 2011-12-01 12:44:42 +0000 |
2286 | +++ src/de/sub/goobi/helper/tasks/ProcessSwapOutTask.java 2011-12-14 09:20:02 +0000 |
2287 | @@ -10,8 +10,8 @@ |
2288 | import org.jdom.output.Format; |
2289 | import org.jdom.output.XMLOutputter; |
2290 | |
2291 | -import de.sub.goobi.Beans.Prozess; |
2292 | -import de.sub.goobi.Persistence.ProzessDAO; |
2293 | +import de.sub.goobi.beans.Prozess; |
2294 | +import de.sub.goobi.persistence.ProzessDAO; |
2295 | import de.sub.goobi.config.ConfigMain; |
2296 | import de.sub.goobi.helper.Helper; |
2297 | import de.sub.goobi.helper.exceptions.DAOException; |
2298 | |
2299 | === modified file 'src/de/sub/goobi/helper/tasks/TiffWriterTask.java' |
2300 | --- src/de/sub/goobi/helper/tasks/TiffWriterTask.java 2011-12-01 12:44:42 +0000 |
2301 | +++ src/de/sub/goobi/helper/tasks/TiffWriterTask.java 2011-12-14 09:20:02 +0000 |
2302 | @@ -7,7 +7,7 @@ |
2303 | import java.util.Arrays; |
2304 | import java.util.List; |
2305 | |
2306 | -import de.sub.goobi.Beans.Prozess; |
2307 | +import de.sub.goobi.beans.Prozess; |
2308 | |
2309 | public class TiffWriterTask extends LongRunningTask { |
2310 | |
2311 | |
2312 | === renamed directory 'src/de/sub/goobi/Metadaten' => 'src/de/sub/goobi/metadaten' |
2313 | === modified file 'src/de/sub/goobi/metadaten/MetaPerson.java' |
2314 | --- src/de/sub/goobi/Metadaten/MetaPerson.java 2011-12-01 12:44:42 +0000 |
2315 | +++ src/de/sub/goobi/metadaten/MetaPerson.java 2011-12-14 09:20:02 +0000 |
2316 | @@ -1,4 +1,4 @@ |
2317 | -package de.sub.goobi.Metadaten; |
2318 | +package de.sub.goobi.metadaten; |
2319 | |
2320 | import java.util.ArrayList; |
2321 | |
2322 | |
2323 | === modified file 'src/de/sub/goobi/metadaten/Metadaten.java' |
2324 | --- src/de/sub/goobi/Metadaten/Metadaten.java 2011-12-01 12:44:42 +0000 |
2325 | +++ src/de/sub/goobi/metadaten/Metadaten.java 2011-12-14 09:20:02 +0000 |
2326 | @@ -1,4 +1,4 @@ |
2327 | -package de.sub.goobi.Metadaten; |
2328 | +package de.sub.goobi.metadaten; |
2329 | |
2330 | //TODO: Use generics |
2331 | //TODO: Don't use Iterators |
2332 | @@ -44,9 +44,9 @@ |
2333 | import ugh.exceptions.TypeNotAllowedAsChildException; |
2334 | import ugh.exceptions.TypeNotAllowedForParentException; |
2335 | import ugh.exceptions.WriteException; |
2336 | -import de.sub.goobi.Beans.Prozess; |
2337 | +import de.sub.goobi.beans.Prozess; |
2338 | import de.sub.goobi.Import.ImportOpac; |
2339 | -import de.sub.goobi.Persistence.ProzessDAO; |
2340 | +import de.sub.goobi.persistence.ProzessDAO; |
2341 | import de.sub.goobi.config.ConfigMain; |
2342 | import de.sub.goobi.helper.FileUtils; |
2343 | import de.sub.goobi.helper.Helper; |
2344 | |
2345 | === modified file 'src/de/sub/goobi/metadaten/MetadatenHelper.java' |
2346 | --- src/de/sub/goobi/Metadaten/MetadatenHelper.java 2011-12-01 12:44:42 +0000 |
2347 | +++ src/de/sub/goobi/metadaten/MetadatenHelper.java 2011-12-14 09:20:02 +0000 |
2348 | @@ -1,4 +1,4 @@ |
2349 | -package de.sub.goobi.Metadaten; |
2350 | +package de.sub.goobi.metadaten; |
2351 | |
2352 | //TODO: Look if this can be merged into UGH |
2353 | //TODO: Don't use arrays |
2354 | @@ -35,7 +35,7 @@ |
2355 | import ugh.exceptions.MetadataTypeNotAllowedException; |
2356 | import ugh.exceptions.TypeNotAllowedAsChildException; |
2357 | import ugh.exceptions.TypeNotAllowedForParentException; |
2358 | -import de.sub.goobi.Beans.Prozess; |
2359 | +import de.sub.goobi.beans.Prozess; |
2360 | import de.sub.goobi.config.ConfigMain; |
2361 | import de.sub.goobi.helper.Helper; |
2362 | import de.sub.goobi.helper.HelperComparator; |
2363 | |
2364 | === modified file 'src/de/sub/goobi/metadaten/MetadatenImagesHelper.java' |
2365 | --- src/de/sub/goobi/Metadaten/MetadatenImagesHelper.java 2011-12-01 12:44:42 +0000 |
2366 | +++ src/de/sub/goobi/metadaten/MetadatenImagesHelper.java 2011-12-14 09:20:02 +0000 |
2367 | @@ -1,4 +1,4 @@ |
2368 | -package de.sub.goobi.Metadaten; |
2369 | +package de.sub.goobi.metadaten; |
2370 | |
2371 | import java.awt.image.RenderedImage; |
2372 | import java.io.BufferedInputStream; |
2373 | @@ -32,7 +32,7 @@ |
2374 | import ugh.exceptions.MetadataTypeNotAllowedException; |
2375 | import ugh.exceptions.TypeNotAllowedAsChildException; |
2376 | import ugh.exceptions.TypeNotAllowedForParentException; |
2377 | -import de.sub.goobi.Beans.Prozess; |
2378 | +import de.sub.goobi.beans.Prozess; |
2379 | import de.sub.goobi.config.ConfigMain; |
2380 | import de.sub.goobi.helper.Helper; |
2381 | import de.sub.goobi.helper.exceptions.DAOException; |
2382 | |
2383 | === modified file 'src/de/sub/goobi/metadaten/MetadatenSperrung.java' |
2384 | --- src/de/sub/goobi/Metadaten/MetadatenSperrung.java 2011-12-01 12:44:42 +0000 |
2385 | +++ src/de/sub/goobi/metadaten/MetadatenSperrung.java 2011-12-14 09:20:02 +0000 |
2386 | @@ -1,4 +1,4 @@ |
2387 | -package de.sub.goobi.Metadaten; |
2388 | +package de.sub.goobi.metadaten; |
2389 | |
2390 | import java.io.Serializable; |
2391 | import java.util.HashMap; |
2392 | |
2393 | === modified file 'src/de/sub/goobi/metadaten/MetadatenVerifizierung.java' |
2394 | --- src/de/sub/goobi/Metadaten/MetadatenVerifizierung.java 2011-12-01 12:44:42 +0000 |
2395 | +++ src/de/sub/goobi/metadaten/MetadatenVerifizierung.java 2011-12-14 09:20:02 +0000 |
2396 | @@ -1,4 +1,4 @@ |
2397 | -package de.sub.goobi.Metadaten; |
2398 | +package de.sub.goobi.metadaten; |
2399 | |
2400 | import java.io.IOException; |
2401 | import java.util.ArrayList; |
2402 | @@ -18,7 +18,7 @@ |
2403 | import ugh.exceptions.DocStructHasNoTypeException; |
2404 | import ugh.exceptions.MetadataTypeNotAllowedException; |
2405 | import ugh.exceptions.PreferencesException; |
2406 | -import de.sub.goobi.Beans.Prozess; |
2407 | +import de.sub.goobi.beans.Prozess; |
2408 | import de.sub.goobi.config.ConfigProjects; |
2409 | import de.sub.goobi.helper.Helper; |
2410 | import de.sub.goobi.helper.UghHelper; |
2411 | |
2412 | === modified file 'src/de/sub/goobi/metadaten/Metadatum.java' |
2413 | --- src/de/sub/goobi/Metadaten/Metadatum.java 2011-12-01 12:44:42 +0000 |
2414 | +++ src/de/sub/goobi/metadaten/Metadatum.java 2011-12-14 09:20:02 +0000 |
2415 | @@ -1,4 +1,4 @@ |
2416 | -package de.sub.goobi.Metadaten; |
2417 | +package de.sub.goobi.metadaten; |
2418 | |
2419 | import java.util.ArrayList; |
2420 | import java.util.HashMap; |
2421 | @@ -14,7 +14,7 @@ |
2422 | import ugh.dl.Metadata; |
2423 | import ugh.dl.MetadataType; |
2424 | import ugh.dl.Prefs; |
2425 | -import de.sub.goobi.Beans.Prozess; |
2426 | +import de.sub.goobi.beans.Prozess; |
2427 | import de.sub.goobi.helper.Helper; |
2428 | |
2429 | //TODO: Use a correct comment here |
2430 | |
2431 | === modified file 'src/de/sub/goobi/metadaten/Pagination.java' |
2432 | --- src/de/sub/goobi/Metadaten/Pagination.java 2011-12-01 12:44:42 +0000 |
2433 | +++ src/de/sub/goobi/metadaten/Pagination.java 2011-12-14 09:20:02 +0000 |
2434 | @@ -1,4 +1,4 @@ |
2435 | -package de.sub.goobi.Metadaten; |
2436 | +package de.sub.goobi.metadaten; |
2437 | |
2438 | /** |
2439 | * This file is part of the Goobi Application - a Workflow tool for the support of mass digitization. |
2440 | |
2441 | === modified file 'src/de/sub/goobi/metadaten/TreeNodeStruct3.java' |
2442 | --- src/de/sub/goobi/Metadaten/TreeNodeStruct3.java 2011-12-01 12:44:42 +0000 |
2443 | +++ src/de/sub/goobi/metadaten/TreeNodeStruct3.java 2011-12-14 09:20:02 +0000 |
2444 | @@ -1,4 +1,4 @@ |
2445 | -package de.sub.goobi.Metadaten; |
2446 | +package de.sub.goobi.metadaten; |
2447 | |
2448 | import java.util.ArrayList; |
2449 | |
2450 | |
2451 | === renamed directory 'src/de/sub/goobi/Modul' => 'src/de/sub/goobi/modul' |
2452 | === modified file 'src/de/sub/goobi/modul/ExtendedDataImpl.java' |
2453 | --- src/de/sub/goobi/Modul/ExtendedDataImpl.java 2011-12-01 12:44:42 +0000 |
2454 | +++ src/de/sub/goobi/modul/ExtendedDataImpl.java 2011-12-14 09:20:02 +0000 |
2455 | @@ -1,4 +1,4 @@ |
2456 | -package de.sub.goobi.Modul; |
2457 | +package de.sub.goobi.modul; |
2458 | |
2459 | import java.util.ArrayList; |
2460 | import java.util.HashMap; |
2461 | @@ -6,14 +6,14 @@ |
2462 | import java.util.Iterator; |
2463 | import java.util.List; |
2464 | |
2465 | -import de.sub.goobi.Beans.Prozess; |
2466 | -import de.sub.goobi.Beans.Prozesseigenschaft; |
2467 | -import de.sub.goobi.Beans.Vorlage; |
2468 | -import de.sub.goobi.Beans.Vorlageeigenschaft; |
2469 | -import de.sub.goobi.Beans.Werkstueck; |
2470 | -import de.sub.goobi.Beans.Werkstueckeigenschaft; |
2471 | -import de.sub.goobi.Forms.ModuleServerForm; |
2472 | -import de.sub.goobi.Persistence.ProzessDAO; |
2473 | +import de.sub.goobi.beans.Prozess; |
2474 | +import de.sub.goobi.beans.Prozesseigenschaft; |
2475 | +import de.sub.goobi.beans.Vorlage; |
2476 | +import de.sub.goobi.beans.Vorlageeigenschaft; |
2477 | +import de.sub.goobi.beans.Werkstueck; |
2478 | +import de.sub.goobi.beans.Werkstueckeigenschaft; |
2479 | +import de.sub.goobi.forms.ModuleServerForm; |
2480 | +import de.sub.goobi.persistence.ProzessDAO; |
2481 | import de.sub.goobi.helper.BeanHelper; |
2482 | import de.sub.goobi.helper.Helper; |
2483 | import de.sub.goobi.helper.exceptions.DAOException; |
2484 | |
2485 | === modified file 'src/de/sub/goobi/modul/ExtendedProzessImpl.java' |
2486 | --- src/de/sub/goobi/Modul/ExtendedProzessImpl.java 2011-12-01 12:44:42 +0000 |
2487 | +++ src/de/sub/goobi/modul/ExtendedProzessImpl.java 2011-12-14 09:20:02 +0000 |
2488 | @@ -1,10 +1,10 @@ |
2489 | -package de.sub.goobi.Modul; |
2490 | +package de.sub.goobi.modul; |
2491 | |
2492 | import java.io.IOException; |
2493 | import java.util.HashMap; |
2494 | |
2495 | -import de.sub.goobi.Beans.Prozess; |
2496 | -import de.sub.goobi.Forms.ModuleServerForm; |
2497 | +import de.sub.goobi.beans.Prozess; |
2498 | +import de.sub.goobi.forms.ModuleServerForm; |
2499 | import de.sub.goobi.config.ConfigMain; |
2500 | import de.sub.goobi.helper.Helper; |
2501 | import de.sub.goobi.helper.exceptions.DAOException; |
2502 | |
2503 | === modified file 'src/de/sub/goobi/modul/ModulListener.java' |
2504 | --- src/de/sub/goobi/Modul/ModulListener.java 2011-07-19 17:06:09 +0000 |
2505 | +++ src/de/sub/goobi/modul/ModulListener.java 2011-12-14 09:20:02 +0000 |
2506 | @@ -1,11 +1,11 @@ |
2507 | -package de.sub.goobi.Modul; |
2508 | +package de.sub.goobi.modul; |
2509 | |
2510 | import javax.servlet.ServletContextEvent; |
2511 | import javax.servlet.ServletContextListener; |
2512 | |
2513 | import org.apache.log4j.Logger; |
2514 | |
2515 | -import de.sub.goobi.Forms.ModuleServerForm; |
2516 | +import de.sub.goobi.forms.ModuleServerForm; |
2517 | |
2518 | public class ModulListener implements ServletContextListener { |
2519 | private static final Logger myLogger = Logger.getLogger(ModulListener.class); |
2520 | |
2521 | === renamed directory 'src/de/sub/goobi/Persistence' => 'src/de/sub/goobi/persistence' |
2522 | === modified file 'src/de/sub/goobi/persistence/BaseDAO.java' |
2523 | --- src/de/sub/goobi/Persistence/BaseDAO.java 2011-07-19 17:06:09 +0000 |
2524 | +++ src/de/sub/goobi/persistence/BaseDAO.java 2011-12-14 09:20:02 +0000 |
2525 | @@ -1,4 +1,4 @@ |
2526 | -package de.sub.goobi.Persistence; |
2527 | +package de.sub.goobi.persistence; |
2528 | |
2529 | //TODO: What's the licence of this file? |
2530 | //TODO: Use Generics |
2531 | |
2532 | === modified file 'src/de/sub/goobi/persistence/BenutzerDAO.java' |
2533 | --- src/de/sub/goobi/Persistence/BenutzerDAO.java 2011-12-01 12:44:42 +0000 |
2534 | +++ src/de/sub/goobi/persistence/BenutzerDAO.java 2011-12-14 09:20:02 +0000 |
2535 | @@ -1,8 +1,8 @@ |
2536 | -package de.sub.goobi.Persistence; |
2537 | +package de.sub.goobi.persistence; |
2538 | |
2539 | import java.util.List; |
2540 | |
2541 | -import de.sub.goobi.Beans.Benutzer; |
2542 | +import de.sub.goobi.beans.Benutzer; |
2543 | import de.sub.goobi.helper.exceptions.DAOException; |
2544 | |
2545 | public class BenutzerDAO extends BaseDAO { |
2546 | |
2547 | === modified file 'src/de/sub/goobi/persistence/BenutzergruppenDAO.java' |
2548 | --- src/de/sub/goobi/Persistence/BenutzergruppenDAO.java 2011-12-01 12:44:42 +0000 |
2549 | +++ src/de/sub/goobi/persistence/BenutzergruppenDAO.java 2011-12-14 09:20:02 +0000 |
2550 | @@ -1,8 +1,8 @@ |
2551 | -package de.sub.goobi.Persistence; |
2552 | +package de.sub.goobi.persistence; |
2553 | |
2554 | import java.util.List; |
2555 | |
2556 | -import de.sub.goobi.Beans.Benutzergruppe; |
2557 | +import de.sub.goobi.beans.Benutzergruppe; |
2558 | import de.sub.goobi.helper.exceptions.DAOException; |
2559 | |
2560 | public class BenutzergruppenDAO extends BaseDAO { |
2561 | |
2562 | === modified file 'src/de/sub/goobi/persistence/HibernateSessionConversationFilter.java' |
2563 | --- src/de/sub/goobi/Persistence/HibernateSessionConversationFilter.java 2011-07-19 17:06:09 +0000 |
2564 | +++ src/de/sub/goobi/persistence/HibernateSessionConversationFilter.java 2011-12-14 09:20:02 +0000 |
2565 | @@ -1,4 +1,4 @@ |
2566 | -package de.sub.goobi.Persistence; |
2567 | +package de.sub.goobi.persistence; |
2568 | |
2569 | import java.io.IOException; |
2570 | |
2571 | |
2572 | === modified file 'src/de/sub/goobi/persistence/HibernateSessionConversationFilterWithoutTransaction.java' |
2573 | --- src/de/sub/goobi/Persistence/HibernateSessionConversationFilterWithoutTransaction.java 2011-12-01 12:44:42 +0000 |
2574 | +++ src/de/sub/goobi/persistence/HibernateSessionConversationFilterWithoutTransaction.java 2011-12-14 09:20:02 +0000 |
2575 | @@ -1,4 +1,4 @@ |
2576 | -package de.sub.goobi.Persistence; |
2577 | +package de.sub.goobi.persistence; |
2578 | |
2579 | import java.io.IOException; |
2580 | |
2581 | |
2582 | === modified file 'src/de/sub/goobi/persistence/HibernateSessionLong.java' |
2583 | --- src/de/sub/goobi/Persistence/HibernateSessionLong.java 2011-12-01 12:44:42 +0000 |
2584 | +++ src/de/sub/goobi/persistence/HibernateSessionLong.java 2011-12-14 09:20:02 +0000 |
2585 | @@ -1,4 +1,4 @@ |
2586 | -package de.sub.goobi.Persistence; |
2587 | +package de.sub.goobi.persistence; |
2588 | |
2589 | import org.apache.log4j.Logger; |
2590 | import org.hibernate.HibernateException; |
2591 | |
2592 | === modified file 'src/de/sub/goobi/persistence/HibernateUtil.java' |
2593 | --- src/de/sub/goobi/Persistence/HibernateUtil.java 2011-07-19 17:06:09 +0000 |
2594 | +++ src/de/sub/goobi/persistence/HibernateUtil.java 2011-12-14 09:20:02 +0000 |
2595 | @@ -1,22 +1,22 @@ |
2596 | -package de.sub.goobi.Persistence; |
2597 | +package de.sub.goobi.persistence; |
2598 | |
2599 | import org.hibernate.SessionFactory; |
2600 | import org.hibernate.cfg.Configuration; |
2601 | |
2602 | -import de.sub.goobi.Beans.Benutzer; |
2603 | -import de.sub.goobi.Beans.Benutzergruppe; |
2604 | -import de.sub.goobi.Beans.LdapGruppe; |
2605 | -import de.sub.goobi.Beans.ProjectFileGroup; |
2606 | -import de.sub.goobi.Beans.Projekt; |
2607 | -import de.sub.goobi.Beans.Prozess; |
2608 | -import de.sub.goobi.Beans.Prozesseigenschaft; |
2609 | -import de.sub.goobi.Beans.Regelsatz; |
2610 | -import de.sub.goobi.Beans.Schritt; |
2611 | -import de.sub.goobi.Beans.Schritteigenschaft; |
2612 | -import de.sub.goobi.Beans.Vorlage; |
2613 | -import de.sub.goobi.Beans.Vorlageeigenschaft; |
2614 | -import de.sub.goobi.Beans.Werkstueck; |
2615 | -import de.sub.goobi.Beans.Werkstueckeigenschaft; |
2616 | +import de.sub.goobi.beans.Benutzer; |
2617 | +import de.sub.goobi.beans.Benutzergruppe; |
2618 | +import de.sub.goobi.beans.LdapGruppe; |
2619 | +import de.sub.goobi.beans.ProjectFileGroup; |
2620 | +import de.sub.goobi.beans.Projekt; |
2621 | +import de.sub.goobi.beans.Prozess; |
2622 | +import de.sub.goobi.beans.Prozesseigenschaft; |
2623 | +import de.sub.goobi.beans.Regelsatz; |
2624 | +import de.sub.goobi.beans.Schritt; |
2625 | +import de.sub.goobi.beans.Schritteigenschaft; |
2626 | +import de.sub.goobi.beans.Vorlage; |
2627 | +import de.sub.goobi.beans.Vorlageeigenschaft; |
2628 | +import de.sub.goobi.beans.Werkstueck; |
2629 | +import de.sub.goobi.beans.Werkstueckeigenschaft; |
2630 | |
2631 | public class HibernateUtil { |
2632 | |
2633 | |
2634 | === modified file 'src/de/sub/goobi/persistence/HibernateUtilOld.java' |
2635 | --- src/de/sub/goobi/Persistence/HibernateUtilOld.java 2011-12-01 12:44:42 +0000 |
2636 | +++ src/de/sub/goobi/persistence/HibernateUtilOld.java 2011-12-14 09:20:02 +0000 |
2637 | @@ -1,4 +1,4 @@ |
2638 | -package de.sub.goobi.Persistence; |
2639 | +package de.sub.goobi.persistence; |
2640 | |
2641 | import org.apache.commons.logging.Log; |
2642 | import org.apache.commons.logging.LogFactory; |
2643 | |
2644 | === modified file 'src/de/sub/goobi/persistence/LdapGruppenDAO.java' |
2645 | --- src/de/sub/goobi/Persistence/LdapGruppenDAO.java 2011-12-01 12:44:42 +0000 |
2646 | +++ src/de/sub/goobi/persistence/LdapGruppenDAO.java 2011-12-14 09:20:02 +0000 |
2647 | @@ -1,8 +1,8 @@ |
2648 | -package de.sub.goobi.Persistence; |
2649 | +package de.sub.goobi.persistence; |
2650 | |
2651 | import java.util.List; |
2652 | |
2653 | -import de.sub.goobi.Beans.LdapGruppe; |
2654 | +import de.sub.goobi.beans.LdapGruppe; |
2655 | import de.sub.goobi.helper.exceptions.DAOException; |
2656 | |
2657 | @SuppressWarnings("serial") |
2658 | |
2659 | === modified file 'src/de/sub/goobi/persistence/ProjektDAO.java' |
2660 | --- src/de/sub/goobi/Persistence/ProjektDAO.java 2011-12-01 12:44:42 +0000 |
2661 | +++ src/de/sub/goobi/persistence/ProjektDAO.java 2011-12-14 09:20:02 +0000 |
2662 | @@ -1,8 +1,8 @@ |
2663 | -package de.sub.goobi.Persistence; |
2664 | +package de.sub.goobi.persistence; |
2665 | |
2666 | import java.util.List; |
2667 | |
2668 | -import de.sub.goobi.Beans.Projekt; |
2669 | +import de.sub.goobi.beans.Projekt; |
2670 | import de.sub.goobi.helper.exceptions.DAOException; |
2671 | |
2672 | public class ProjektDAO extends BaseDAO { |
2673 | |
2674 | === modified file 'src/de/sub/goobi/persistence/ProzessDAO.java' |
2675 | --- src/de/sub/goobi/Persistence/ProzessDAO.java 2011-07-19 17:06:09 +0000 |
2676 | +++ src/de/sub/goobi/persistence/ProzessDAO.java 2011-12-14 09:20:02 +0000 |
2677 | @@ -1,8 +1,8 @@ |
2678 | -package de.sub.goobi.Persistence; |
2679 | +package de.sub.goobi.persistence; |
2680 | |
2681 | import java.util.List; |
2682 | |
2683 | -import de.sub.goobi.Beans.Prozess; |
2684 | +import de.sub.goobi.beans.Prozess; |
2685 | import de.sub.goobi.helper.exceptions.DAOException; |
2686 | |
2687 | public class ProzessDAO extends BaseDAO { |
2688 | |
2689 | === modified file 'src/de/sub/goobi/persistence/RegelsatzDAO.java' |
2690 | --- src/de/sub/goobi/Persistence/RegelsatzDAO.java 2011-12-01 12:44:42 +0000 |
2691 | +++ src/de/sub/goobi/persistence/RegelsatzDAO.java 2011-12-14 09:20:02 +0000 |
2692 | @@ -1,8 +1,8 @@ |
2693 | -package de.sub.goobi.Persistence; |
2694 | +package de.sub.goobi.persistence; |
2695 | |
2696 | import java.util.List; |
2697 | |
2698 | -import de.sub.goobi.Beans.Regelsatz; |
2699 | +import de.sub.goobi.beans.Regelsatz; |
2700 | import de.sub.goobi.helper.exceptions.DAOException; |
2701 | |
2702 | public class RegelsatzDAO extends BaseDAO { |
2703 | |
2704 | === modified file 'src/de/sub/goobi/persistence/SchrittDAO.java' |
2705 | --- src/de/sub/goobi/Persistence/SchrittDAO.java 2011-12-01 12:44:42 +0000 |
2706 | +++ src/de/sub/goobi/persistence/SchrittDAO.java 2011-12-14 09:20:02 +0000 |
2707 | @@ -1,10 +1,10 @@ |
2708 | -package de.sub.goobi.Persistence; |
2709 | +package de.sub.goobi.persistence; |
2710 | |
2711 | import java.util.List; |
2712 | |
2713 | import org.goobi.production.search.lucene.LuceneIndex; |
2714 | |
2715 | -import de.sub.goobi.Beans.Schritt; |
2716 | +import de.sub.goobi.beans.Schritt; |
2717 | import de.sub.goobi.helper.exceptions.DAOException; |
2718 | |
2719 | public class SchrittDAO extends BaseDAO { |
2720 | |
2721 | === modified file 'src/de/sub/goobi/persistence/SimpleDAO.java' |
2722 | --- src/de/sub/goobi/Persistence/SimpleDAO.java 2011-12-01 12:44:42 +0000 |
2723 | +++ src/de/sub/goobi/persistence/SimpleDAO.java 2011-12-14 09:20:02 +0000 |
2724 | @@ -1,4 +1,4 @@ |
2725 | -package de.sub.goobi.Persistence; |
2726 | +package de.sub.goobi.persistence; |
2727 | |
2728 | import de.sub.goobi.helper.exceptions.DAOException; |
2729 | |
2730 | |
2731 | === renamed directory 'src/de/sub/goobi/Statistik' => 'src/de/sub/goobi/statistik' |
2732 | === modified file 'src/de/sub/goobi/statistik/StatistikBenutzergruppen.java' |
2733 | --- src/de/sub/goobi/Statistik/StatistikBenutzergruppen.java 2011-07-19 17:06:09 +0000 |
2734 | +++ src/de/sub/goobi/statistik/StatistikBenutzergruppen.java 2011-12-14 09:20:02 +0000 |
2735 | @@ -1,4 +1,4 @@ |
2736 | -package de.sub.goobi.Statistik; |
2737 | +package de.sub.goobi.statistik; |
2738 | |
2739 | import java.util.Iterator; |
2740 | import java.util.List; |
2741 | @@ -6,9 +6,9 @@ |
2742 | import org.jfree.data.general.Dataset; |
2743 | import org.jfree.data.general.DefaultPieDataset; |
2744 | |
2745 | -import de.sub.goobi.Beans.Benutzergruppe; |
2746 | -import de.sub.goobi.Beans.Prozess; |
2747 | -import de.sub.goobi.Beans.Schritt; |
2748 | +import de.sub.goobi.beans.Benutzergruppe; |
2749 | +import de.sub.goobi.beans.Prozess; |
2750 | +import de.sub.goobi.beans.Schritt; |
2751 | |
2752 | public class StatistikBenutzergruppen { |
2753 | |
2754 | |
2755 | === modified file 'src/de/sub/goobi/statistik/StatistikLaufzeitSchritte.java' |
2756 | --- src/de/sub/goobi/Statistik/StatistikLaufzeitSchritte.java 2011-12-01 12:44:42 +0000 |
2757 | +++ src/de/sub/goobi/statistik/StatistikLaufzeitSchritte.java 2011-12-14 09:20:02 +0000 |
2758 | @@ -1,4 +1,4 @@ |
2759 | -package de.sub.goobi.Statistik; |
2760 | +package de.sub.goobi.statistik; |
2761 | |
2762 | import java.util.Calendar; |
2763 | import java.util.Date; |
2764 | @@ -7,8 +7,8 @@ |
2765 | import org.jfree.data.category.DefaultCategoryDataset; |
2766 | import org.jfree.data.general.Dataset; |
2767 | |
2768 | -import de.sub.goobi.Beans.Prozess; |
2769 | -import de.sub.goobi.Beans.Schritt; |
2770 | +import de.sub.goobi.beans.Prozess; |
2771 | +import de.sub.goobi.beans.Schritt; |
2772 | |
2773 | public class StatistikLaufzeitSchritte { |
2774 | |
2775 | |
2776 | === modified file 'src/de/sub/goobi/statistik/StatistikStatus.java' |
2777 | --- src/de/sub/goobi/Statistik/StatistikStatus.java 2011-07-19 17:06:09 +0000 |
2778 | +++ src/de/sub/goobi/statistik/StatistikStatus.java 2011-12-14 09:20:02 +0000 |
2779 | @@ -1,12 +1,12 @@ |
2780 | -package de.sub.goobi.Statistik; |
2781 | +package de.sub.goobi.statistik; |
2782 | |
2783 | import java.util.List; |
2784 | |
2785 | import org.jfree.data.general.Dataset; |
2786 | import org.jfree.data.general.DefaultPieDataset; |
2787 | |
2788 | -import de.sub.goobi.Beans.Prozess; |
2789 | -import de.sub.goobi.Beans.Schritt; |
2790 | +import de.sub.goobi.beans.Prozess; |
2791 | +import de.sub.goobi.beans.Schritt; |
2792 | |
2793 | public class StatistikStatus { |
2794 | |
2795 | |
2796 | === renamed directory 'src/Messages' => 'src/messages' |
2797 | === modified file 'src/messages/Messages.java' |
2798 | --- src/Messages/Messages.java 2011-12-01 12:44:42 +0000 |
2799 | +++ src/messages/Messages.java 2011-12-14 09:20:02 +0000 |
2800 | @@ -1,4 +1,4 @@ |
2801 | -package Messages; |
2802 | +package messages; |
2803 | |
2804 | import java.io.File; |
2805 | import java.net.URL; |
2806 | @@ -10,7 +10,7 @@ |
2807 | import de.sub.goobi.config.ConfigMain; |
2808 | |
2809 | public class Messages { |
2810 | - private static final String BUNDLE_NAME = "Messages.intmessages"; //$NON-NLS-1$ |
2811 | + private static final String BUNDLE_NAME = "messages.intmessages"; //$NON-NLS-1$ |
2812 | |
2813 | private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); |
2814 | static ResourceBundle localBundle; |
2815 | |
2816 | === modified file 'src/org/goobi/api/display/DisplayCase.java' |
2817 | --- src/org/goobi/api/display/DisplayCase.java 2011-12-01 12:44:42 +0000 |
2818 | +++ src/org/goobi/api/display/DisplayCase.java 2011-12-14 09:20:02 +0000 |
2819 | @@ -30,7 +30,7 @@ |
2820 | import org.goobi.api.display.enums.DisplayType; |
2821 | import org.goobi.api.display.helper.ConfigDispayRules; |
2822 | |
2823 | -import de.sub.goobi.Beans.Prozess; |
2824 | +import de.sub.goobi.beans.Prozess; |
2825 | |
2826 | |
2827 | public class DisplayCase { |
2828 | |
2829 | === modified file 'src/org/goobi/production/IProcessDataExport.java' |
2830 | --- src/org/goobi/production/IProcessDataExport.java 2011-12-01 12:44:42 +0000 |
2831 | +++ src/org/goobi/production/IProcessDataExport.java 2011-12-14 09:20:02 +0000 |
2832 | @@ -27,7 +27,7 @@ |
2833 | import java.io.IOException; |
2834 | import java.io.OutputStream; |
2835 | |
2836 | -import de.sub.goobi.Beans.Prozess; |
2837 | +import de.sub.goobi.beans.Prozess; |
2838 | |
2839 | public interface IProcessDataExport { |
2840 | |
2841 | |
2842 | === modified file 'src/org/goobi/production/Import/ImportTest.java' |
2843 | --- src/org/goobi/production/Import/ImportTest.java 2011-12-01 12:44:42 +0000 |
2844 | +++ src/org/goobi/production/Import/ImportTest.java 2011-12-14 09:20:02 +0000 |
2845 | @@ -12,8 +12,8 @@ |
2846 | |
2847 | import org.goobi.production.enums.ImportFormat; |
2848 | |
2849 | -import de.sub.goobi.Beans.Prozess; |
2850 | -import de.sub.goobi.Persistence.ProzessDAO; |
2851 | +import de.sub.goobi.beans.Prozess; |
2852 | +import de.sub.goobi.persistence.ProzessDAO; |
2853 | import de.sub.goobi.helper.exceptions.DAOException; |
2854 | |
2855 | public class ImportTest { |
2856 | |
2857 | === modified file 'src/org/goobi/production/Import/OpacMassImport.java' |
2858 | --- src/org/goobi/production/Import/OpacMassImport.java 2011-12-01 12:44:42 +0000 |
2859 | +++ src/org/goobi/production/Import/OpacMassImport.java 2011-12-14 09:20:02 +0000 |
2860 | @@ -16,7 +16,7 @@ |
2861 | import ugh.exceptions.ReadException; |
2862 | import ugh.exceptions.WriteException; |
2863 | import ugh.fileformats.mets.MetsMods; |
2864 | -import de.sub.goobi.Beans.Prozess; |
2865 | +import de.sub.goobi.beans.Prozess; |
2866 | import de.sub.goobi.helper.exceptions.DAOException; |
2867 | import de.sub.goobi.helper.exceptions.SwapException; |
2868 | import de.unigoettingen.sub.search.opac.Catalogue; |
2869 | |
2870 | === modified file 'src/org/goobi/production/Import/ProductionDataImport.java' |
2871 | --- src/org/goobi/production/Import/ProductionDataImport.java 2011-12-01 12:44:42 +0000 |
2872 | +++ src/org/goobi/production/Import/ProductionDataImport.java 2011-12-14 09:20:02 +0000 |
2873 | @@ -48,22 +48,22 @@ |
2874 | |
2875 | import com.thoughtworks.xstream.XStream; |
2876 | |
2877 | -import de.sub.goobi.Beans.Benutzergruppe; |
2878 | -import de.sub.goobi.Beans.HistoryEvent; |
2879 | -import de.sub.goobi.Beans.Projekt; |
2880 | -import de.sub.goobi.Beans.Prozess; |
2881 | -import de.sub.goobi.Beans.Prozesseigenschaft; |
2882 | -import de.sub.goobi.Beans.Regelsatz; |
2883 | -import de.sub.goobi.Beans.Schritt; |
2884 | -import de.sub.goobi.Beans.Schritteigenschaft; |
2885 | -import de.sub.goobi.Beans.Vorlage; |
2886 | -import de.sub.goobi.Beans.Vorlageeigenschaft; |
2887 | -import de.sub.goobi.Beans.Werkstueck; |
2888 | -import de.sub.goobi.Beans.Werkstueckeigenschaft; |
2889 | -import de.sub.goobi.Persistence.BenutzergruppenDAO; |
2890 | -import de.sub.goobi.Persistence.HibernateUtilOld; |
2891 | -import de.sub.goobi.Persistence.ProjektDAO; |
2892 | -import de.sub.goobi.Persistence.RegelsatzDAO; |
2893 | +import de.sub.goobi.beans.Benutzergruppe; |
2894 | +import de.sub.goobi.beans.HistoryEvent; |
2895 | +import de.sub.goobi.beans.Projekt; |
2896 | +import de.sub.goobi.beans.Prozess; |
2897 | +import de.sub.goobi.beans.Prozesseigenschaft; |
2898 | +import de.sub.goobi.beans.Regelsatz; |
2899 | +import de.sub.goobi.beans.Schritt; |
2900 | +import de.sub.goobi.beans.Schritteigenschaft; |
2901 | +import de.sub.goobi.beans.Vorlage; |
2902 | +import de.sub.goobi.beans.Vorlageeigenschaft; |
2903 | +import de.sub.goobi.beans.Werkstueck; |
2904 | +import de.sub.goobi.beans.Werkstueckeigenschaft; |
2905 | +import de.sub.goobi.persistence.BenutzergruppenDAO; |
2906 | +import de.sub.goobi.persistence.HibernateUtilOld; |
2907 | +import de.sub.goobi.persistence.ProjektDAO; |
2908 | +import de.sub.goobi.persistence.RegelsatzDAO; |
2909 | import de.sub.goobi.config.ConfigMain; |
2910 | import de.sub.goobi.helper.enums.HistoryEventType; |
2911 | import de.sub.goobi.helper.enums.PropertyType; |
2912 | |
2913 | === modified file 'src/org/goobi/production/api/property/xmlbasedprovider/IPropertyTemplatesProvider.java' |
2914 | --- src/org/goobi/production/api/property/xmlbasedprovider/IPropertyTemplatesProvider.java 2011-12-01 12:44:42 +0000 |
2915 | +++ src/org/goobi/production/api/property/xmlbasedprovider/IPropertyTemplatesProvider.java 2011-12-14 09:20:02 +0000 |
2916 | @@ -28,7 +28,7 @@ |
2917 | |
2918 | import org.goobi.production.api.property.xmlbasedprovider.impl.PropertyTemplate; |
2919 | |
2920 | -import de.sub.goobi.Beans.Property.IGoobiEntity; |
2921 | +import de.sub.goobi.beans.property.IGoobiEntity; |
2922 | |
2923 | public interface IPropertyTemplatesProvider { |
2924 | |
2925 | |
2926 | === modified file 'src/org/goobi/production/api/property/xmlbasedprovider/Status.java' |
2927 | --- src/org/goobi/production/api/property/xmlbasedprovider/Status.java 2011-12-01 12:44:42 +0000 |
2928 | +++ src/org/goobi/production/api/property/xmlbasedprovider/Status.java 2011-12-14 09:20:02 +0000 |
2929 | @@ -24,11 +24,11 @@ |
2930 | * exception statement from your version. |
2931 | * |
2932 | */ |
2933 | -import de.sub.goobi.Beans.Projekt; |
2934 | -import de.sub.goobi.Beans.Prozess; |
2935 | -import de.sub.goobi.Beans.Schritt; |
2936 | -import de.sub.goobi.Beans.Vorlage; |
2937 | -import de.sub.goobi.Beans.Werkstueck; |
2938 | +import de.sub.goobi.beans.Projekt; |
2939 | +import de.sub.goobi.beans.Prozess; |
2940 | +import de.sub.goobi.beans.Schritt; |
2941 | +import de.sub.goobi.beans.Vorlage; |
2942 | +import de.sub.goobi.beans.Werkstueck; |
2943 | |
2944 | /** |
2945 | * simple POJO class to generate PropertyTemplate for a IGoobiEntity |
2946 | |
2947 | === modified file 'src/org/goobi/production/api/property/xmlbasedprovider/impl/Parser.java' |
2948 | --- src/org/goobi/production/api/property/xmlbasedprovider/impl/Parser.java 2011-12-01 12:44:42 +0000 |
2949 | +++ src/org/goobi/production/api/property/xmlbasedprovider/impl/Parser.java 2011-12-14 09:20:02 +0000 |
2950 | @@ -34,7 +34,7 @@ |
2951 | import org.jdom.Namespace; |
2952 | import org.jdom.input.SAXBuilder; |
2953 | |
2954 | -import de.sub.goobi.Beans.Property.IGoobiEntity; |
2955 | +import de.sub.goobi.beans.property.IGoobiEntity; |
2956 | import de.sub.goobi.helper.enums.PropertyType; |
2957 | |
2958 | /****************************************************************************** |
2959 | |
2960 | === modified file 'src/org/goobi/production/api/property/xmlbasedprovider/impl/PropertyTemplate.java' |
2961 | --- src/org/goobi/production/api/property/xmlbasedprovider/impl/PropertyTemplate.java 2011-12-01 12:44:42 +0000 |
2962 | +++ src/org/goobi/production/api/property/xmlbasedprovider/impl/PropertyTemplate.java 2011-12-14 09:20:02 +0000 |
2963 | @@ -37,16 +37,16 @@ |
2964 | import org.apache.log4j.Logger; |
2965 | import org.goobi.production.api.property.xmlbasedprovider.Status; |
2966 | |
2967 | -import de.sub.goobi.Beans.Prozess; |
2968 | -import de.sub.goobi.Beans.Prozesseigenschaft; |
2969 | -import de.sub.goobi.Beans.Schritt; |
2970 | -import de.sub.goobi.Beans.Schritteigenschaft; |
2971 | -import de.sub.goobi.Beans.Vorlage; |
2972 | -import de.sub.goobi.Beans.Vorlageeigenschaft; |
2973 | -import de.sub.goobi.Beans.Werkstueck; |
2974 | -import de.sub.goobi.Beans.Werkstueckeigenschaft; |
2975 | -import de.sub.goobi.Beans.Property.IGoobiEntity; |
2976 | -import de.sub.goobi.Beans.Property.IGoobiProperty; |
2977 | +import de.sub.goobi.beans.Prozess; |
2978 | +import de.sub.goobi.beans.Prozesseigenschaft; |
2979 | +import de.sub.goobi.beans.Schritt; |
2980 | +import de.sub.goobi.beans.Schritteigenschaft; |
2981 | +import de.sub.goobi.beans.Vorlage; |
2982 | +import de.sub.goobi.beans.Vorlageeigenschaft; |
2983 | +import de.sub.goobi.beans.Werkstueck; |
2984 | +import de.sub.goobi.beans.Werkstueckeigenschaft; |
2985 | +import de.sub.goobi.beans.property.IGoobiEntity; |
2986 | +import de.sub.goobi.beans.property.IGoobiProperty; |
2987 | import de.sub.goobi.helper.enums.PropertyType; |
2988 | |
2989 | /********************************************************************************** |
2990 | @@ -322,7 +322,7 @@ |
2991 | /* |
2992 | * (non-Javadoc) |
2993 | * |
2994 | - * @see org.goobi.production.api.property.xmlbasedprovider.impl.IPropertyTemplate#setProperty(de.sub.goobi.Beans.Property.IGoobiProperty) |
2995 | + * @see org.goobi.production.api.property.xmlbasedprovider.impl.IPropertyTemplate#setProperty(de.sub.goobi.beans.property.IGoobiProperty) |
2996 | */ |
2997 | |
2998 | public boolean setProperty(IGoobiProperty inProp) { |
2999 | @@ -429,7 +429,7 @@ |
3000 | /* |
3001 | * (non-Javadoc) |
3002 | * |
3003 | - * @see org.goobi.production.api.property.xmlbasedprovider.impl.IPropertyTemplate#setOwningEntity(de.sub.goobi.Beans.Property.IGoobiEntity) |
3004 | + * @see org.goobi.production.api.property.xmlbasedprovider.impl.IPropertyTemplate#setOwningEntity(de.sub.goobi.beans.property.IGoobiEntity) |
3005 | */ |
3006 | public void setOwningEntity(IGoobiEntity inEntity) { |
3007 | owningEntity = inEntity; |
3008 | |
3009 | === modified file 'src/org/goobi/production/api/property/xmlbasedprovider/impl/XMLBasedPropertyTemplateProvider.java' |
3010 | --- src/org/goobi/production/api/property/xmlbasedprovider/impl/XMLBasedPropertyTemplateProvider.java 2011-12-01 12:44:42 +0000 |
3011 | +++ src/org/goobi/production/api/property/xmlbasedprovider/impl/XMLBasedPropertyTemplateProvider.java 2011-12-14 09:20:02 +0000 |
3012 | @@ -32,7 +32,7 @@ |
3013 | import org.goobi.production.api.property.xmlbasedprovider.Status; |
3014 | import org.jdom.JDOMException; |
3015 | |
3016 | -import de.sub.goobi.Beans.Property.IGoobiEntity; |
3017 | +import de.sub.goobi.beans.property.IGoobiEntity; |
3018 | import de.sub.goobi.config.ConfigMain; |
3019 | |
3020 | /************************************************************************************************** |
3021 | |
3022 | === modified file 'src/org/goobi/production/chart/HibernateProjectTaskList.java' |
3023 | --- src/org/goobi/production/chart/HibernateProjectTaskList.java 2011-12-01 12:44:42 +0000 |
3024 | +++ src/org/goobi/production/chart/HibernateProjectTaskList.java 2011-12-14 09:20:02 +0000 |
3025 | @@ -35,8 +35,8 @@ |
3026 | import org.hibernate.criterion.Order; |
3027 | import org.hibernate.criterion.Restrictions; |
3028 | |
3029 | -import de.sub.goobi.Beans.Projekt; |
3030 | -import de.sub.goobi.Beans.Schritt; |
3031 | +import de.sub.goobi.beans.Projekt; |
3032 | +import de.sub.goobi.beans.Schritt; |
3033 | import de.sub.goobi.helper.Helper; |
3034 | import de.sub.goobi.helper.enums.StepStatus; |
3035 | |
3036 | |
3037 | === modified file 'src/org/goobi/production/chart/HibernateProjectionProjectTaskList.java' |
3038 | --- src/org/goobi/production/chart/HibernateProjectionProjectTaskList.java 2011-12-01 12:44:42 +0000 |
3039 | +++ src/org/goobi/production/chart/HibernateProjectionProjectTaskList.java 2011-12-14 09:20:02 +0000 |
3040 | @@ -37,8 +37,8 @@ |
3041 | import org.hibernate.criterion.Projections; |
3042 | import org.hibernate.criterion.Restrictions; |
3043 | |
3044 | -import de.sub.goobi.Beans.Projekt; |
3045 | -import de.sub.goobi.Beans.Schritt; |
3046 | +import de.sub.goobi.beans.Projekt; |
3047 | +import de.sub.goobi.beans.Schritt; |
3048 | import de.sub.goobi.helper.Helper; |
3049 | import de.sub.goobi.helper.enums.StepStatus; |
3050 | |
3051 | |
3052 | === modified file 'src/org/goobi/production/chart/IProvideProjectTaskList.java' |
3053 | --- src/org/goobi/production/chart/IProvideProjectTaskList.java 2011-12-01 12:44:42 +0000 |
3054 | +++ src/org/goobi/production/chart/IProvideProjectTaskList.java 2011-12-14 09:20:02 +0000 |
3055 | @@ -26,7 +26,7 @@ |
3056 | |
3057 | import java.util.List; |
3058 | |
3059 | -import de.sub.goobi.Beans.Projekt; |
3060 | +import de.sub.goobi.beans.Projekt; |
3061 | |
3062 | |
3063 | |
3064 | |
3065 | === modified file 'src/org/goobi/production/chart/WorkflowProjectTaskList.java' |
3066 | --- src/org/goobi/production/chart/WorkflowProjectTaskList.java 2011-12-01 12:44:42 +0000 |
3067 | +++ src/org/goobi/production/chart/WorkflowProjectTaskList.java 2011-12-14 09:20:02 +0000 |
3068 | @@ -29,7 +29,7 @@ |
3069 | |
3070 | import org.goobi.production.flow.statistics.StepInformation; |
3071 | |
3072 | -import de.sub.goobi.Beans.Projekt; |
3073 | +import de.sub.goobi.beans.Projekt; |
3074 | |
3075 | |
3076 | |
3077 | |
3078 | === modified file 'src/org/goobi/production/cli/CommandLineInterface.java' |
3079 | --- src/org/goobi/production/cli/CommandLineInterface.java 2011-12-01 13:02:10 +0000 |
3080 | +++ src/org/goobi/production/cli/CommandLineInterface.java 2011-12-14 09:20:02 +0000 |
3081 | @@ -21,16 +21,16 @@ |
3082 | import ugh.exceptions.PreferencesException; |
3083 | import ugh.exceptions.ReadException; |
3084 | import ugh.exceptions.WriteException; |
3085 | -import de.sub.goobi.Beans.Benutzergruppe; |
3086 | -import de.sub.goobi.Beans.HistoryEvent; |
3087 | -import de.sub.goobi.Beans.Projekt; |
3088 | -import de.sub.goobi.Beans.Prozess; |
3089 | -import de.sub.goobi.Beans.Schritt; |
3090 | -import de.sub.goobi.Export.dms.ExportDms; |
3091 | -import de.sub.goobi.Persistence.BenutzergruppenDAO; |
3092 | -import de.sub.goobi.Persistence.ProjektDAO; |
3093 | -import de.sub.goobi.Persistence.ProzessDAO; |
3094 | -import de.sub.goobi.Persistence.SchrittDAO; |
3095 | +import de.sub.goobi.beans.Benutzergruppe; |
3096 | +import de.sub.goobi.beans.HistoryEvent; |
3097 | +import de.sub.goobi.beans.Projekt; |
3098 | +import de.sub.goobi.beans.Prozess; |
3099 | +import de.sub.goobi.beans.Schritt; |
3100 | +import de.sub.goobi.export.dms.ExportDms; |
3101 | +import de.sub.goobi.persistence.BenutzergruppenDAO; |
3102 | +import de.sub.goobi.persistence.ProjektDAO; |
3103 | +import de.sub.goobi.persistence.ProzessDAO; |
3104 | +import de.sub.goobi.persistence.SchrittDAO; |
3105 | import de.sub.goobi.helper.Helper; |
3106 | import de.sub.goobi.helper.HelperSchritte; |
3107 | import de.sub.goobi.helper.enums.HistoryEventType; |
3108 | |
3109 | === modified file 'src/org/goobi/production/cli/helper/CopyProcess.java' |
3110 | --- src/org/goobi/production/cli/helper/CopyProcess.java 2011-12-01 12:44:42 +0000 |
3111 | +++ src/org/goobi/production/cli/helper/CopyProcess.java 2011-12-14 09:20:02 +0000 |
3112 | @@ -37,16 +37,16 @@ |
3113 | import ugh.exceptions.WriteException; |
3114 | import ugh.fileformats.mets.MetsMods; |
3115 | import ugh.fileformats.mets.MetsModsImportExport; |
3116 | -import de.sub.goobi.Beans.Prozess; |
3117 | -import de.sub.goobi.Beans.Schritt; |
3118 | -import de.sub.goobi.Beans.Vorlage; |
3119 | -import de.sub.goobi.Beans.Vorlageeigenschaft; |
3120 | -import de.sub.goobi.Beans.Werkstueck; |
3121 | -import de.sub.goobi.Beans.Werkstueckeigenschaft; |
3122 | -import de.sub.goobi.Forms.AdditionalField; |
3123 | -import de.sub.goobi.Forms.LoginForm; |
3124 | -import de.sub.goobi.Forms.ProzesskopieForm; |
3125 | -import de.sub.goobi.Persistence.ProzessDAO; |
3126 | +import de.sub.goobi.beans.Prozess; |
3127 | +import de.sub.goobi.beans.Schritt; |
3128 | +import de.sub.goobi.beans.Vorlage; |
3129 | +import de.sub.goobi.beans.Vorlageeigenschaft; |
3130 | +import de.sub.goobi.beans.Werkstueck; |
3131 | +import de.sub.goobi.beans.Werkstueckeigenschaft; |
3132 | +import de.sub.goobi.forms.AdditionalField; |
3133 | +import de.sub.goobi.forms.LoginForm; |
3134 | +import de.sub.goobi.forms.ProzesskopieForm; |
3135 | +import de.sub.goobi.persistence.ProzessDAO; |
3136 | import de.sub.goobi.config.ConfigMain; |
3137 | import de.sub.goobi.config.ConfigOpac; |
3138 | import de.sub.goobi.config.ConfigOpacDoctype; |
3139 | |
3140 | === modified file 'src/org/goobi/production/export/ExportDocket.java' |
3141 | --- src/org/goobi/production/export/ExportDocket.java 2011-12-01 12:44:42 +0000 |
3142 | +++ src/org/goobi/production/export/ExportDocket.java 2011-12-14 09:20:02 +0000 |
3143 | @@ -44,7 +44,7 @@ |
3144 | import org.apache.fop.apps.MimeConstants; |
3145 | import org.goobi.production.IProcessDataExport; |
3146 | |
3147 | -import de.sub.goobi.Beans.Prozess; |
3148 | +import de.sub.goobi.beans.Prozess; |
3149 | import de.sub.goobi.helper.exceptions.ExportFileException; |
3150 | |
3151 | /** |
3152 | |
3153 | === modified file 'src/org/goobi/production/export/ExportXmlLog.java' |
3154 | --- src/org/goobi/production/export/ExportXmlLog.java 2011-12-01 12:44:42 +0000 |
3155 | +++ src/org/goobi/production/export/ExportXmlLog.java 2011-12-14 09:20:02 +0000 |
3156 | @@ -42,14 +42,14 @@ |
3157 | import org.jdom.transform.XSLTransformException; |
3158 | import org.jdom.transform.XSLTransformer; |
3159 | |
3160 | -import de.sub.goobi.Beans.Prozess; |
3161 | -import de.sub.goobi.Beans.Prozesseigenschaft; |
3162 | -import de.sub.goobi.Beans.Schritt; |
3163 | -import de.sub.goobi.Beans.Schritteigenschaft; |
3164 | -import de.sub.goobi.Beans.Vorlage; |
3165 | -import de.sub.goobi.Beans.Vorlageeigenschaft; |
3166 | -import de.sub.goobi.Beans.Werkstueck; |
3167 | -import de.sub.goobi.Beans.Werkstueckeigenschaft; |
3168 | +import de.sub.goobi.beans.Prozess; |
3169 | +import de.sub.goobi.beans.Prozesseigenschaft; |
3170 | +import de.sub.goobi.beans.Schritt; |
3171 | +import de.sub.goobi.beans.Schritteigenschaft; |
3172 | +import de.sub.goobi.beans.Vorlage; |
3173 | +import de.sub.goobi.beans.Vorlageeigenschaft; |
3174 | +import de.sub.goobi.beans.Werkstueck; |
3175 | +import de.sub.goobi.beans.Werkstueckeigenschaft; |
3176 | import de.sub.goobi.helper.exceptions.ExportFileException; |
3177 | |
3178 | /** |
3179 | |
3180 | === modified file 'src/org/goobi/production/flow/jobs/HistoryAnalyserJob.java' |
3181 | --- src/org/goobi/production/flow/jobs/HistoryAnalyserJob.java 2011-12-01 12:44:42 +0000 |
3182 | +++ src/org/goobi/production/flow/jobs/HistoryAnalyserJob.java 2011-12-14 09:20:02 +0000 |
3183 | @@ -35,10 +35,10 @@ |
3184 | import org.hibernate.Query; |
3185 | import org.hibernate.Session; |
3186 | |
3187 | -import de.sub.goobi.Beans.HistoryEvent; |
3188 | -import de.sub.goobi.Beans.Prozess; |
3189 | -import de.sub.goobi.Beans.Schritt; |
3190 | -import de.sub.goobi.Beans.Schritteigenschaft; |
3191 | +import de.sub.goobi.beans.HistoryEvent; |
3192 | +import de.sub.goobi.beans.Prozess; |
3193 | +import de.sub.goobi.beans.Schritt; |
3194 | +import de.sub.goobi.beans.Schritteigenschaft; |
3195 | import de.sub.goobi.helper.Helper; |
3196 | import de.sub.goobi.helper.enums.HistoryEventType; |
3197 | import de.sub.goobi.helper.exceptions.DAOException; |
3198 | |
3199 | === modified file 'src/org/goobi/production/flow/jobs/HistoryAnalyserJob2.java' |
3200 | --- src/org/goobi/production/flow/jobs/HistoryAnalyserJob2.java 2011-12-01 12:44:42 +0000 |
3201 | +++ src/org/goobi/production/flow/jobs/HistoryAnalyserJob2.java 2011-12-14 09:20:02 +0000 |
3202 | @@ -35,10 +35,10 @@ |
3203 | import org.hibernate.Query; |
3204 | import org.hibernate.Session; |
3205 | |
3206 | -import de.sub.goobi.Beans.HistoryEvent; |
3207 | -import de.sub.goobi.Beans.Prozess; |
3208 | -import de.sub.goobi.Beans.Schritt; |
3209 | -import de.sub.goobi.Beans.Schritteigenschaft; |
3210 | +import de.sub.goobi.beans.HistoryEvent; |
3211 | +import de.sub.goobi.beans.Prozess; |
3212 | +import de.sub.goobi.beans.Schritt; |
3213 | +import de.sub.goobi.beans.Schritteigenschaft; |
3214 | import de.sub.goobi.helper.Helper; |
3215 | import de.sub.goobi.helper.enums.HistoryEventType; |
3216 | import de.sub.goobi.helper.exceptions.DAOException; |
3217 | |
3218 | === modified file 'src/org/goobi/production/flow/jobs/HistoryJob.java' |
3219 | --- src/org/goobi/production/flow/jobs/HistoryJob.java 2011-07-19 17:06:09 +0000 |
3220 | +++ src/org/goobi/production/flow/jobs/HistoryJob.java 2011-12-14 09:20:02 +0000 |
3221 | @@ -16,10 +16,10 @@ |
3222 | import org.quartz.JobExecutionContext; |
3223 | import org.quartz.JobExecutionException; |
3224 | |
3225 | -import de.sub.goobi.Beans.HistoryEvent; |
3226 | -import de.sub.goobi.Beans.Prozess; |
3227 | -import de.sub.goobi.Beans.Schritt; |
3228 | -import de.sub.goobi.Beans.Schritteigenschaft; |
3229 | +import de.sub.goobi.beans.HistoryEvent; |
3230 | +import de.sub.goobi.beans.Prozess; |
3231 | +import de.sub.goobi.beans.Schritt; |
3232 | +import de.sub.goobi.beans.Schritteigenschaft; |
3233 | import de.sub.goobi.helper.Helper; |
3234 | import de.sub.goobi.helper.enums.HistoryEventType; |
3235 | import de.sub.goobi.helper.enums.PropertyType; |
3236 | |
3237 | === modified file 'src/org/goobi/production/flow/jobs/LuceneIndexJob.java' |
3238 | --- src/org/goobi/production/flow/jobs/LuceneIndexJob.java 2011-12-01 12:44:42 +0000 |
3239 | +++ src/org/goobi/production/flow/jobs/LuceneIndexJob.java 2011-12-14 09:20:02 +0000 |
3240 | @@ -35,7 +35,7 @@ |
3241 | import org.hibernate.ScrollableResults; |
3242 | import org.hibernate.Session; |
3243 | |
3244 | -import de.sub.goobi.Beans.Prozess; |
3245 | +import de.sub.goobi.beans.Prozess; |
3246 | import de.sub.goobi.helper.Helper; |
3247 | |
3248 | |
3249 | |
3250 | === modified file 'src/org/goobi/production/flow/jobs/LuceneIndexJobIDVersion.java' |
3251 | --- src/org/goobi/production/flow/jobs/LuceneIndexJobIDVersion.java 2011-12-01 12:44:42 +0000 |
3252 | +++ src/org/goobi/production/flow/jobs/LuceneIndexJobIDVersion.java 2011-12-14 09:20:02 +0000 |
3253 | @@ -37,8 +37,8 @@ |
3254 | import org.hibernate.criterion.Projections; |
3255 | import org.hibernate.exception.GenericJDBCException; |
3256 | |
3257 | -import de.sub.goobi.Beans.Prozess; |
3258 | -import de.sub.goobi.Persistence.ProzessDAO; |
3259 | +import de.sub.goobi.beans.Prozess; |
3260 | +import de.sub.goobi.persistence.ProzessDAO; |
3261 | import de.sub.goobi.helper.Helper; |
3262 | import de.sub.goobi.helper.exceptions.DAOException; |
3263 | |
3264 | |
3265 | === modified file 'src/org/goobi/production/flow/statistics/StatisticsManager.java' |
3266 | --- src/org/goobi/production/flow/statistics/StatisticsManager.java 2011-12-01 12:44:42 +0000 |
3267 | +++ src/org/goobi/production/flow/statistics/StatisticsManager.java 2011-12-14 09:20:02 +0000 |
3268 | @@ -44,8 +44,8 @@ |
3269 | |
3270 | import de.intranda.commons.chart.results.DataRow; |
3271 | import de.intranda.commons.chart.results.DataTable; |
3272 | -import de.sub.goobi.Statistik.StatistikLaufzeitSchritte; |
3273 | -import de.sub.goobi.Statistik.StatistikStatus; |
3274 | +import de.sub.goobi.statistik.StatistikLaufzeitSchritte; |
3275 | +import de.sub.goobi.statistik.StatistikStatus; |
3276 | import de.sub.goobi.helper.Helper; |
3277 | |
3278 | /** |
3279 | |
3280 | === modified file 'src/org/goobi/production/flow/statistics/hibernate/Converter.java' |
3281 | --- src/org/goobi/production/flow/statistics/hibernate/Converter.java 2011-07-19 17:06:09 +0000 |
3282 | +++ src/org/goobi/production/flow/statistics/hibernate/Converter.java 2011-12-14 09:20:02 +0000 |
3283 | @@ -54,7 +54,7 @@ |
3284 | new DateFormatSymbols(StatisticsManager.getLocale())); |
3285 | } catch (NullPointerException e) { |
3286 | logger |
3287 | - .error("Class statistics.hibernate.Converter Error, can't get FacesContext"); |
3288 | + .error("Class statistics.hibernate.converter Error, can't get FacesContext"); |
3289 | } |
3290 | } |
3291 | |
3292 | |
3293 | === modified file 'src/org/goobi/production/flow/statistics/hibernate/FilterHelper.java' |
3294 | --- src/org/goobi/production/flow/statistics/hibernate/FilterHelper.java 2011-12-01 12:44:42 +0000 |
3295 | +++ src/org/goobi/production/flow/statistics/hibernate/FilterHelper.java 2011-12-14 09:20:02 +0000 |
3296 | @@ -39,12 +39,12 @@ |
3297 | import org.hibernate.criterion.Projections; |
3298 | import org.hibernate.criterion.Restrictions; |
3299 | |
3300 | -import de.sub.goobi.Beans.Benutzer; |
3301 | -import de.sub.goobi.Beans.Projekt; |
3302 | -import de.sub.goobi.Beans.Prozess; |
3303 | -import de.sub.goobi.Beans.Schritt; |
3304 | -import de.sub.goobi.Forms.LoginForm; |
3305 | -import de.sub.goobi.Persistence.BenutzerDAO; |
3306 | +import de.sub.goobi.beans.Benutzer; |
3307 | +import de.sub.goobi.beans.Projekt; |
3308 | +import de.sub.goobi.beans.Prozess; |
3309 | +import de.sub.goobi.beans.Schritt; |
3310 | +import de.sub.goobi.forms.LoginForm; |
3311 | +import de.sub.goobi.persistence.BenutzerDAO; |
3312 | import de.sub.goobi.helper.Helper; |
3313 | import de.sub.goobi.helper.PaginatingCriteria; |
3314 | import de.sub.goobi.helper.enums.StepStatus; |
3315 | |
3316 | === modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestCorrections.java' |
3317 | --- src/org/goobi/production/flow/statistics/hibernate/StatQuestCorrections.java 2011-07-19 17:06:09 +0000 |
3318 | +++ src/org/goobi/production/flow/statistics/hibernate/StatQuestCorrections.java 2011-12-14 09:20:02 +0000 |
3319 | @@ -133,7 +133,7 @@ |
3320 | //setting row name with date/time extraction based on the group |
3321 | |
3322 | dataRow.setName(new Converter(objArr[1]).getString() + ""); |
3323 | - //dataRow.setName(new Converter(objArr[2]).getString()); |
3324 | + //dataRow.setName(new converter(objArr[2]).getString()); |
3325 | |
3326 | dataRow.addValue(Helper.getTranslation("Corrections/Errors"), |
3327 | (new Converter(objArr[0]).getDouble())); |
3328 | |
3329 | === modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestProduction.java' |
3330 | --- src/org/goobi/production/flow/statistics/hibernate/StatQuestProduction.java 2011-12-01 12:44:42 +0000 |
3331 | +++ src/org/goobi/production/flow/statistics/hibernate/StatQuestProduction.java 2011-12-14 09:20:02 +0000 |
3332 | @@ -41,7 +41,7 @@ |
3333 | import de.intranda.commons.chart.renderer.IRenderer; |
3334 | import de.intranda.commons.chart.results.DataRow; |
3335 | import de.intranda.commons.chart.results.DataTable; |
3336 | -import de.sub.goobi.Beans.Prozess; |
3337 | +import de.sub.goobi.beans.Prozess; |
3338 | import de.sub.goobi.helper.Helper; |
3339 | |
3340 | /** |
3341 | @@ -157,7 +157,7 @@ |
3342 | |
3343 | dataRowChart.setName(new Converter(objArr[2]).getString() + ""); |
3344 | dataRow.setName(new Converter(objArr[2]).getString() + ""); |
3345 | - // dataRow.setName(new Converter(objArr[2]).getString()); |
3346 | + // dataRow.setName(new converter(objArr[2]).getString()); |
3347 | |
3348 | // building up row depending on requested output having different fields |
3349 | switch (this.cu) { |
3350 | |
3351 | === modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestProjectProgressData.java' |
3352 | --- src/org/goobi/production/flow/statistics/hibernate/StatQuestProjectProgressData.java 2011-12-01 12:44:42 +0000 |
3353 | +++ src/org/goobi/production/flow/statistics/hibernate/StatQuestProjectProgressData.java 2011-12-14 09:20:02 +0000 |
3354 | @@ -233,7 +233,7 @@ |
3355 | return dr; |
3356 | } |
3357 | } |
3358 | - //TODO: Retireve from Messages |
3359 | + //TODO: Retireve from messages |
3360 | String message = "couldn't retrieve requested DataRow by name '" + stepName + "'"; |
3361 | if (flagNoContent){ |
3362 | message = message + " - empty DataTable"; |
3363 | |
3364 | === modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestStorage.java' |
3365 | --- src/org/goobi/production/flow/statistics/hibernate/StatQuestStorage.java 2011-12-01 12:44:42 +0000 |
3366 | +++ src/org/goobi/production/flow/statistics/hibernate/StatQuestStorage.java 2011-12-14 09:20:02 +0000 |
3367 | @@ -123,7 +123,7 @@ |
3368 | //setting row name with date/time extraction based on the group |
3369 | |
3370 | dataRow.setName(new Converter(objArr[1]).getString() + ""); |
3371 | - //dataRow.setName(new Converter(objArr[2]).getString()); |
3372 | + //dataRow.setName(new converter(objArr[2]).getString()); |
3373 | |
3374 | dataRow.addValue(Helper.getTranslation("storageDifference"), |
3375 | (new Converter(objArr[0]).getGB())); |
3376 | |
3377 | === modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestUsergroups.java' |
3378 | --- src/org/goobi/production/flow/statistics/hibernate/StatQuestUsergroups.java 2011-07-19 17:06:09 +0000 |
3379 | +++ src/org/goobi/production/flow/statistics/hibernate/StatQuestUsergroups.java 2011-12-14 09:20:02 +0000 |
3380 | @@ -39,8 +39,8 @@ |
3381 | import de.intranda.commons.chart.renderer.IRenderer; |
3382 | import de.intranda.commons.chart.results.DataRow; |
3383 | import de.intranda.commons.chart.results.DataTable; |
3384 | -import de.sub.goobi.Beans.Benutzergruppe; |
3385 | -import de.sub.goobi.Beans.Schritt; |
3386 | +import de.sub.goobi.beans.Benutzergruppe; |
3387 | +import de.sub.goobi.beans.Schritt; |
3388 | import de.sub.goobi.helper.Helper; |
3389 | |
3390 | /***************************************************************************** |
3391 | |
3392 | === modified file 'src/org/goobi/production/flow/statistics/hibernate/StatQuestVolumeStatus.java' |
3393 | --- src/org/goobi/production/flow/statistics/hibernate/StatQuestVolumeStatus.java 2011-07-19 17:06:09 +0000 |
3394 | +++ src/org/goobi/production/flow/statistics/hibernate/StatQuestVolumeStatus.java 2011-12-14 09:20:02 +0000 |
3395 | @@ -39,7 +39,7 @@ |
3396 | import de.intranda.commons.chart.renderer.IRenderer; |
3397 | import de.intranda.commons.chart.results.DataRow; |
3398 | import de.intranda.commons.chart.results.DataTable; |
3399 | -import de.sub.goobi.Beans.Schritt; |
3400 | +import de.sub.goobi.beans.Schritt; |
3401 | import de.sub.goobi.helper.Helper; |
3402 | |
3403 | /***************************************************************************** |
3404 | |
3405 | === modified file 'src/org/goobi/production/flow/statistics/hibernate/UserDefinedFilter.java' |
3406 | --- src/org/goobi/production/flow/statistics/hibernate/UserDefinedFilter.java 2011-12-01 12:44:42 +0000 |
3407 | +++ src/org/goobi/production/flow/statistics/hibernate/UserDefinedFilter.java 2011-12-14 09:20:02 +0000 |
3408 | @@ -36,7 +36,7 @@ |
3409 | import org.hibernate.criterion.CriteriaSpecification; |
3410 | import org.hibernate.criterion.Restrictions; |
3411 | |
3412 | -import de.sub.goobi.Beans.Prozess; |
3413 | +import de.sub.goobi.beans.Prozess; |
3414 | import de.sub.goobi.helper.Helper; |
3415 | import de.sub.goobi.helper.PaginatingCriteria; |
3416 | |
3417 | |
3418 | === modified file 'src/org/goobi/production/flow/statistics/hibernate/UserDefinedStepFilter.java' |
3419 | --- src/org/goobi/production/flow/statistics/hibernate/UserDefinedStepFilter.java 2011-12-01 12:44:42 +0000 |
3420 | +++ src/org/goobi/production/flow/statistics/hibernate/UserDefinedStepFilter.java 2011-12-14 09:20:02 +0000 |
3421 | @@ -33,7 +33,7 @@ |
3422 | import org.hibernate.Session; |
3423 | import org.hibernate.criterion.Restrictions; |
3424 | |
3425 | -import de.sub.goobi.Beans.Schritt; |
3426 | +import de.sub.goobi.beans.Schritt; |
3427 | import de.sub.goobi.helper.Helper; |
3428 | import de.sub.goobi.helper.PaginatingCriteria; |
3429 | |
3430 | |
3431 | === modified file 'src/org/goobi/production/flow/statistics/hibernate/UserProcessesFilter.java' |
3432 | --- src/org/goobi/production/flow/statistics/hibernate/UserProcessesFilter.java 2011-12-01 12:44:42 +0000 |
3433 | +++ src/org/goobi/production/flow/statistics/hibernate/UserProcessesFilter.java 2011-12-14 09:20:02 +0000 |
3434 | @@ -30,7 +30,7 @@ |
3435 | import org.hibernate.Criteria; |
3436 | import org.hibernate.Session; |
3437 | |
3438 | -import de.sub.goobi.Beans.Prozess; |
3439 | +import de.sub.goobi.beans.Prozess; |
3440 | import de.sub.goobi.helper.Helper; |
3441 | import de.sub.goobi.helper.PaginatingCriteria; |
3442 | |
3443 | |
3444 | === modified file 'src/org/goobi/production/flow/statistics/hibernate/UserProjectFilter.java' |
3445 | --- src/org/goobi/production/flow/statistics/hibernate/UserProjectFilter.java 2011-12-01 12:44:42 +0000 |
3446 | +++ src/org/goobi/production/flow/statistics/hibernate/UserProjectFilter.java 2011-12-14 09:20:02 +0000 |
3447 | @@ -34,7 +34,7 @@ |
3448 | import org.hibernate.criterion.CriteriaSpecification; |
3449 | import org.hibernate.criterion.Restrictions; |
3450 | |
3451 | -import de.sub.goobi.Beans.Prozess; |
3452 | +import de.sub.goobi.beans.Prozess; |
3453 | import de.sub.goobi.helper.Helper; |
3454 | import de.sub.goobi.helper.PaginatingCriteria; |
3455 | |
3456 | |
3457 | === modified file 'src/org/goobi/production/flow/statistics/hibernate/UserTemplatesFilter.java' |
3458 | --- src/org/goobi/production/flow/statistics/hibernate/UserTemplatesFilter.java 2011-12-01 12:44:42 +0000 |
3459 | +++ src/org/goobi/production/flow/statistics/hibernate/UserTemplatesFilter.java 2011-12-14 09:20:02 +0000 |
3460 | @@ -30,7 +30,7 @@ |
3461 | import org.hibernate.Criteria; |
3462 | import org.hibernate.Session; |
3463 | |
3464 | -import de.sub.goobi.Beans.Prozess; |
3465 | +import de.sub.goobi.beans.Prozess; |
3466 | import de.sub.goobi.helper.Helper; |
3467 | import de.sub.goobi.helper.PaginatingCriteria; |
3468 | |
3469 | |
3470 | === modified file 'src/org/goobi/production/search/api/IIndexer.java' |
3471 | --- src/org/goobi/production/search/api/IIndexer.java 2011-12-01 12:44:42 +0000 |
3472 | +++ src/org/goobi/production/search/api/IIndexer.java 2011-12-14 09:20:02 +0000 |
3473 | @@ -1,6 +1,6 @@ |
3474 | package org.goobi.production.search.api; |
3475 | |
3476 | -import de.sub.goobi.Beans.Prozess; |
3477 | +import de.sub.goobi.beans.Prozess; |
3478 | |
3479 | /** |
3480 | * This file is part of the Goobi Application - a Workflow tool for the support of mass digitization. |
3481 | |
3482 | === modified file 'src/org/goobi/production/search/lucene/LuceneFilter.java' |
3483 | --- src/org/goobi/production/search/lucene/LuceneFilter.java 2011-12-01 12:44:42 +0000 |
3484 | +++ src/org/goobi/production/search/lucene/LuceneFilter.java 2011-12-14 09:20:02 +0000 |
3485 | @@ -35,7 +35,7 @@ |
3486 | import org.hibernate.Session; |
3487 | import org.hibernate.criterion.Restrictions; |
3488 | |
3489 | -import de.sub.goobi.Beans.Prozess; |
3490 | +import de.sub.goobi.beans.Prozess; |
3491 | import de.sub.goobi.helper.Helper; |
3492 | import de.sub.goobi.helper.PaginatingCriteria; |
3493 | |
3494 | |
3495 | === modified file 'src/org/goobi/production/search/lucene/LuceneIndex.java' |
3496 | --- src/org/goobi/production/search/lucene/LuceneIndex.java 2011-12-01 12:44:42 +0000 |
3497 | +++ src/org/goobi/production/search/lucene/LuceneIndex.java 2011-12-14 09:20:02 +0000 |
3498 | @@ -50,14 +50,14 @@ |
3499 | import ugh.dl.DocStruct; |
3500 | import ugh.dl.Metadata; |
3501 | import ugh.dl.MetadataType; |
3502 | -import de.sub.goobi.Beans.Prozess; |
3503 | -import de.sub.goobi.Beans.Prozesseigenschaft; |
3504 | -import de.sub.goobi.Beans.Schritt; |
3505 | -import de.sub.goobi.Beans.Schritteigenschaft; |
3506 | -import de.sub.goobi.Beans.Vorlage; |
3507 | -import de.sub.goobi.Beans.Vorlageeigenschaft; |
3508 | -import de.sub.goobi.Beans.Werkstueck; |
3509 | -import de.sub.goobi.Beans.Werkstueckeigenschaft; |
3510 | +import de.sub.goobi.beans.Prozess; |
3511 | +import de.sub.goobi.beans.Prozesseigenschaft; |
3512 | +import de.sub.goobi.beans.Schritt; |
3513 | +import de.sub.goobi.beans.Schritteigenschaft; |
3514 | +import de.sub.goobi.beans.Vorlage; |
3515 | +import de.sub.goobi.beans.Vorlageeigenschaft; |
3516 | +import de.sub.goobi.beans.Werkstueck; |
3517 | +import de.sub.goobi.beans.Werkstueckeigenschaft; |
3518 | import de.sub.goobi.config.ConfigMain; |
3519 | import de.sub.goobi.helper.Helper; |
3520 | import de.sub.goobi.helper.enums.StepStatus; |
fine.