Permalink
Browse files

Crearte statement from batch edit

  • Loading branch information...
bastiensaquet committed Jan 2, 2017
1 parent 5091e47 commit eecdeda5757e96247759bd5041c95f7dd9ddfa00
Showing with 329 additions and 44,204 deletions.
  1. +0 −1 .gitignore
  2. +0 −27 pom.xml
  3. +9 −5 src/main/java/de/mpg/imeji/logic/ImejiInitializer.java
  4. +0 −12 src/main/java/de/mpg/imeji/logic/config/ImejiProperties.java
  5. +1 −1 src/main/java/de/mpg/imeji/logic/controller/resource/AlbumController.java
  6. +1 −1 src/main/java/de/mpg/imeji/logic/controller/resource/CollectionController.java
  7. +1 −1 src/main/java/de/mpg/imeji/logic/export/ExportManager.java
  8. +1 −1 src/main/java/de/mpg/imeji/logic/export/format/ZIPExport.java
  9. +8 −4 src/main/java/de/mpg/imeji/logic/{controller/resource → item}/ItemController.java
  10. +1 −3 src/main/java/de/mpg/imeji/logic/{service → }/item/ItemService.java
  11. +1 −1 src/main/java/de/mpg/imeji/logic/jobs/ElasticReIndexJob.java
  12. +1 −1 src/main/java/de/mpg/imeji/logic/jobs/FulltextAndTechnicalMetadataJob.java
  13. +1 −1 src/main/java/de/mpg/imeji/logic/jobs/ImportFileFromEscidocToInternalStorageJob.java
  14. +1 −1 src/main/java/de/mpg/imeji/logic/jobs/RefreshFileSizeJob.java
  15. +1 −1 src/main/java/de/mpg/imeji/logic/{service → }/statement/StatementController.java
  16. +15 −2 src/main/java/de/mpg/imeji/logic/{service → }/statement/StatementService.java
  17. +1 −2 src/main/java/de/mpg/imeji/logic/storage/internal/InternalStorageManager.java
  18. +4 −3 src/main/java/de/mpg/imeji/logic/vo/Statement.java
  19. +0 −1 src/main/java/de/mpg/imeji/logic/vo/StatementType.java
  20. +1 −1 src/main/java/de/mpg/imeji/presentation/album/AlbumBean.java
  21. +1 −1 src/main/java/de/mpg/imeji/presentation/album/AlbumItemsBean.java
  22. +1 −1 src/main/java/de/mpg/imeji/presentation/beans/ContainerBean.java
  23. +1 −1 src/main/java/de/mpg/imeji/presentation/beans/MetadataLabels.java
  24. +1 −13 src/main/java/de/mpg/imeji/presentation/beans/Navigation.java
  25. +1 −1 src/main/java/de/mpg/imeji/presentation/beans/StartPageBean.java
  26. +1 −1 src/main/java/de/mpg/imeji/presentation/collection/CollectionActionMenu.java
  27. +1 −1 src/main/java/de/mpg/imeji/presentation/collection/CollectionItemsBean.java
  28. +1 −1 src/main/java/de/mpg/imeji/presentation/collection/CollectionListItem.java
  29. +1 −1 src/main/java/de/mpg/imeji/presentation/facet/CollectionFacets.java
  30. +1 −1 src/main/java/de/mpg/imeji/presentation/history/HistoryPage.java
  31. +2 −14 src/main/java/de/mpg/imeji/presentation/item/ItemBean.java
  32. +1 −1 src/main/java/de/mpg/imeji/presentation/item/ItemDetailsBrowse.java
  33. +1 −1 src/main/java/de/mpg/imeji/presentation/item/ItemsBean.java
  34. +1 −1 src/main/java/de/mpg/imeji/presentation/item/ItemsEditLicenseBean.java
  35. +2 −2 src/main/java/de/mpg/imeji/presentation/metadata/EditItemMetadataBean.java
  36. +25 −3 src/main/java/de/mpg/imeji/presentation/metadata/EditMetadataAbstract.java
  37. +1 −1 src/main/java/de/mpg/imeji/presentation/metadata/SingleEditorWrapper.java
  38. +106 −0 src/main/java/de/mpg/imeji/presentation/metadata/StatementComponent.java
  39. +15 −0 src/main/java/de/mpg/imeji/presentation/metadata/editItem/EditMetadataItemBean.java
  40. +4 −1 src/main/java/de/mpg/imeji/presentation/metadata/editSelected/CellComponent.java
  41. +36 −46 src/main/java/de/mpg/imeji/presentation/metadata/editSelected/EditMetadataSelectedItemsBean.java
  42. +6 −4 src/main/java/de/mpg/imeji/presentation/metadata/editSelected/RowComponent.java
  43. +1 −1 src/main/java/de/mpg/imeji/presentation/metadata/editors/AbstractMetadataEditor.java
  44. +1 −1 src/main/java/de/mpg/imeji/presentation/metadata/util/SuggestBean.java
  45. +1 −1 src/main/java/de/mpg/imeji/presentation/servlet/DataViewerServlet.java
  46. +0 −209 src/main/java/de/mpg/imeji/presentation/servlet/DigilibServlet.java
  47. +1 −1 src/main/java/de/mpg/imeji/presentation/session/SessionObjectsController.java
  48. +1 −1 src/main/java/de/mpg/imeji/presentation/share/ShareBean.java
  49. +1 −1 src/main/java/de/mpg/imeji/presentation/share/ShareUtil.java
  50. +1 −1 src/main/java/de/mpg/imeji/presentation/statement/StatementCreateBean.java
  51. +1 −7 src/main/java/de/mpg/imeji/presentation/storage/FileServlet.java
  52. +1 −1 src/main/java/de/mpg/imeji/presentation/storage/StorageUtil.java
  53. +1 −1 src/main/java/de/mpg/imeji/presentation/upload/SingleUploadBean.java
  54. +1 −1 src/main/java/de/mpg/imeji/presentation/upload/UploadBean.java
  55. +1 −1 src/main/java/de/mpg/imeji/rest/api/AlbumService.java
  56. +1 −1 src/main/java/de/mpg/imeji/rest/api/CollectionService.java
  57. +1 −1 src/main/java/de/mpg/imeji/rest/api/DefaultItemService.java
  58. +0 −6 src/main/resources/imeji.properties
  59. +0 −70 src/main/webapp/DigilibImage.xhtml
  60. +3 −3 src/main/webapp/EditMetadataSelectedItems.xhtml
  61. +0 −78 src/main/webapp/WEB-INF/digilib-config.xml
  62. +0 −11 src/main/webapp/WEB-INF/pretty-config.xml
  63. +2 −35 src/main/webapp/WEB-INF/web.xml
  64. +6 −1 src/main/webapp/resources/components/metadata/input.xhtml
  65. +6 −1 src/main/webapp/resources/components/metadata/output.xhtml
  66. +20 −8 src/main/webapp/resources/components/metadata/select.xhtml
  67. +0 −2,825 src/main/webapp/resources/digilib/jquery/annotator-dl.js
  68. +0 −11 src/main/webapp/resources/digilib/jquery/annotator-dl.min.js
  69. +0 −1 src/main/webapp/resources/digilib/jquery/annotator.min.css
  70. +0 −67 src/main/webapp/resources/digilib/jquery/digilib-ann.html
  71. +0 −51 src/main/webapp/resources/digilib/jquery/digilib-auth.html
  72. +0 −69 src/main/webapp/resources/digilib/jquery/digilib-mpiwg.html
  73. +0 −49 src/main/webapp/resources/digilib/jquery/digilib.html
  74. BIN src/main/webapp/resources/digilib/jquery/img/annotationmark-bg-16.png
  75. BIN src/main/webapp/resources/digilib/jquery/img/blue.png
  76. BIN src/main/webapp/resources/digilib/jquery/img/digilib-denied.png
  77. +0 −239 src/main/webapp/resources/digilib/jquery/img/digilib-denied.svg
  78. BIN src/main/webapp/resources/digilib/jquery/img/digilib-error.png
  79. +0 −234 src/main/webapp/resources/digilib/jquery/img/digilib-error.svg
  80. BIN src/main/webapp/resources/digilib/jquery/img/digilib-logo-small.png
  81. +0 −219 src/main/webapp/resources/digilib/jquery/img/digilib-logo-sw.svg
  82. BIN src/main/webapp/resources/digilib/jquery/img/digilib-logo-text1.png
  83. BIN src/main/webapp/resources/digilib/jquery/img/digilib-logo.png
  84. +0 −217 src/main/webapp/resources/digilib/jquery/img/digilib-logo.svg
  85. BIN src/main/webapp/resources/digilib/jquery/img/digilib-notfound.png
  86. +0 −230 src/main/webapp/resources/digilib/jquery/img/digilib-notfound.svg
  87. +0 −1,081 src/main/webapp/resources/digilib/jquery/img/embedded.svg
  88. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/addregion.png
  89. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/back.png
  90. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/birds-eye.png
  91. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/brightness.png
  92. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/calibration-x.png
  93. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/calibration-y.png
  94. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/cat.png
  95. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/contrast.png
  96. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/delmark.png
  97. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/delregion.png
  98. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/down.png
  99. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/fonds.png
  100. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/fwd.png
  101. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/help.png
  102. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/left.png
  103. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/mark.png
  104. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/mirror-horizontal.png
  105. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/mirror-vertical.png
  106. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/options.png
  107. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/original-size.png
  108. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/page.png
  109. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/pagewidth.png
  110. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/pixel-by-pixel.png
  111. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/quality.png
  112. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/reference.png
  113. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/regioninfo.png
  114. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/regions.png
  115. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/reset.png
  116. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/rgb.png
  117. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/right.png
  118. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/rotate.png
  119. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/size.png
  120. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/up.png
  121. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/zoom-area.png
  122. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/zoom-full.png
  123. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/zoom-in.png
  124. BIN src/main/webapp/resources/digilib/jquery/img/embedded/16/zoom-out.png
  125. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/addregion.png
  126. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/back.png
  127. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/birds-eye.png
  128. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/brightness.png
  129. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/calibration-x.png
  130. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/calibration-y.png
  131. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/cat.png
  132. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/contrast.png
  133. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/delmark.png
  134. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/delregion.png
  135. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/down.png
  136. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/fonds.png
  137. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/fwd.png
  138. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/help.png
  139. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/left.png
  140. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/mark.png
  141. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/mirror-horizontal.png
  142. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/mirror-vertical.png
  143. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/options.png
  144. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/original-size.png
  145. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/page.png
  146. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/pagewidth.png
  147. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/pixel-by-pixel.png
  148. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/quality.png
  149. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/reference.png
  150. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/regioninfo.png
  151. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/regions.png
  152. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/reset.png
  153. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/rgb.png
  154. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/right.png
  155. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/rotate.png
  156. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/size.png
  157. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/up.png
  158. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/zoom-area.png
  159. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/zoom-full.png
  160. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/zoom-in.png
  161. BIN src/main/webapp/resources/digilib/jquery/img/embedded/32/zoom-out.png
  162. +0 −14 src/main/webapp/resources/digilib/jquery/img/embedded_icons.cmd
  163. +0 −43 src/main/webapp/resources/digilib/jquery/img/embedded_icons.xsl
  164. +0 −1,226 src/main/webapp/resources/digilib/jquery/img/fullscreen.svg
  165. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/addregion.png
  166. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/annotation-mark.png
  167. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/annotation-region.png
  168. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/annotation-user.png
  169. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/annotations.png
  170. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/back.png
  171. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/bg.png
  172. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/birds-eye.png
  173. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/brightness.png
  174. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/buttons-less.png
  175. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/buttons-more.png
  176. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/calibration.png
  177. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/cat.png
  178. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/contrast.png
  179. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/corona.png
  180. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/delallregions.png
  181. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/delmark.png
  182. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/delregion.png
  183. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/delregions.png
  184. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/digilib.png
  185. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/down.png
  186. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/findcoords.png
  187. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/findregion.png
  188. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/first.png
  189. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/fwd.png
  190. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/help.png
  191. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/info.png
  192. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/last.png
  193. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/left.png
  194. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/mark.png
  195. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/mirror-horizontal.png
  196. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/mirror-vertical.png
  197. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/options.png
  198. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/original-size.png
  199. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/page.png
  200. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/pagewidth.png
  201. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/quality.png
  202. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/reference.png
  203. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/regioninfo.png
  204. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/regions.png
  205. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/reset.png
  206. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/rgb.png
  207. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/right.png
  208. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/rotate.png
  209. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/showregions.png
  210. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/size-bigger.png
  211. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/size-smaller.png
  212. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/up.png
  213. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/whitedisc.png
  214. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/zoom-area.png
  215. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/zoom-full.png
  216. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/zoom-in.png
  217. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/32/zoom-out.png
  218. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/corona.png
  219. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/old/blue.png
  220. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/old/brightness-on.png
  221. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/old/calibration-x.png
  222. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/old/calibration-y.png
  223. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/old/contrast-on.png
  224. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/old/pixel-by-pixel.png
  225. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/old/rgb-on.png
  226. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/old/rotate-on.png
  227. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/old/size.png
  228. BIN src/main/webapp/resources/digilib/jquery/img/fullscreen/whitedisc.png
  229. +0 −1,203 src/main/webapp/resources/digilib/jquery/img/fullscreen2.svg
  230. +0 −1,661 src/main/webapp/resources/digilib/jquery/img/fullscreen3.svg
  231. +0 −26 src/main/webapp/resources/digilib/jquery/img/gen_fullscreen_icons.cmd
  232. +0 −30 src/main/webapp/resources/digilib/jquery/img/gen_fullscreen_icons.sh
  233. +0 −45 src/main/webapp/resources/digilib/jquery/img/gen_fullscreen_icons.xsl
  234. +0 −11 src/main/webapp/resources/digilib/jquery/img/make_icon.cmd
  235. BIN src/main/webapp/resources/digilib/jquery/img/mark-bg-16.png
  236. BIN src/main/webapp/resources/digilib/jquery/img/mark-bg.png
  237. BIN src/main/webapp/resources/digilib/jquery/img/range-rail-x.png
  238. BIN src/main/webapp/resources/digilib/jquery/img/range-thumb.png
  239. BIN src/main/webapp/resources/digilib/jquery/img/ruler-top.gif
  240. BIN src/main/webapp/resources/digilib/jquery/img/slidertest.jpg
  241. +0 −9,266 src/main/webapp/resources/digilib/jquery/jquery-1.7.1.js
  242. +0 −47 src/main/webapp/resources/digilib/jquery/jquery-digilib-plugins.txt
  243. +0 −110 src/main/webapp/resources/digilib/jquery/jquery-test-embedded-rc.html
  244. +0 −125 src/main/webapp/resources/digilib/jquery/jquery-test-embedded.html
  245. +0 −50 src/main/webapp/resources/digilib/jquery/jquery-test-full-rc.html
  246. +0 −99 src/main/webapp/resources/digilib/jquery/jquery-test-full.html
  247. +0 −182 src/main/webapp/resources/digilib/jquery/jquery-test-svg.html
  248. +0 −96 src/main/webapp/resources/digilib/jquery/jquery.cookie.js
  249. +0 −678 src/main/webapp/resources/digilib/jquery/jquery.digilib.annotator.js
  250. +0 −306 src/main/webapp/resources/digilib/jquery/jquery.digilib.arrows.js
  251. +0 −127 src/main/webapp/resources/digilib/jquery/jquery.digilib.auth.js
  252. +0 −346 src/main/webapp/resources/digilib/jquery/jquery.digilib.birdseye.js
  253. +0 −510 src/main/webapp/resources/digilib/jquery/jquery.digilib.buttons.js
  254. +0 −427 src/main/webapp/resources/digilib/jquery/jquery.digilib.css
  255. +0 −233 src/main/webapp/resources/digilib/jquery/jquery.digilib.dialogs.js
  256. +0 −582 src/main/webapp/resources/digilib/jquery/jquery.digilib.geometry.js
  257. +0 −1,796 src/main/webapp/resources/digilib/jquery/jquery.digilib.js
  258. +0 −225 src/main/webapp/resources/digilib/jquery/jquery.digilib.marks.js
  259. +0 −119 src/main/webapp/resources/digilib/jquery/jquery.digilib.pluginstub.js
  260. +0 −820 src/main/webapp/resources/digilib/jquery/jquery.digilib.regions.js
  261. +0 −483 src/main/webapp/resources/digilib/jquery/jquery.digilib.sliders.js
  262. +0 −12 src/main/webapp/resources/digilib/jquery/jquery.digilib.svg.css
  263. +0 −290 src/main/webapp/resources/digilib/jquery/jquery.digilib.svg.js
  264. +0 −9,266 src/main/webapp/resources/digilib/jquery/jquery.js
  265. +0 −27 src/main/webapp/resources/digilib/jquery/jquery.range.css
  266. +0 −287 src/main/webapp/resources/digilib/jquery/jquery.range.js
  267. +0 −13 src/main/webapp/resources/digilib/jquery/jquery.tools-tt-1.2.7.min.js
  268. +0 −13 src/main/webapp/resources/digilib/jquery/jquery.tools.min.js
  269. +0 −487 src/main/webapp/resources/digilib/jquery/json2.js
  270. +0 −419 src/main/webapp/resources/digilib/jquery/showdown.js
  271. +0 −1,050 src/main/webapp/resources/digilib/jquery/svg/archimedes.json
  272. +0 −157 src/main/webapp/resources/digilib/jquery/svg/archimedes.xml
  273. +0 −3 src/main/webapp/resources/digilib/jquery/svg/blank.svg
  274. +0 −69 src/main/webapp/resources/digilib/jquery/svg/jquery.svg.compat-1.0.1.js
  275. +0 −15 src/main/webapp/resources/digilib/jquery/svg/jquery.svg.css
  276. +0 −1,394 src/main/webapp/resources/digilib/jquery/svg/jquery.svg.js
  277. +0 −473 src/main/webapp/resources/digilib/jquery/svg/jquery.svganim.js
  278. +0 −406 src/main/webapp/resources/digilib/jquery/svg/jquery.svgdom.js
  279. +0 −402 src/main/webapp/resources/digilib/jquery/svg/jquery.svgfilter.js
  280. +0 −1,482 src/main/webapp/resources/digilib/jquery/svg/jquery.svggraph.js
  281. +0 −817 src/main/webapp/resources/digilib/jquery/svg/jquery.svgplot.js
  282. +0 −161 src/main/webapp/resources/digilib/jquery/svg/lion.svg
  283. +0 −153 src/main/webapp/resources/digilib/jquery/svg/svgBasics.html
  284. +12 −13 src/main/webapp/templates/component/images/image_details.xhtml
  285. +1 −1 src/test/java/de/mpg/imeji/test/logic/controller/ControllerTest.java
  286. +1 −1 src/test/java/de/mpg/imeji/test/rest/resources/test/integration/ItemTestBase.java
  287. +1 −1 src/test/java/de/mpg/imeji/testimpl/logic/auth/FileAuthorizationTest.java
  288. +1 −1 src/test/java/de/mpg/imeji/testimpl/logic/controller/ItemControllerTestClass.java
  289. +1 −1 src/test/java/de/mpg/imeji/testimpl/logic/controller/ShareControllerTestClass.java
  290. +1 −1 src/test/java/de/mpg/imeji/testimpl/logic/controller/StatisticsControllerTestClass.java
  291. +1 −1 src/test/java/de/mpg/imeji/testimpl/logic/controller/UserControllerTestClass.java
  292. +1 −1 src/test/java/de/mpg/imeji/testimpl/rest/resources/item/ItemUpdateFile.java
