Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 51fe8e3 + 0f779c4 commit bb555ea78baa4e1b730bdb1c8153a8db16a390fc @tdonohue tdonohue committed Jun 11, 2012
Showing with 4,195 additions and 20,718 deletions.
  1. +1 −1 LICENSE
  2. +69 −1 dspace-api/pom.xml
  3. +2 −2 dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java
  4. +1 −1 dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
  5. +5 −0 dspace-api/src/main/java/org/dspace/app/mediafilter/XPDF2Thumbnail.java
  6. +5 −2 dspace-api/src/main/java/org/dspace/app/util/GoogleMetadata.java
  7. +1 −1 dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java
  8. +14 −2 dspace-api/src/main/java/org/dspace/authenticate/LDAPHierarchicalAuthentication.java
  9. +46 −75 dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java
  10. +1 −1 dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
  11. +80 −0 dspace-api/src/main/java/org/dspace/browse/InitializeBrowseDatabase.java
  12. +2 −2 dspace-api/src/main/java/org/dspace/checker/BitstreamInfoDAO.java
  13. +2 −2 dspace-api/src/main/java/org/dspace/content/InstallItem.java
  14. +1 −1 dspace-api/src/main/java/org/dspace/content/authority/ChoiceAuthority.java
  15. +1 −1 dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java
  16. +1 −1 dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSDisseminator.java
  17. +1 −1 dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSIngester.java
  18. +1 −1 dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java
  19. +2 −2 dspace-api/src/main/java/org/dspace/content/packager/PDFPackager.java
  20. +1 −1 dspace-api/src/main/java/org/dspace/curate/Suspendable.java
  21. +1 −1 dspace-api/src/main/java/org/dspace/handle/HandleManager.java
  22. +5 −35 dspace-api/src/main/java/org/dspace/storage/rdbms/InitializeDatabase.java
  23. +8 −0 dspace-api/src/test/data/dspace.cfg.more
  24. +45 −95 dspace-api/src/test/java/org/dspace/AbstractUnitTest.java
  25. +6 −2 dspace-api/src/test/java/org/dspace/storage/rdbms/MockDatabaseManager.java
  26. +0 −1,789 dspace-api/src/test/resources/dspace-test.cfg
  27. +0 −14 dspace-api/src/test/resources/dspaceFolder/config/controlled-vocabularies/LICENCES
  28. +0 −563 dspace-api/src/test/resources/dspaceFolder/config/controlled-vocabularies/nsi.xml
  29. +0 −2,251 dspace-api/src/test/resources/dspaceFolder/config/controlled-vocabularies/srsc.xml
  30. +0 −80 dspace-api/src/test/resources/dspaceFolder/config/crosswalks/QDC.properties
  31. +0 −375 dspace-api/src/test/resources/dspaceFolder/config/crosswalks/mods-submission.xsl
  32. +0 −73 dspace-api/src/test/resources/dspaceFolder/config/crosswalks/mods.properties
  33. +0 −27 dspace-api/src/test/resources/dspaceFolder/config/crosswalks/oaidc.properties
  34. +0 −56 dspace-api/src/test/resources/dspaceFolder/config/crosswalks/sample-crosswalk-DIM2DC.xsl
  35. +0 −151 dspace-api/src/test/resources/dspaceFolder/config/crosswalks/sword-swap-ingest.xsl
  36. +0 −77 dspace-api/src/test/resources/dspaceFolder/config/crosswalks/xhtml-head-item.properties
  37. +0 −71 dspace-api/src/test/resources/dspaceFolder/config/dc2mods.cfg
  38. +0 −10 dspace-api/src/test/resources/dspaceFolder/config/default.context.xml
  39. +0 −37 dspace-api/src/test/resources/dspaceFolder/config/default.license
  40. +0 −1,807 dspace-api/src/test/resources/dspaceFolder/config/dspace.cfg
  41. +0 −78 dspace-api/src/test/resources/dspaceFolder/config/dstat.cfg
  42. +0 −103 dspace-api/src/test/resources/dspaceFolder/config/dstat.map
  43. +0 −16 dspace-api/src/test/resources/dspaceFolder/config/emails/change_password
  44. +0 −19 dspace-api/src/test/resources/dspaceFolder/config/emails/export_error
  45. +0 −18 dspace-api/src/test/resources/dspaceFolder/config/emails/export_success
  46. +0 −26 dspace-api/src/test/resources/dspaceFolder/config/emails/feedback
  47. +0 −20 dspace-api/src/test/resources/dspaceFolder/config/emails/harvesting_error
  48. +0 −24 dspace-api/src/test/resources/dspaceFolder/config/emails/internal_error
  49. +0 −16 dspace-api/src/test/resources/dspaceFolder/config/emails/register
  50. +0 −17 dspace-api/src/test/resources/dspaceFolder/config/emails/registration_notify
  51. +0 −21 dspace-api/src/test/resources/dspaceFolder/config/emails/submit_archive
  52. +0 −23 dspace-api/src/test/resources/dspaceFolder/config/emails/submit_reject
  53. +0 −24 dspace-api/src/test/resources/dspaceFolder/config/emails/submit_task
  54. +0 −12 dspace-api/src/test/resources/dspaceFolder/config/emails/subscription
  55. +0 −26 dspace-api/src/test/resources/dspaceFolder/config/emails/suggest
  56. +0 −51 dspace-api/src/test/resources/dspaceFolder/config/input-forms.dtd
  57. +0 −402 dspace-api/src/test/resources/dspaceFolder/config/input-forms.xml
  58. +0 −35 dspace-api/src/test/resources/dspaceFolder/config/item-submission.dtd
  59. +0 −234 dspace-api/src/test/resources/dspaceFolder/config/item-submission.xml
  60. +0 −328 dspace-api/src/test/resources/dspaceFolder/config/launcher.xml
  61. +0 −14 dspace-api/src/test/resources/dspaceFolder/config/modules/authentication-ip.cfg
  62. +0 −134 dspace-api/src/test/resources/dspaceFolder/config/modules/authentication-ldap.cfg
  63. +0 −14 dspace-api/src/test/resources/dspaceFolder/config/modules/authentication-password.cfg
  64. +0 −71 dspace-api/src/test/resources/dspaceFolder/config/modules/authentication-shibboleth.cfg
  65. +0 −19 dspace-api/src/test/resources/dspaceFolder/config/modules/authentication-x509.cfg
  66. +0 −10 dspace-api/src/test/resources/dspaceFolder/config/modules/authentication.cfg
  67. +0 −18 dspace-api/src/test/resources/dspaceFolder/config/modules/bulkedit.cfg
  68. +0 −3 dspace-api/src/test/resources/dspaceFolder/config/modules/workflow.cfg
  69. +0 −3 dspace-api/src/test/resources/dspaceFolder/config/news-side.html
  70. +0 −3 dspace-api/src/test/resources/dspaceFolder/config/news-top.html
  71. +0 −15 dspace-api/src/test/resources/dspaceFolder/config/news-xmlui.xml
  72. +0 −46 dspace-api/src/test/resources/dspaceFolder/config/oaicat.properties
  73. +0 −737 dspace-api/src/test/resources/dspaceFolder/config/registries/bitstream-formats.xml
  74. +0 −601 dspace-api/src/test/resources/dspaceFolder/config/registries/dublin-core-types.xml
  75. +0 −129 dspace-api/src/test/resources/dspaceFolder/config/registries/sword-metadata.xml
  76. +0 −141 dspace-api/src/test/resources/dspaceFolder/config/spiders/iplists.com-altavista.txt
  77. +0 −21 dspace-api/src/test/resources/dspaceFolder/config/spiders/iplists.com-excite.txt
  78. +0 −291 dspace-api/src/test/resources/dspaceFolder/config/spiders/iplists.com-google.txt
  79. +0 −88 dspace-api/src/test/resources/dspaceFolder/config/spiders/iplists.com-infoseek.txt
  80. +0 −749 dspace-api/src/test/resources/dspaceFolder/config/spiders/iplists.com-inktomi.txt
  81. +0 −41 dspace-api/src/test/resources/dspaceFolder/config/spiders/iplists.com-lycos.txt
  82. +0 −3,962 dspace-api/src/test/resources/dspaceFolder/config/spiders/iplists.com-misc.txt
  83. +0 −295 dspace-api/src/test/resources/dspaceFolder/config/spiders/iplists.com-non_engines.txt
  84. +0 −15 dspace-api/src/test/resources/dspaceFolder/config/xmlui.dtd
  85. +0 −115 dspace-api/src/test/resources/dspaceFolder/config/xmlui.xconf
  86. +0 −35 dspace-api/src/test/resources/dspaceFolder/solr/solr.xml
  87. +0 −31 dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/admin-extra.html
  88. +0 −36 dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/elevate.xml
  89. +0 −21 dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/protwords.txt
  90. +0 −307 dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/schema.xml
  91. +0 −24 dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/scripts.conf
  92. +0 −695 dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/solrconfig.xml
  93. +0 −2 dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/spellings.txt
  94. +0 −57 dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/stopwords.txt
  95. +0 −31 dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/synonyms.txt
  96. +0 −132 dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/xslt/example.xsl
  97. +0 −67 dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/xslt/example_atom.xsl
  98. +0 −66 dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/xslt/example_rss.xsl
  99. +0 −337 dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/xslt/luke.xsl
  100. BIN dspace-api/src/test/resources/dspaceFolder/testData/ConstitutionofIreland.pdf
  101. +3 −7 dspace-api/src/test/resources/test-config.properties
  102. +1 −1 dspace-discovery/dspace-discovery-solr/src/main/java/org/dspace/discovery/SolrServiceImpl.java
  103. +1 −1 ...space-discovery-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/discovery/AbstractSearch.java
  104. +1 −1 ...y/dspace-discovery-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/discovery/BrowseFacet.java
  105. +2 −2 ...pace-discovery-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/discovery/CommunitySearch.java
  106. +1 −1 ...ry/dspace-discovery-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/discovery/Navigation.java
  107. +1 −1 ...ce-discovery-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/discovery/SearchFacetFilter.java
  108. +1 −1 .../dspace-discovery-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/discovery/SimpleSearch.java
  109. +2 −2 ...iscovery-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/discovery/SiteRecentSubmissions.java
  110. +4 −4 ...e-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/jquery/jquery.autocomplete.js
  111. +2 −2 dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/HandleServlet.java
  112. +6 −1 dspace-jspui/dspace-jspui-webapp/src/main/webapp/display-item.jsp
  113. +2 −2 dspace-jspui/dspace-jspui-webapp/src/main/webapp/help/site-admin.html
  114. +1 −1 dspace-jspui/dspace-jspui-webapp/src/main/webapp/print.css
  115. +9 −9 dspace-jspui/dspace-jspui-webapp/src/main/webapp/submit/creative-commons.css
  116. +1 −1 dspace-jspui/dspace-jspui-webapp/src/main/webapp/submit/edit-metadata.jsp
  117. +3 −3 dspace-jspui/dspace-jspui-webapp/src/main/webapp/tools/itemmap-browse.jsp
  118. +5 −0 dspace-oai/dspace-oai-webapp/src/main/webapp/WEB-INF/web.xml
  119. +770 −0 dspace-oai/dspace-oai-webapp/src/main/webapp/oai2.xsl
  120. +109 −3 dspace-stats/pom.xml
  121. +2 −2 dspace-stats/src/main/java/org/dspace/statistics/content/DatasetDSpaceObjectGenerator.java
  122. +58 −56 dspace-stats/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java
  123. +3 −3 dspace-stats/src/main/java/org/dspace/statistics/util/IPTable.java
  124. +130 −792 dspace-stats/src/main/java/org/dspace/statistics/util/LocationUtils.java
  125. +1 −1 dspace-stats/src/main/java/org/dspace/statistics/util/SpiderDetector.java
  126. +15 −0 dspace-stats/src/main/resources/org/dspace/statistics/util/continent-names.properties
  127. +254 −0 dspace-stats/src/main/resources/org/dspace/statistics/util/country-continent-codes.properties
  128. +81 −0 dspace-stats/src/test/java/org/dspace/statistics/util/TestLocationUtils.java
  129. +3 −3 dspace-sword-client/dspace-sword-client-xmlui-api/src/main/resources/aspects/SwordClient/sword.js
  130. +1 −1 dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/base/AtomDocumentRequest.java
  131. +1 −1 dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/base/Deposit.java
  132. +1 −1 dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/base/ServiceDocumentRequest.java
  133. +19 −19 ...xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java
  134. +5 −5 ...dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowContainerUtils.java
  135. +2 −2 ...i/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowEPersonUtils.java
  136. +17 −17 ...lui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowGroupUtils.java
  137. +3 −3 ...mlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowItemUtils.java
  138. +16 −16 ...e-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowResult.java
  139. +1 −1 ...e-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ItemExport.java
  140. +1 −1 ...e-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/Navigation.java
  141. +2 −2 ...mlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/NotAuthorized.java
  142. +44 −36 ...c/main/java/org/dspace/app/xmlui/aspect/administrative/collection/EditCollectionMetadataForm.java
  143. +31 −22 ...src/main/java/org/dspace/app/xmlui/aspect/administrative/community/EditCommunityMetadataForm.java
  144. +1 −1 ...ce-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/eperson/AddEPersonForm.java
  145. +1 −1 ...xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/eperson/ManageEPeopleMain.java
  146. +1 −1 ...xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/group/DeleteGroupsConfirm.java
  147. +4 −4 ...space-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/group/EditGroupForm.java
  148. +1 −1 ...ce-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/group/ManageGroupsMain.java
  149. +1 −1 ...ace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/item/AddBitstreamForm.java
  150. +2 −2 ...pace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/item/ConfirmItemForm.java
  151. +1 −1 ...lui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/item/EditItemBitstreamsForm.java
  152. +41 −40 ...e-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/item/EditItemStatusForm.java
  153. +12 −12 ...mlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/item/ViewItem.java
  154. +1 −1 ...ace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/BrowseItemForm.java
  155. +1 −1 .../dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/MapperMain.java
  156. +5 −5 ...ace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/SearchItemForm.java
  157. +2 −2 ...ain/java/org/dspace/app/xmlui/aspect/administrative/registries/DeleteBitstreamFormatsConfirm.java
  158. +1 −1 .../main/java/org/dspace/app/xmlui/aspect/administrative/registries/DeleteMetadataFieldsConfirm.java
  159. +1 −1 .../main/java/org/dspace/app/xmlui/aspect/administrative/registries/DeleteMetadataSchemaConfirm.java
  160. +2 −2 ...i-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/registries/EditMetadataSchema.java
  161. +5 −5 ...ui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/AbstractSearch.java
  162. +8 −8 ...ui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/AdvancedSearch.java
  163. +4 −4 ...ui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionRecentSubmissions.java
  164. +1 −1 ...i/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunitySearch.java
  165. +5 −5 ...i/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java
  166. +7 −1 ...-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ItemViewer.java
  167. +2 −2 ...-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/Navigation.java
  168. +1 −1 ...mlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SimpleSearch.java
  169. +6 −6 ...-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/AuthenticateAction.java
  170. +1 −1 ...ui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/ForgotPasswordFinished.java
  171. +3 −3 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/InvalidToken.java
  172. +7 −7 ...ui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/LDAPAuthenticateAction.java
  173. +15 −15 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/LoginChooser.java
  174. +6 −6 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/Navigation.java
  175. +1 −1 ...mlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/RegistrationFinished.java
  176. +6 −6 ...ce-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/ShibbolethAction.java
  177. +5 −5 ...dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/StartAuthenticationAction.java
  178. +2 −2 ...e-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/StartRegistration.java
  179. +11 −11 ...e-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/general/NoticeTransformer.java
  180. +3 −3 ...i/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/general/PageNotFoundTransformer.java
  181. +1 −1 ...-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/searchArtifacts/Navigation.java
  182. +21 −21 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/AbstractStep.java
  183. +1 −1 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/Navigation.java
  184. +11 −11 ...-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/StepTransformer.java
  185. +9 −9 ...ui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/DescribeStep.java
  186. +1 −1 ...e-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/InitialQuestionsStep.java
  187. +6 −6 ...lui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/LicenseStep.java
  188. +1 −1 ...e-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/SelectCollectionStep.java
  189. +13 −13 ...mlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/UploadStep.java
  190. +2 −2 ...ce-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/viewArtifacts/Navigation.java
  191. +8 −8 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/workflow/FlowUtils.java
  192. +6 −6 ...ce-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/workflow/PerformTaskStep.java
  193. +1 −1 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/workflow/Submissions.java
  194. +5 −5 ...ce-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmltest/AdvancedFormTest.java
  195. +19 −19 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmltest/BasicFormTest.java
  196. +2 −2 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmltest/HTMLTest.java
  197. +7 −7 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmltest/InlineFormTest.java
  198. +1 −1 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/Navigation.java
  199. +1 −1 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/xmlworkflow/Submissions.java
  200. +2 −2 ...e-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/AbstractDSpaceTransformer.java
  201. +33 −33 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java
  202. +17 −17 ...e-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceCocoonServletFilter.java
  203. +14 −14 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceFeedGenerator.java
  204. +2 −2 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceI18NTransformer.java
  205. +9 −9 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceMETSGenerator.java
  206. +3 −3 ...i/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/HttpServletRequestCocoonWrapper.java
  207. +11 −11 ...ce-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/ItemExportDownloadReader.java
  208. +7 −7 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/MetadataExportReader.java
  209. +4 −4 ...-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/NamespaceFilterTransformer.java
  210. +1 −1 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/OpenSearchGenerator.java
  211. +2 −2 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/ThemeMatcher.java
  212. +4 −4 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/UsageLoggerAction.java
  213. +9 −9 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/AbstractAdapter.java
  214. +53 −53 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/ContainerAdapter.java
  215. +4 −4 ...-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/DSpaceObjectManager.java
  216. +55 −55 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/ItemAdapter.java
  217. +9 −9 ...ce-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/RepositoryAdapter.java
  218. +2 −2 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/SAXFilter.java
  219. +1 −1 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/AuthenticationUtil.java
  220. +14 −14 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/DSpaceValidity.java
  221. +2 −2 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/HandleUtil.java
  222. +1 −1 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/RequestInfo.java
  223. +12 −12 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/RequestUtils.java
  224. +144 −144 dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Administrative/administrative.js
  225. +16 −16 dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Administrative/sitemap.xmap
  226. +12 −12 dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/EPerson/eperson.js
  227. +13 −13 dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/EPerson/sitemap.xmap
  228. +5 −5 dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Submission/sitemap.xmap
  229. +2 −2 dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Workflow/sitemap.xmap
  230. +1 −1 dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Workflow/workflow.js
  231. +1 −1 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/WEB-INF/cocoon/properties/core.properties
  232. +3 −3 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/aspects/aspects.xmap
  233. +1 −1 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml
  234. +1 −1 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/sitemap.xmap
  235. +3 −1 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/static/robots.txt
  236. +1 −1 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Classic/lib/style.css
  237. +1 −1 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Kubrick/Kubrick.xsl
  238. +1 −1 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Kubrick/lib/css/style.css
  239. +2 −0 ...ui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/aspect/artifactbrowser/item-view.xsl
  240. +1 −1 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/core/forms.xsl
  241. +1 −1 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/core/page-structure.xsl
  242. +16 −12 ...pace-xmlui-webapp/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/collection-list.xsl
  243. +5 −5 ...-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/common.xsl
  244. +16 −12 ...space-xmlui-webapp/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/community-list.xsl
  245. +7 −7 ...lui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/item-view.xsl
  246. +6 −6 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml-alt/core/forms.xsl
  247. +1 −1 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml-alt/core/global-variables.xsl
  248. +31 −1 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml-alt/core/page-structure.xsl
  249. +22 −18 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/DIM-Handler.xsl
  250. +1 −1 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/General-Handler.xsl
  251. +65 −43 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/structural.xsl
  252. +6 −6 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/AbstractWingTransformer.java
  253. +1 −1 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/IncludePageMeta.java
  254. +11 −11 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/Message.java
  255. +5 −5 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/ObjectManager.java
  256. +1 −1 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/WingContext.java
  257. +1 −1 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Body.java
  258. +1 −1 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Composite.java
  259. +14 −14 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Division.java
  260. +1 −1 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Error.java
  261. +2 −2 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Field.java
  262. +1 −1 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Instance.java
  263. +2 −2 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/List.java
  264. +7 −7 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Metadata.java
  265. +6 −6 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/PageMeta.java
  266. +1 −1 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Params.java
  267. +4 −4 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Reference.java
  268. +12 −12 ...e-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/SimpleHTMLFragment.java
  269. +2 −2 dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/WingDocument.java
  270. +2 −2 ...xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/WingMergeableElement.java
  271. +2 −2 dspace/config/crosswalks/DIM2MARC21slim.xsl
  272. +21 −17 dspace/config/dspace.cfg
  273. +26 −26 dspace/config/input-forms.xml
  274. +2 −2 dspace/config/item-submission.xml
  275. +16 −0 dspace/config/launcher.xml
  276. +5 −5 dspace/config/modules/authentication-shibboleth.cfg
  277. +1 −1 dspace/config/modules/solr-statistics.cfg
  278. +3 −0 dspace/config/oaicat.properties
  279. +3 −0 dspace/etc/h2/NOTICE.txt
  280. +789 −0 dspace/etc/h2/database_schema.sql
  281. +118 −0 dspace/modules/additions/pom.xml
  282. +9 −0 dspace/modules/additions/src/main/java/org/dspace/example/Example.java
  283. +11 −0 dspace/modules/additions/src/main/java/org/dspace/example/impl/ExampleImpl.java
  284. +24 −0 dspace/modules/additions/src/main/resource/spring/spring-dspace-addon-example-services.xml
  285. +6 −1 dspace/modules/jspui/pom.xml
  286. +6 −1 dspace/modules/lni/pom.xml
  287. +5 −1 dspace/modules/oai/pom.xml
  288. +9 −0 dspace/modules/pom.xml
  289. +4 −0 dspace/modules/sword/pom.xml
  290. +5 −0 dspace/modules/swordv2/pom.xml
  291. +5 −0 dspace/modules/xmlui/pom.xml
  292. +0 −102 dspace/pom.xml
  293. +1 −1 dspace/solr/statistics/conf/schema.xml
  294. +104 −70 dspace/src/assemble/assembly.xml
  295. +37 −7 dspace/src/main/config/build.xml
  296. +42 −26 pom.xml
