Permalink
Browse files

commit to sync

  • Loading branch information...
1 parent 72c3036 commit 88fda77fad7885d10299405248e191b5e26acbc8 @bastiensaquet bastiensaquet committed May 19, 2014
Showing with 19,062 additions and 19,062 deletions.
  1. +22 −22 .gitattributes
  2. +166 −166 .gitignore
  3. +26 −26 README.md
  4. +612 −612 pom.xml
  5. +1 −1 src/changes/changes.xml
  6. +221 −221 src/main/java/de/mpg/imeji/logic/Imeji.java
  7. +234 −234 src/main/java/de/mpg/imeji/logic/ImejiBean2RDF.java
  8. +141 −141 src/main/java/de/mpg/imeji/logic/ImejiRDF2Bean.java
  9. +68 −68 src/main/java/de/mpg/imeji/logic/auth/Authentication.java
  10. +52 −52 src/main/java/de/mpg/imeji/logic/auth/AuthenticationFactory.java
  11. +96 −96 src/main/java/de/mpg/imeji/logic/auth/Security.java
  12. +132 −132 src/main/java/de/mpg/imeji/logic/auth/authentication/HttpAuthentication.java
  13. +100 −100 src/main/java/de/mpg/imeji/logic/auth/authentication/SimpleAuthentication.java
  14. +49 −49 src/main/java/de/mpg/imeji/logic/auth/exception/AuthenticationError.java
  15. +51 −51 src/main/java/de/mpg/imeji/logic/auth/exception/NotAllowedError.java
  16. +55 −55 src/main/java/de/mpg/imeji/logic/concurrency/locks/Lock.java
  17. +228 −228 src/main/java/de/mpg/imeji/logic/concurrency/locks/Locks.java
  18. +81 −81 src/main/java/de/mpg/imeji/logic/concurrency/locks/LocksSurveyor.java
  19. +293 −293 src/main/java/de/mpg/imeji/logic/controller/AlbumController.java
  20. +329 −329 src/main/java/de/mpg/imeji/logic/controller/CollectionController.java
  21. +134 −134 src/main/java/de/mpg/imeji/logic/controller/GrantController.java
  22. +150 −150 src/main/java/de/mpg/imeji/logic/controller/ImejiController.java
  23. +466 −466 src/main/java/de/mpg/imeji/logic/controller/ItemController.java
  24. +212 −212 src/main/java/de/mpg/imeji/logic/controller/ProfileController.java
  25. +185 −185 src/main/java/de/mpg/imeji/logic/controller/UserController.java
  26. +179 −179 src/main/java/de/mpg/imeji/logic/controller/UserGroupController.java
  27. +31 −31 src/main/java/de/mpg/imeji/logic/controller/exceptions/AuthenticationException.java
  28. +31 −31 src/main/java/de/mpg/imeji/logic/controller/exceptions/AuthorizationException.java
  29. +167 −167 src/main/java/de/mpg/imeji/logic/export/Export.java
  30. +152 −152 src/main/java/de/mpg/imeji/logic/export/ExportManager.java
  31. +111 −111 src/main/java/de/mpg/imeji/logic/export/format/ExplainExport.java
  32. +104 −104 src/main/java/de/mpg/imeji/logic/export/format/JenaExport.java
  33. +310 −310 src/main/java/de/mpg/imeji/logic/export/format/RDFExport.java
  34. +91 −91 src/main/java/de/mpg/imeji/logic/export/format/SitemapExport.java
  35. +75 −75 src/main/java/de/mpg/imeji/logic/export/format/XMLExport.java
  36. +167 −167 src/main/java/de/mpg/imeji/logic/export/format/ZIPExport.java
  37. +92 −92 src/main/java/de/mpg/imeji/logic/export/format/explain/MetadataExplainExport.java
  38. +80 −80 src/main/java/de/mpg/imeji/logic/export/format/explain/SearchExplainExport.java
  39. +62 −62 src/main/java/de/mpg/imeji/logic/export/format/rdf/RDFAlbumExport.java
  40. +63 −63 src/main/java/de/mpg/imeji/logic/export/format/rdf/RDFCollectionExport.java
  41. +98 −98 src/main/java/de/mpg/imeji/logic/export/format/rdf/RDFImageExport.java
  42. +63 −63 src/main/java/de/mpg/imeji/logic/export/format/rdf/RDFProfileExport.java
  43. +49 −49 src/main/java/de/mpg/imeji/logic/export/format/xml/XMLItemsExport.java
  44. +50 −50 src/main/java/de/mpg/imeji/logic/export/format/xml/XMLMdProfileExport.java
  45. +46 −46 src/main/java/de/mpg/imeji/logic/index/Index.java
  46. +55 −55 src/main/java/de/mpg/imeji/logic/ingest/controller/IngestController.java
  47. +196 −196 src/main/java/de/mpg/imeji/logic/ingest/controller/IngestItemController.java
  48. +113 −113 src/main/java/de/mpg/imeji/logic/ingest/controller/IngestProfileController.java
  49. +39 −39 src/main/java/de/mpg/imeji/logic/ingest/factory/ItemSchemaFactory.java
  50. +71 −71 src/main/java/de/mpg/imeji/logic/ingest/jaxb/JaxbGenericObject.java
  51. +123 −123 src/main/java/de/mpg/imeji/logic/ingest/jaxb/JaxbUtil.java
  52. +60 −60 src/main/java/de/mpg/imeji/logic/ingest/jaxb/interfaces/IJaxbGenericObject.java
  53. +90 −90 src/main/java/de/mpg/imeji/logic/ingest/mapper/ItemMapperTask.java
  54. +90 −90 src/main/java/de/mpg/imeji/logic/ingest/mapper/ProfileMapperTask.java
  55. +54 −54 src/main/java/de/mpg/imeji/logic/ingest/parser/ItemParser.java
  56. +33 −33 src/main/java/de/mpg/imeji/logic/ingest/parser/ProfileParser.java
  57. +49 −49 src/main/java/de/mpg/imeji/logic/ingest/template/DuplicatedObject.java
  58. +16 −16 src/main/java/de/mpg/imeji/logic/ingest/util/ImejiSchemaFilename.java
  59. +65 −65 src/main/java/de/mpg/imeji/logic/ingest/validator/ItemContentValidator.java
  60. +22 −22 src/main/java/de/mpg/imeji/logic/ingest/validator/ItemValidator.java
  61. +195 −195 src/main/java/de/mpg/imeji/logic/ingest/validator/MetadataContentValidator.java
  62. +66 −66 src/main/java/de/mpg/imeji/logic/ingest/validator/MetadataSetContentValidator.java
  63. +11 −11 src/main/java/de/mpg/imeji/logic/ingest/validator/ProfileValidator.java
  64. +59 −59 src/main/java/de/mpg/imeji/logic/ingest/vo/IngestProfile.java
  65. +48 −48 src/main/java/de/mpg/imeji/logic/ingest/vo/Items.java
  66. +41 −41 src/main/java/de/mpg/imeji/logic/ingest/vo/MetadataProfiles.java
  67. +2 −2 src/main/java/de/mpg/imeji/logic/ingest/vo/jaxb.index
  68. +22 −22 src/main/java/de/mpg/imeji/logic/ingest/vo/package-info.java
  69. +30 −30 src/main/java/de/mpg/imeji/logic/search/FulltextIndex.java
  70. +155 −155 src/main/java/de/mpg/imeji/logic/search/query/SimpleSecurityQuery.java
  71. +109 −109 src/main/java/de/mpg/imeji/logic/search/util/CollectionUtils.java
  72. +206 −206 src/main/java/de/mpg/imeji/logic/search/util/SearchIndexInitializer.java
  73. +72 −72 src/main/java/de/mpg/imeji/logic/search/vo/ComparableSearchResult.java
  74. +133 −133 src/main/java/de/mpg/imeji/logic/search/vo/SearchElement.java
  75. +54 −54 src/main/java/de/mpg/imeji/logic/search/vo/SearchGroup.java
  76. +180 −180 src/main/java/de/mpg/imeji/logic/search/vo/SearchIndex.java
  77. +47 −47 src/main/java/de/mpg/imeji/logic/search/vo/SearchLogicalRelation.java
  78. +59 −59 src/main/java/de/mpg/imeji/logic/search/vo/SearchMetadata.java
  79. +13 −13 src/main/java/de/mpg/imeji/logic/search/vo/SearchOperators.java
  80. +92 −92 src/main/java/de/mpg/imeji/logic/search/vo/SearchPair.java
  81. +62 −62 src/main/java/de/mpg/imeji/logic/search/vo/SearchQuery.java
  82. +64 −64 src/main/java/de/mpg/imeji/logic/search/vo/SortCriterion.java
  83. +63 −63 src/main/java/de/mpg/imeji/logic/storage/StorageFactory.java
  84. +140 −140 src/main/java/de/mpg/imeji/logic/storage/UploadResult.java
  85. +269 −269 src/main/java/de/mpg/imeji/logic/storage/escidoc/EscidocUtils.java
  86. +297 −297 src/main/java/de/mpg/imeji/logic/storage/impl/EscidocStorage.java
  87. +157 −157 src/main/java/de/mpg/imeji/logic/storage/impl/ExternalStorage.java
  88. +52 −52 src/main/java/de/mpg/imeji/logic/storage/transform/ImageGenerator.java
  89. +205 −205 src/main/java/de/mpg/imeji/logic/storage/transform/ImageGeneratorManager.java
  90. +91 −91 src/main/java/de/mpg/imeji/logic/storage/transform/impl/MagickImageGenerator.java
  91. +54 −54 src/main/java/de/mpg/imeji/logic/storage/transform/impl/MicroscopeImageGenerator.java
  92. +65 −65 src/main/java/de/mpg/imeji/logic/storage/transform/impl/PdfImageGenerator.java
  93. +120 −120 src/main/java/de/mpg/imeji/logic/storage/transform/impl/RawFileImageGenerator.java
  94. +67 −67 src/main/java/de/mpg/imeji/logic/storage/transform/impl/SimpleAudioImageGenerator.java
  95. +60 −60 src/main/java/de/mpg/imeji/logic/storage/transform/impl/SimpleImageGenerator.java
  96. +65 −65 src/main/java/de/mpg/imeji/logic/storage/transform/impl/XuggleImageGenerator.java
  97. +189 −189 src/main/java/de/mpg/imeji/logic/storage/util/GifUtils.java
  98. +472 −472 src/main/java/de/mpg/imeji/logic/storage/util/ImageUtils.java
  99. +271 −271 src/main/java/de/mpg/imeji/logic/storage/util/JpegUtils.java
  100. +243 −243 src/main/java/de/mpg/imeji/logic/storage/util/MediaUtils.java
  101. +40 −40 src/main/java/de/mpg/imeji/logic/storage/util/MicroscopeUtils.java
  102. +235 −235 src/main/java/de/mpg/imeji/logic/storage/util/PdfUtils.java
  103. +278 −278 src/main/java/de/mpg/imeji/logic/storage/util/VideoUtils.java
  104. +40 −40 src/main/java/de/mpg/imeji/logic/util/Counter.java
  105. +165 −165 src/main/java/de/mpg/imeji/logic/util/IdentifierUtil.java
  106. +116 −116 src/main/java/de/mpg/imeji/logic/util/MetadataFactory.java
  107. +176 −176 src/main/java/de/mpg/imeji/logic/util/ObjectHelper.java
  108. +115 −115 src/main/java/de/mpg/imeji/logic/util/StringHelper.java
  109. +39 −39 src/main/java/de/mpg/imeji/logic/vo/Album.java
  110. +67 −67 src/main/java/de/mpg/imeji/logic/vo/CollectionImeji.java
  111. +71 −71 src/main/java/de/mpg/imeji/logic/vo/Container.java
  112. +74 −74 src/main/java/de/mpg/imeji/logic/vo/ContainerMetadata.java
  113. +170 −170 src/main/java/de/mpg/imeji/logic/vo/Metadata.java
  114. +99 −99 src/main/java/de/mpg/imeji/logic/vo/MetadataProfile.java
  115. +126 −126 src/main/java/de/mpg/imeji/logic/vo/MetadataSet.java
  116. +149 −149 src/main/java/de/mpg/imeji/logic/vo/Organization.java
  117. +201 −201 src/main/java/de/mpg/imeji/logic/vo/Person.java
  118. +273 −273 src/main/java/de/mpg/imeji/logic/vo/Statement.java
  119. +126 −126 src/main/java/de/mpg/imeji/logic/vo/UserGroup.java
  120. +15 −15 src/main/java/de/mpg/imeji/logic/vo/jaxb.index
  121. +24 −24 src/main/java/de/mpg/imeji/logic/vo/package-info.java
  122. +103 −103 src/main/java/de/mpg/imeji/logic/vo/predefinedMetadata/ConePerson.java
  123. +102 −102 src/main/java/de/mpg/imeji/logic/vo/predefinedMetadata/Date.java
  124. +120 −120 src/main/java/de/mpg/imeji/logic/vo/predefinedMetadata/License.java
  125. +100 −100 src/main/java/de/mpg/imeji/logic/vo/predefinedMetadata/Link.java
  126. +89 −89 src/main/java/de/mpg/imeji/logic/vo/predefinedMetadata/Number.java
  127. +112 −112 src/main/java/de/mpg/imeji/logic/vo/predefinedMetadata/Publication.java
  128. +84 −84 src/main/java/de/mpg/imeji/logic/vo/predefinedMetadata/Text.java
  129. +7 −7 src/main/java/de/mpg/imeji/logic/vo/predefinedMetadata/jaxb.index
  130. +18 −18 src/main/java/de/mpg/imeji/logic/vo/predefinedMetadata/package-info.java
  131. +35 −35 src/main/java/de/mpg/imeji/logic/vo/predefinedMetadata/util/MetadataTypesHelper.java
  132. +228 −228 src/main/java/de/mpg/imeji/presentation/admin/PrivateBean.java
  133. +658 −658 src/main/java/de/mpg/imeji/presentation/album/AlbumBean.java
  134. +121 −121 src/main/java/de/mpg/imeji/presentation/album/AlbumImageBean.java
  135. +294 −294 src/main/java/de/mpg/imeji/presentation/album/AlbumImagesBean.java
  136. +129 −129 src/main/java/de/mpg/imeji/presentation/album/AlbumsBean.java
  137. +103 −103 src/main/java/de/mpg/imeji/presentation/album/CreateAlbumBean.java
  138. +115 −115 src/main/java/de/mpg/imeji/presentation/auth/AuthenticationFilter.java
  139. +434 −434 src/main/java/de/mpg/imeji/presentation/auth/ImejiAuthBean.java
  140. +147 −147 src/main/java/de/mpg/imeji/presentation/beans/AuthorizationBean.java
  141. +691 −691 src/main/java/de/mpg/imeji/presentation/beans/BasePaginatorListSessionBean.java
  142. +71 −71 src/main/java/de/mpg/imeji/presentation/beans/BlogBean.java
  143. +196 −196 src/main/java/de/mpg/imeji/presentation/beans/ConfigurationBean.java
  144. +291 −291 src/main/java/de/mpg/imeji/presentation/beans/ContainerBean.java
  145. +60 −60 src/main/java/de/mpg/imeji/presentation/beans/DoctorBean.java
  146. +43 −43 src/main/java/de/mpg/imeji/presentation/beans/MessagesBean.java
  147. +311 −311 src/main/java/de/mpg/imeji/presentation/beans/Navigation.java