View
@@ -162,7 +162,6 @@ pip-log.txt
# Mac crap
.DS_Store
/YOUR JREBEL LICENSE HAS EXPIRED!.error
digilib-config.xml
items-out.xml
# jRebel
View
27 pom.xml
@@ -429,33 +429,6 @@
<artifactId>im4java</artifactId>
<version>1.2.0</version>
</dependency>
<!-- START: Digilib integration -->
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-servlet2</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-common</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-servlet</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.devlib.schmidt</groupId>
<artifactId>imageinfo</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>com.github.jai-imageio</groupId>
<artifactId>jai-imageio-core</artifactId>
<version>1.3.0</version>
</dependency>
<!-- END: Digilib integration -->
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
@@ -61,11 +61,15 @@
* @throws ImejiException
*
*/
public static void init() throws IOException, URISyntaxException, ImejiException {
Imeji.tdbPath = PropertyReader.getProperty("imeji.tdb.path");
ElasticInitializer.start();
ImejiInitializer.init(Imeji.tdbPath);
Imeji.getNIGHTLY_EXECUTOR().start();
public static void init() {
try {
Imeji.tdbPath = PropertyReader.getProperty("imeji.tdb.path");
ElasticInitializer.start();
ImejiInitializer.init(Imeji.tdbPath);
Imeji.getNIGHTLY_EXECUTOR().start();
} catch (Exception e) {
LOGGER.fatal("Error initializing imeji", e);
}
}
@@ -17,10 +17,6 @@
*
*/
public class ImejiProperties {
/**
* True if Digilib is enabled
*/
private boolean digilibEnabled = false;
/**
* The base of the path to the internal storage
*/
@@ -46,7 +42,6 @@ public ImejiProperties() {
public void load() {
try {
PropertyReader.loadProperties();
digilibEnabled = Boolean.parseBoolean(getProperty("imeji.digilib.enable"));
internalStorageBase = FilenameUtils
.getBaseName(FilenameUtils.normalizeNoEndSeparator(getProperty("imeji.storage.path")));
applicationURL = StringHelper.normalizeURI(getProperty("imeji.instance.url"));
@@ -90,13 +85,6 @@ private void readBaseUri() {
ObjectHelper.baseUri = baseURI;
}
/**
* @return the digilibEnabled
*/
public boolean isDigilibEnabled() {
return digilibEnabled;
}
/**
* @return the internalStorageBase
* @throws URISyntaxException
@@ -24,6 +24,7 @@
import de.mpg.imeji.exceptions.UnprocessableError;
import de.mpg.imeji.j2j.helper.J2JHelper;
import de.mpg.imeji.logic.Imeji;
import de.mpg.imeji.logic.item.ItemService;
import de.mpg.imeji.logic.reader.ReaderFacade;
import de.mpg.imeji.logic.search.Search;
import de.mpg.imeji.logic.search.Search.SearchObjectTypes;
@@ -40,7 +41,6 @@
import de.mpg.imeji.logic.search.model.SortCriterion;
import de.mpg.imeji.logic.security.util.SecurityUtil;
import de.mpg.imeji.logic.service.ImejiServiceAbstract;
import de.mpg.imeji.logic.service.item.ItemService;
import de.mpg.imeji.logic.vo.Album;
import de.mpg.imeji.logic.vo.Item;
import de.mpg.imeji.logic.vo.Properties.Status;
@@ -23,6 +23,7 @@
import de.mpg.imeji.exceptions.UnprocessableError;
import de.mpg.imeji.j2j.helper.J2JHelper;
import de.mpg.imeji.logic.Imeji;
import de.mpg.imeji.logic.item.ItemService;
import de.mpg.imeji.logic.reader.ReaderFacade;
import de.mpg.imeji.logic.search.Search;
import de.mpg.imeji.logic.search.Search.SearchObjectTypes;
@@ -38,7 +39,6 @@
import de.mpg.imeji.logic.search.model.SortCriterion;
import de.mpg.imeji.logic.security.util.SecurityUtil;
import de.mpg.imeji.logic.service.ImejiServiceAbstract;
import de.mpg.imeji.logic.service.item.ItemService;
import de.mpg.imeji.logic.validation.impl.CollectionValidator;
import de.mpg.imeji.logic.validation.impl.Validator.Method;
import de.mpg.imeji.logic.vo.CollectionImeji;
@@ -16,10 +16,10 @@
import de.mpg.imeji.logic.controller.resource.AlbumController;
import de.mpg.imeji.logic.controller.resource.CollectionController;
import de.mpg.imeji.logic.export.format.Export;
import de.mpg.imeji.logic.item.ItemService;
import de.mpg.imeji.logic.search.SearchQueryParser;
import de.mpg.imeji.logic.search.model.SearchQuery;
import de.mpg.imeji.logic.search.model.SearchResult;
import de.mpg.imeji.logic.service.item.ItemService;
import de.mpg.imeji.logic.util.ObjectHelper;
import de.mpg.imeji.logic.vo.Album;
import de.mpg.imeji.logic.vo.CollectionImeji;
@@ -41,8 +41,8 @@
import de.mpg.imeji.exceptions.ImejiException;
import de.mpg.imeji.logic.Imeji;
import de.mpg.imeji.logic.item.ItemService;
import de.mpg.imeji.logic.search.model.SearchResult;
import de.mpg.imeji.logic.service.item.ItemService;
import de.mpg.imeji.logic.storage.StorageController;
import de.mpg.imeji.logic.vo.Item;
import de.mpg.imeji.logic.vo.User;
@@ -1,4 +1,4 @@
package de.mpg.imeji.logic.controller.resource;
package de.mpg.imeji.logic.item;
import java.net.URI;
import java.util.ArrayList;
@@ -15,7 +15,6 @@
import de.mpg.imeji.logic.Imeji;
import de.mpg.imeji.logic.reader.ReaderFacade;
import de.mpg.imeji.logic.service.ImejiServiceAbstract;
import de.mpg.imeji.logic.service.item.ItemService;
import de.mpg.imeji.logic.storage.Storage;
import de.mpg.imeji.logic.util.LicenseUtil;
import de.mpg.imeji.logic.vo.CollectionImeji;
@@ -35,8 +34,13 @@
*/
public class ItemController extends ImejiServiceAbstract {
private static final Logger LOGGER = Logger.getLogger(ItemService.class);
private static final ReaderFacade READER = new ReaderFacade(Imeji.imageModel);
private static final WriterFacade WRITER = new WriterFacade(Imeji.imageModel);
private final ReaderFacade READER;
private final WriterFacade WRITER;
public ItemController() {
READER = new ReaderFacade(Imeji.imageModel);
WRITER = new WriterFacade(Imeji.imageModel);
}
/**
* Create a {@link List} of {@link Item} in a {@link CollectionImeji}. This method is faster than
@@ -1,7 +1,7 @@
/**
* License: src/main/resources/license/escidoc.license
*/
package de.mpg.imeji.logic.service.item;
package de.mpg.imeji.logic.item;
import static com.google.common.base.Strings.isNullOrEmpty;
@@ -26,7 +26,6 @@
import de.mpg.imeji.exceptions.UnprocessableError;
import de.mpg.imeji.logic.Imeji;
import de.mpg.imeji.logic.controller.resource.ContentController;
import de.mpg.imeji.logic.controller.resource.ItemController;
import de.mpg.imeji.logic.search.Search;
import de.mpg.imeji.logic.search.Search.SearchObjectTypes;
import de.mpg.imeji.logic.search.elasticsearch.ElasticIndexer;
@@ -785,5 +784,4 @@ public SearchResult search(SearchQuery searchQuery, SortCriterion sortCri, User
LOGGER.info(uris.size() + " items found, retrieving...");
return (List<Item>) retrieveBatch(uris, -1, 0, Imeji.adminUser);
}
}
@@ -9,11 +9,11 @@
import de.mpg.imeji.logic.controller.resource.CollectionController;
import de.mpg.imeji.logic.controller.resource.ContentController;
import de.mpg.imeji.logic.controller.resource.SpaceController;
import de.mpg.imeji.logic.item.ItemService;
import de.mpg.imeji.logic.search.elasticsearch.ElasticIndexer;
import de.mpg.imeji.logic.search.elasticsearch.ElasticInitializer;
import de.mpg.imeji.logic.search.elasticsearch.ElasticService;
import de.mpg.imeji.logic.search.elasticsearch.ElasticService.ElasticTypes;
import de.mpg.imeji.logic.service.item.ItemService;
import de.mpg.imeji.logic.user.controller.GroupBusinessController;
import de.mpg.imeji.logic.user.controller.UserBusinessController;
import de.mpg.imeji.logic.vo.Album;
@@ -4,7 +4,7 @@
import org.apache.log4j.Logger;
import de.mpg.imeji.logic.service.item.ItemService;
import de.mpg.imeji.logic.item.ItemService;
/**
* Job to extract fulltext and technical metadata for all files
@@ -9,7 +9,7 @@
import org.apache.commons.io.FilenameUtils;
import org.apache.log4j.Logger;
import de.mpg.imeji.logic.service.item.ItemService;
import de.mpg.imeji.logic.item.ItemService;
import de.mpg.imeji.logic.storage.StorageController;
import de.mpg.imeji.logic.storage.UploadResult;
import de.mpg.imeji.logic.util.ObjectHelper;
@@ -9,9 +9,9 @@
import de.mpg.imeji.exceptions.ImejiException;
import de.mpg.imeji.logic.Imeji;
import de.mpg.imeji.logic.item.ItemService;
import de.mpg.imeji.logic.search.jenasearch.ImejiSPARQL;
import de.mpg.imeji.logic.search.jenasearch.JenaCustomQueries;
import de.mpg.imeji.logic.service.item.ItemService;
import de.mpg.imeji.logic.storage.internal.InternalStorageManager;
import de.mpg.imeji.logic.storage.util.ImageUtils;
import de.mpg.imeji.logic.vo.Item;
@@ -1,4 +1,4 @@
package de.mpg.imeji.logic.service.statement;
package de.mpg.imeji.logic.statement;
import java.net.URI;
import java.util.ArrayList;
@@ -1,4 +1,4 @@
package de.mpg.imeji.logic.service.statement;
package de.mpg.imeji.logic.statement;
import java.util.List;
@@ -39,6 +39,18 @@ public Statement create(Statement statement, User user) throws ImejiException {
return controller.create(statement, user);
}
/**
* Create a list of {@link Statement}
*
* @param statement
* @param user
* @return
* @throws ImejiException
*/
public List<Statement> createBatch(List<Statement> l, User user) throws ImejiException {
return controller.createBatch(l, user);
}
/**
* Retrieve a {@link Statement}
*
@@ -101,7 +113,8 @@ public SearchResult search(SearchQuery searchQuery, SortCriterion sortCri, User
@Override
public List<Statement> retrieveAll() throws ImejiException {
List<String> uris = ImejiSPARQL.exec(JenaCustomQueries.selectItemAll(), Imeji.statementModel);
List<String> uris =
ImejiSPARQL.exec(JenaCustomQueries.selectStatementAll(), Imeji.statementModel);
return (List<Statement>) retrieveBatch(uris, Imeji.adminUser);
}
}
@@ -161,8 +161,7 @@ public void removeFile(String url) {
if (f.exists()) {
boolean deleted = FileUtils.deleteQuietly(f);
if (!deleted) {
throw new RuntimeException(
"Impossible to delete the existing file. Please close all Digilib pages and try later.");
throw new RuntimeException("Impossible to delete the existing file.");
}
}
}
@@ -33,11 +33,12 @@
public class Statement implements Serializable, Cloneable {
private static final long serialVersionUID = -7950561563075491540L;
private String id;
private StatementType type = StatementType.TEXT;
private URI uri;
@j2jLiteral("http://imeji.org/terms/index")
private String index;
@j2jLiteral("http://purl.org/dc/terms/type")
private StatementType type = StatementType.TEXT;
private String typeString = type.name();
@j2jList("http://purl.org/dc/terms/name")
private List<String> names = new ArrayList<>();
@j2jResource("http://purl.org/dc/dcam/VocabularyEncodingScheme")
@@ -51,11 +52,13 @@ public Statement() {
}
public StatementType getType() {
type = StatementType.valueOf(typeString);
return type;
}
public void setType(StatementType type) {
this.type = type;
this.typeString = type.name();
}
/**
@@ -154,8 +157,6 @@ public Statement clone() {
return clone;
}
/**
* Comparator to sort String ignoring the case
*
@@ -8,5 +8,4 @@
*/
public enum StatementType {
TEXT, NUMBER, GEOLOCATION, DATE, PERSON, URL;
}
@@ -19,7 +19,7 @@
import de.mpg.imeji.exceptions.ImejiException;
import de.mpg.imeji.logic.Imeji;
import de.mpg.imeji.logic.controller.resource.AlbumController;
import de.mpg.imeji.logic.service.item.ItemService;
import de.mpg.imeji.logic.item.ItemService;
import de.mpg.imeji.logic.user.controller.UserBusinessController;
import de.mpg.imeji.logic.util.ObjectHelper;
import de.mpg.imeji.logic.util.UrlHelper;
@@ -16,10 +16,10 @@
import de.mpg.imeji.exceptions.ImejiException;
import de.mpg.imeji.logic.Imeji;
import de.mpg.imeji.logic.controller.resource.AlbumController;
import de.mpg.imeji.logic.item.ItemService;
import de.mpg.imeji.logic.search.model.SearchQuery;
import de.mpg.imeji.logic.search.model.SearchResult;
import de.mpg.imeji.logic.search.model.SortCriterion;
import de.mpg.imeji.logic.service.item.ItemService;
import de.mpg.imeji.logic.util.ObjectHelper;
import de.mpg.imeji.logic.util.UrlHelper;
import de.mpg.imeji.logic.vo.Album;
@@ -35,8 +35,8 @@
import de.mpg.imeji.exceptions.UnprocessableError;
import de.mpg.imeji.logic.Imeji;
import de.mpg.imeji.logic.doi.DoiService;
import de.mpg.imeji.logic.item.ItemService;
import de.mpg.imeji.logic.search.model.SearchIndex.SearchFields;
import de.mpg.imeji.logic.service.item.ItemService;
import de.mpg.imeji.logic.search.model.SearchOperators;
import de.mpg.imeji.logic.search.model.SearchPair;
import de.mpg.imeji.logic.search.model.SearchQuery;
@@ -14,7 +14,7 @@
import de.mpg.imeji.exceptions.ImejiException;
import de.mpg.imeji.logic.Imeji;
import de.mpg.imeji.logic.service.statement.StatementService;
import de.mpg.imeji.logic.statement.StatementService;
import de.mpg.imeji.logic.vo.Item;
import de.mpg.imeji.logic.vo.Statement;
Oops, something went wrong.

0 comments on commit eecdeda

Please sign in to comment.