View
@@ -1,7 +1,7 @@
DSpace source code license:
-Copyright (c) 2002-2011, DuraSpace. All rights reserved.
+Copyright (c) 2002-2012, DuraSpace. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
View
@@ -24,7 +24,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
<configuration>
<debug>true</debug>
<showDeprecation>true</showDeprecation>
@@ -49,6 +48,75 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>setupTestEnvironment</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/testing</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.dspace</groupId>
+ <artifactId>dspace-parent</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <classifier>testEnvironment</classifier>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>edu.iu.ul.maven.plugins</groupId>
+ <artifactId>fileweaver</artifactId>
+ <version>1.0</version>
+ <configuration>
+ <outputs>
+ <output>
+ <outputPath>${project.build.directory}/testing</outputPath>
+ <name>dspace.cfg.woven</name>
+ <parts>
+ <part>
+ <path>${project.build.directory}/testing/dspace/config/dspace.cfg</path>
+ </part>
+ <part>
+ <path>${project.build.directory}/testing/dspace.cfg.more</path>
+ </part>
+ </parts>
+ <properties>
+ <default.dspace.dir>${project.build.directory}/testing/dspace</default.dspace.dir>
+ </properties>
+ </output>
+ </outputs>
+ </configuration>
+ <executions>
+ <execution>
+ <id>edit-dspace-cfg</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>weave</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <dspace.dir>${project.build.directory}/testing/dspace</dspace.dir>
+ <dspace.configuration>${project.build.directory}/testing/dspace.cfg.woven</dspace.configuration>
+ <db.schema.path>${project.build.directory}/testing/dspace/etc/h2/database_schema.sql</db.schema.path>
+ <dspace.log.init.disable>true</dspace.log.init.disable>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -388,7 +388,7 @@ private static void exportItem(Context c, Item myItem, String destDirName,
}
/**
- * Discover the different schemas in use and output a seperate metadata XML
+ * Discover the different schemas in use and output a separate metadata XML
* file for each schema.
*
* @param c
@@ -914,7 +914,7 @@ else if (dso.getType() == Constants.ITEM)
}
else
{
- // nothing to do just ignore this type of DSPaceObject
+ // nothing to do just ignore this type of DSpaceObject
}
}
@@ -746,7 +746,7 @@ private Item addItem(Context c, Collection[] mycollections, String path,
+ File.separatorChar);
// and the bitstreams from the contents file
- // process contents file, add bistreams and bundles, return any
+ // process contents file, add bitstreams and bundles, return any
// non-standard permissions
List<String> options = processContentsFile(c, myitem, path
+ File.separatorChar + itemname, "contents");
@@ -240,6 +240,11 @@ public InputStream getDestinationStream(InputStream sourceStream)
{
Process pdfProc = Runtime.getRuntime().exec(pdfCmd);
status = pdfProc.waitFor();
+ if (!outf.exists()) outf = new File(outPrefix+"-00001.ppm");
+ if (!outf.exists()) outf = new File(outPrefix+"-0001.ppm");
+ if (!outf.exists()) outf = new File(outPrefix+"-001.ppm");
+ if (!outf.exists()) outf = new File(outPrefix+"-01.ppm");
+ if (!outf.exists()) outf = new File(outPrefix+"-1.ppm");
log.debug("PDFTOPPM output is: "+outf+", exists="+outf.exists());
source = ImageIO.read(outf);
}
@@ -604,7 +604,7 @@ else if (MULTI == returnType)
for (DCValue v : allMD)
{
- // De-dup multiple occurances of field names in item
+ // De-dup multiple occurrences of field names in item
if (!expandedDC.contains(buildFieldName(v)))
{
expandedDC.add(buildFieldName(v));
@@ -670,6 +670,9 @@ private void parseItem()
// ISBN
addSingleField(ISBN);
+ // JOURNAL_TITLE
+ addSingleField(JOURNAL_TITLE);
+
// VOLUME
addSingleField(VOLUME);
@@ -1156,7 +1159,7 @@ private boolean identifyItemType(String dConfig)
}
else
{
- // Otherwise, add it as the first occurance of this field
+ // Otherwise, add it as the first occurrence of this field
ArrayList<String> newField = new ArrayList<String>();
newField.add(parsedPair[1].trim());
mdPairs.put(parsedPair[0].trim(), newField);
@@ -517,7 +517,7 @@ private String urlOfBitstream(HttpServletRequest request, Bitstream logo)
*
* If the dspaceobject is null then a local url to the repository is generated.
*
- * @param dso The object to refrence, null if to the repository.
+ * @param dso The object to reference, null if to the repository.
* @return
*/
private String baseURL = null; // cache the result for null
@@ -182,7 +182,19 @@ public int authenticate(Context context,
// Get the DN of the user
String adminUser = ConfigurationManager.getProperty("authentication-ldap", "search.user");
String adminPassword = ConfigurationManager.getProperty("authentication-ldap", "search.password");
- String dn = ldap.getDNOfUser(adminUser, adminPassword, context, netid);
+ String objectContext = ConfigurationManager.getProperty("authentication-ldap", "object_context");
+ String idField = ConfigurationManager.getProperty("authentication-ldap", "id_field");
+ String dn = "";
+
+ // If adminUser is blank, then we can't search so assume the DN
+ if (StringUtils.isBlank(adminUser) || StringUtils.isBlank(adminPassword))
+ {
+ dn = idField + "=" + netid + "," + objectContext;
+ }
+ else
+ {
+ dn = ldap.getDNOfUser(adminUser, adminPassword, context, netid);
+ }
// Check a DN was found
if ((dn == null) || (dn.trim().equals("")))
@@ -579,4 +591,4 @@ public String loginPageTitle(Context context)
{
return "org.dspace.eperson.LDAPAuthentication.title";
}
-}
+}
Oops, something went wrong.

0 comments on commit bb555ea

Please sign in to comment.