View
@@ -1,22 +1,22 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs diff=csharp
-*.sln merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc diff=astextplain
-*.DOC diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot diff=astextplain
-*.DOT diff=astextplain
-*.pdf diff=astextplain
-*.PDF diff=astextplain
-*.rtf diff=astextplain
-*.RTF diff=astextplain
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs diff=csharp
+*.sln merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc diff=astextplain
+*.DOC diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot diff=astextplain
+*.DOT diff=astextplain
+*.pdf diff=astextplain
+*.PDF diff=astextplain
+*.rtf diff=astextplain
+*.RTF diff=astextplain
View
@@ -1,166 +1,166 @@
-target/
-
-#################
-## Eclipse
-#################
-
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-
-#################
-## Visual Studio
-#################
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-[Dd]ebug/
-[Rr]elease/
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.vspscc
-.builds
-*.dotCover
-
-## TODO: If you have NuGet Package Restore enabled, uncomment this
-#packages/
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-
-# Visual Studio profiler
-*.psess
-*.vsp
-
-# ReSharper is a .NET coding add-in
-_ReSharper*
-
-# Installshield output folder
-[Ee]xpress
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish
-
-# Others
-[Bb]in
-[Oo]bj
-sql
-TestResults
-*.Cache
-ClientBin
-stylecop.*
-~$*
-*.dbmdl
-Generated_Code #added for RIA/Silverlight projects
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-
-
-
-############
-## Windows
-############
-
-# Windows image file caches
-Thumbs.db
-
-# Folder config file
-Desktop.ini
-
-
-#############
-## Python
-#############
-
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg
-
-# Mac crap
-.DS_Store
-/YOUR JREBEL LICENSE HAS EXPIRED!.error
+target/
+
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+.builds
+*.dotCover
+
+## TODO: If you have NuGet Package Restore enabled, uncomment this
+#packages/
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# Installshield output folder
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Others
+[Bb]in
+[Oo]bj
+sql
+TestResults
+*.Cache
+ClientBin
+stylecop.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+
+
+############
+## Windows
+############
+
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# Mac crap
+.DS_Store
+/YOUR JREBEL LICENSE HAS EXPIRED!.error
Oops, something went wrong.

0 comments on commit 88fda77

Please sign in to comment.