New location for DSpace Project

git-svn-id: http://scm.dspace.org/svn/repo/dspace/tags/cvs_final@3767 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace/CHANGES

@@ -1,3 +1,103 @@
+1.5 alpha 1
+===========
+(Andrea Bollini)
+- SF Patch #1528142 Malformed OAI-PMH response: illegal bytes in UTF-8 for SF Bug #1490162
+
+(Christophe Destin)
+- SF Patch #1582754 CreateAdministrator for dummies
+  Creation of admin via [dspace]/bin/create-administrator for a given email, irrespective of the email
+  belonging to an allready registered user.
+
+(Mike Judd)
+- SF Patch #1528142 Malformed OAI-PMH response: illegal bytes in UTF-8 for SF Bug #1490162
+
+(Claudia Juergen)
+- Added link to controlled vocabulary configuration as for SF Bug #1456593 links to controlled vocab docs required
+- SF Patch #1623599 for SF Bug #1217068 Failed to complete review in workflow
+- SF Patch #1619455 for SF bug #1619439 MyDSpace Group Membership Special Groups
+- SF Patch #1606719 for feature request #1145371 Link to admin area
+- SF Patch #1610030 for SF Bug #1076506 Item import command line option for application of template
+- SF Patch #1624212 for SF Bug #1606449 Improve usability of bitstream list in item display
+- SF Patch #1636954 for SF feature request #1636817 MyDSpace make group display configurable
+- SF Patch #1624323 for SF feature request #1549297 Refinement of enable suggest feature
+
+(K. Nakagami)
+- SF Patch #1591969 for SF bug #1583372 DCDate.toString returns invalid string
+- SF Patch #1621889 for SF Bug #1606789 When collection is deleted, mapped item remains in community
+   
+(Dorothea Salo)
+- SF Patch #1557948 Link subjects and authors on item pages
+
+1.4.1 final
+===========
+(Tim Donohue)
+- SF Patch #1609663 Include Windows CLASSPATH in dsrun.bat
+
+(Claudia Juergen)
+- SF Patch #1606703 for SF bug #1606435 Workflow text out of context
+
+(Mark Diggory)
+- SF Patch #1609468 Move w3c valid xhtml boiler image into local repository
+- SF Patch #1605771 Remove uncessary Log4j Configuration in CheckerCommand
+ 
+1.4.1 beta 2
+============
+(Ed Yu)
+- SF Bug #1605635 NPE in Utils.java
+
+(K. Nakagami)
+- SF bug #1597504 Search result page shows shortened query string
+
+(Scott Phillips)
+- Manakin eperson.patch adds API methods for searching epeople & groups.
+
+(Andrea Bollini)
+- SF Patch #1597807 for SF bug #1597805 DIDL Crosswalk: wrong resource management
+
+(Claudia Juergen)
+- SF patch #1589930 for SF bug #1588625 Incorrect text on item mapper screen
+
+(Scott Yeadon)
+- SF bug #1596978 View unfinished submissions - collection empty
+- SF bug #1596952 Collection Wizard create Template missing schema
+- Fix bug in TableRow toString() method where NPE is thrown if tablename not set
+- Update DIDL license and change coding style to DSpace standard
+
+(Stuart Lewis)
+- SF Patch #1602185 for bug #1589902 Duplicate [field] checking error [on input-forms.xml]
+- SF Patch #1598323 Support stats from both 1.3 and 1.4
+- SF Patch #1594208 for bug #1592984 Date comparisons strip time in org.dspace.harvest.Harvest
+- SF Patch #1596113 [dspace]/bin/update-handle-prefix needs to index-all
+
+(Mark Diggory)
+- SF Patch #1600904 Remove cases of System.out from code executed in webapp
+- Change "View Licence" to "View License" in Messages.properties
+
+(Robert Tansley)
+- Error pages now return appropriate HTTP status codes (e.g. 404 not found)
+- Bad filenames in /bitstream/ URLs now result in 404 error -- prevents
+  infinite URL spaces confusing crawlers and bad "persistent" bitstream IDs
+  circulating
+- SF patch #1595902 Prevent infinite URL spaces in HTMLServlet
+- InstallItem no longer sets dc.format.extent, dc.format.mimetype; no longer
+  sets default value for dc.language.iso if one is not present
+- Empty values in drop-down submit fields are not added as empty metadata values
+- dspace.cfg comments changed to indicate what default.language actually means
+- UIUtil.encodeBitstream() now correctly encodes URLs (no longer incorrectly
+  substitutes '+' for spaces in non-query segment.  Fixes bug #1604037.
+
+
+1.4.1 beta 1
+============
+(Scott Yeadon)
+- Jar file updates (includes required code changes for DSIndexer and DSQuery and new jars
+  fontbox.jar and serializer.jar)
+- SF bug #1556829 Docs mention old SiteAuthenticator class
+- SF bug #1532389 Item Templates do not work for non-dc fields
+
+(Vlastimil Krejcir)
+- SF patch #1588008 Bitstream authorization timeout patch
+
 (Claudia Juergen)
 - SF patch 1578936 for SF bug #1066771 Metadata edit form dropping DC qualifier
 - removed reference to "Local DSpace Administrator Contact Information" in
@@ -7,6 +107,12 @@
   docs/configure.html
 - config/registries/dublin-core-types.xml replaced deprecated reference to org.dspace.administer.DCType.java 
   with the reference to the appropriate org.dspace.content.Metadata... classes
+- docs/configure.html
+  updated "The Dublin Core and Bitstream Format Registries" for multiple metadata schemas
+- docs/appenx.html
+  added overviews of the default Dublin Core Metadata and Bitstream Registry
+- SF patch #1584297 for SF bug #1548738 Multiple Metadata Schema, schema not shown on edit item page
+- SF patch #1589906 for SF bug #589895  Not possible to add unqualified Metadata Field
 
 (Robert Tansley)
 - SF patch #1565975 HandleServlet and BitstreamServlet support If-Modified-Since
@@ -21,11 +127,13 @@
 (Larry Stone)
 - SF patch #1544273 improved sanity-checking of XSL-based ingest crosswalks
 - SF patch #1484260 another doc update for SSL, tomcat, mod_jk + config fix
+- SF patch #1521625  documentation updates for 1.4
 
 (Dorothea Salo)
 - SF patch #1544124 Remove admin email from contact info
 - SF patch #1533133 Remove thumbnail filename from alt-text
 - SF patch #1533114 Item title in HTML <title>
+- SF patch #1584035 Prevent sploggers from using feedback page
 
 (Jeroen Ruigrok)
 - SF patch #1549758 Make sure cleanup() doesn't fail with NullPointerException
@@ -45,16 +153,19 @@
 - SF patch #1548020 robots.txt to limit bots navigating browse by subject
 - SF patch #1556183  Missing title for news editor page
 - SF patch #1556950 for SF bug #1556947 NPE when no user selected to del/edit
-- SF patch #1561292 for SF bug #1554064
+- SF patch #1561292 for SF bug #1554064 Fix exception handling for ClassCastException
 - SF patch #1563523 for SF bug #1548865 Browse errors on withdrawn item
 - SF patch #1556207 for SF bug #1554056 Community/collection handle URL with / redirects to homepage
 - SF patch #1571494  for SF bug  #1571490 - UTF-8 encoded characters in licence
 - SF patch #1571522  for SF  bug #1571519 - UTF-8 in statistics
+- SF Patch #1591871 Docs for google and html sitemaps
 
 (Mark Diggory)
 - SF patch #1523824 robots.txt to limit bots navigating author and date pages
 - SF patch #1547987 Small Messages.properties modification (change of DSpace copyright text)
 - SF patch #1542830 Patch to limit Referer Spam capabilities
+- SF patch #1576662 Add css styles for print media
+- SF patch #1581959 Patch to fix PDFBox tmp file issue
 
 (Tim Donohue)
 - SF patch #1550606  more configurable RSS feeds, also moves text to Messages.properties

dspace/KNOWN_BUGS

@@ -6,44 +6,64 @@ http://sourceforge.net/tracker/?group_id=19984&atid=119984
 Oracle compatibility: this release does not support Oracle. Check for patches or updates
 to this release to restore Oracle compatibility.
 
-1520527		PluginManager messy fail
-1517528		Finishing a submission as a supervisor fails
-1506556		Textareas in Oracle (VARCHAR datatype)
-1490162		Malformed OAI-PMH response: illegal bytes in UTF-8
-1480496		Cannot turn off "ignore authorization" flag
-1472729		Permissions for Approval Users
-1461607		errors on Oracle -- database_schema_13_14.sql
-1460754		Problems with Long Java datatype and Oracle
-1456594		Collection administrator can delete any item
-1456590		Values of templates not visible to user
-1456588		Adding new internal bitstream causes upload error
-1456580		admin redirected after item withdrawn
-1456568		input-forms.xml validation required
-1456551		search index config and advanced search not in sync	
-1456459		Certain item-level DC fields describe bitstreams
-1456321		Initial questions and Collection template not in sync
-1456317		Edit Item as Collection Admin - but Admin Buttons displayed
-1456311		Communities and Collections without names
-1456257		restricted access and cc licenses
-1456231		Possible to lack access to items from browse
-1455320		Unnecessary ldap.enable
-1452262		4th item highlighted on browse-by-author
-1451749		MetadataField has inconsistent lifecycle methods
-1445573		Stats not working on Oracle
-1442292		Item submitter w/null Submitter not prevented
-1415166		Missing Access Control in WorkFlow, WorkSpace Objects
-1408373		Can still access bitstreams in withdrawn items
-1358131		Non-authorized users can perform WFStep with back button 
-1333269		Error deleting collections with withdrawn items
-1324358		Dates disappear in browsing oldest first
-1256920 	Mapped Items not added to Community (DSpace 1.3.1)
-1242527 	Duplicate Items during submission
-1238166 	Multi Media and D-Space
-1217068 	Failed to complete review in workflow
-1196724 	Deleting owner of mapped items
-1174342 	Potencial Memory Issue for a large collection
-1173600 	Items Mapper has memory issue for a large collection
-1169975 	workspace item policy not updated after workflow change
-1155173 	Forms in custom 'skin' break group admin tool
-1120726 	Performance bottleneck in Group.update()
-1076506 	Templates applied to imported items
+1609427 OAI server doesn't generate resumption token
+1606789 When collection is deleted, mapped item remains in community
+1606458 The MyDSpace page is very unstructured
+1606456 wrong link to register
+1606447 Cache strength information
+1606445 resolving messages with apostrophe in fmt tags
+1606444 Missing notification of the submitter on workflow abort
+1606441 Moving metadata fields between schemas
+1606439 Exception handling for deleting a metadata field
+1604365 Unbalanced brackets cause search error
+1596576 Stackable LDAP authentication does not work
+1583372 DCDate.toString returns invalid string when hour is zero
+1571645 NullPointerException possible in review.jsp
+1552792 Not possible to uncheck a primary bitstream
+1552760 Submit interface looks bad in Safari browser
+1550641 LDAP auth logic broken for large trees
+1550456 TableRow doesn't contain table name in some cases
+1549290 Suggest Features uses hard coded strings in dspace.cfg
+1548715 Multiple Metadata Schema moving fields failed,values moved
+1540108 RSS feeds fail on OS X
+1520527 PluginManager messy fail
+1517528 Finishing a submission as a supervisor fails
+1506556 Textareas in Oracle (VARCHAR datatype)
+1490162 Malformed OAI-PMH response: illegal bytes in UTF-8
+1472729 Permissions for Approval Users
+1461607 errors on oracle -- database_schema_13-14.sql
+1461606 oracle errors on-- database_schema.sql (ORACLE version!)
+1460754 Problems with Long Java datatype and Oracle
+1456594 Collection Administrator can delete any item
+1456593 links to controlled vocab docs required
+1456590 Values of templates are not visible for the user
+1456587 Authorisation Policies
+1456580 admin redirected after item withdrawn
+1456568 Input-Forms.xml validation required
+1456541 Statistics Link problem
+1456526 Batch Import Indexing
+1456459 Certain item-level DC fields describe bitstreams
+1456321 Initial Questions and Collection Template not in sync
+1456320 Collection admin on dspace-admin page
+1456317 Edit Item as Collection Admin - but Admin Buttons displayed
+1456300 Searching for an URL as identifier -> invalid search string
+1456257 restricted access and cc licenses
+1456231 Possible to have no access to items from browse
+1455320 unnecessary ldap.enable
+1452262 4th item highlighted on browse-by-author
+1451749 MetadataField has inconsistent lifecycle methods
+1445573 Stats not working on Oracle
+1442292 Item submission with null "Submitter" is not prevented
+1415166 Missing Access Control in WorkSpace, WorkFlow objects
+1358131 Non authorized users can perform WFStep using back button
+1324358 Dates disappear in browsing oldest first
+1256920 Mapped Items not added to Community (DSpace 1.3.1)
+1242527 Duplicate Items during submission
+1238166 Multi Media and D-Space
+1217068 Failed to complete review in workflow
+1174342 Potencial Memory Issue for a large collection
+1173600 Items Mapper has memory issue for a large collection
+1169975 workspace item policy not updated after workflow change
+1155173 Forms in custom 'skin' break group admin tool
+1120726 Performance bottlekneck in Group.update()
+1076506 Templates applied to imported items

dspace/LICENSE

@@ -1,7 +1,7 @@
 DSpace source code license:
 
 
-Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
+Copyright (c) 2002-2006, Hewlett-Packard Company and Massachusetts
 Institute of Technology.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

dspace/README

@@ -1,4 +1,4 @@
-DSpace Version 1.4, 26-July-2006
+DSpace Version 1.4.1, 8-December-2006
 
 Installation instructions are included in this release package.
 

dspace/bin/dsrun.bat

@@ -66,7 +66,7 @@ echo Using DSpace installation in: %cd%
 
 REM Build a CLASSPATH
 
-set DSPACE_CLASSPATH=config
+set DSPACE_CLASSPATH=%CLASSPATH%;config
 for %%f in (lib\*.jar) DO CALL bin\buildpath.bat %%f
 
 

dspace/bin/update-handle-prefix

@@ -86,6 +86,9 @@ then
 	echo "update handle set handle=overlay(handle placing '$2' from 1 for $oldPrefixLen) where handle like '$1%';" | psql
 	# update the metadatavalue table entries
     echo "update metadatavalue set text_value=overlay(text_value placing '$2' from 23 for $oldPrefixLen) where text_value like 'http://hdl.handle.net/$1%';" | psql
+    # Reindex the site so the indexes contain the new handles
+    BINDIR=`dirname $0`
+    $BINDIR/index-all
 	break
 else
 	echo

dspace/config/crosswalks/mods.properties

@@ -65,9 +65,9 @@ dc.subject = <mods:subject><mods:topic>%s</mods:topic></mods:subject> | mods:top
 dc.subject.classification = <mods:classification>%s</mods:classification> | text()
 dc.subject.ddc = <mods:classification authority="ddc">%s</mods:classification> | text()
 dc.subject.lcc = <mods:classification authority="lcc">%s</mods:classification> | text()
-dc.subject.lcsh = <mods:subject authority="lcsh">%s</mods:subject> | text()
-dc.subject.mesh = <mods:subject authority="mesh">%s</mods:subject> | text()
-dc.subject.other = <mods:subject authority="local">%s</mods:subject> | text()
+dc.subject.lcsh = <mods:subject authority="lcsh"><mods:topic>%s</mods:topic></mods:subject> | text()
+dc.subject.mesh = <mods:subject authority="mesh"><mods:topic>%s</mods:topic></mods:subject> | text()
+dc.subject.other = <mods:subject authority="local"><mods:topic>%s</mods:topic></mods:subject> | text()
 dc.title = <mods:titleInfo><mods:title>%s</mods:title></mods:titleInfo> | mods:title/text()
 dc.title.alternative = <mods:titleInfo type="alternative">%s</mods:titleInfo> | text()
 dc.type = <mods:genre>%s</mods:genre> | text()

dspace/config/dspace.cfg

@@ -360,6 +360,13 @@ webui.licence_bundle.show = false
 # webui.browse.index.title = dc.title
 # webui.browse.index.subject = dc.subject.*
 
+### MyDSpace display of group membership
+#
+# if omitted, the default behaviour is false
+# 
+# webui.mydspace.showgroupmemberships = false
+
+
 
 ##### SFX Server #####
 
@@ -370,7 +377,7 @@ webui.licence_bundle.show = false
 
 ##### Ingest settings #####
 
-# Default language for content of submissions
+# Default language for metadata values
 default.language = en_US
 
 
@@ -576,15 +583,25 @@ webui.feed.item.description = dc.title, dc.contributor.author, \
 							  dc.contributor.editor, dc.description.abstract, \
 							  dc.description
 
-
 #### Item Recommendation Settings #####
 # show a link to the item recommendation page from item display page
 webui.suggest.enable = false
+#
+# Enable only, if the user is logged in.
+# If not set the  default value is  false
+# webui.suggest.loggedinusers.only = true
+#
 # default name of recommender - replaced by user input if present
 webui.suggest.sender = A DSpace user
 # default name of recipient - replaced by user input if present
 webui.suggest.recipient = colleague
 
+#### Author and subject links ####
+# link author names back to browse-by-author (if not set, defaults to true)
+webui.authorlinks.enable = true
+# link subjects back to browse-by-subject (if not set, defaults to false)
+webui.subjectlinks.enable = false
+
 
 #### Controlled Vocabulary Settings #####
 # Enable or disable the controlled vocabulary add-on
@@ -592,6 +609,22 @@ webui.suggest.recipient = colleague
 #
 # webui.controlledvocabulary.enable = true
 
+#### Multi-file HTML document/site settings #####
+#
+# When serving up composite HTML items, how deep can the request be for us to
+# serve up a file with the same name?
+#
+# e.g. if we receive a request for "foo/bar/index.html"
+# and we have a bitstream called just "index.html"
+# we will serve up that bitstream for the request if webui.html.max-depth-guess
+# is 2 or greater.  If webui.html.max-depth-guess is 1 or less, we would not
+# serve that bitstream, as the depth of the file is greater.
+#
+# If webui.html.max-depth-guess is zero, the request filename and path must
+# always exactly match the bitstream name.  Default value is 3.
+#
+# webui.html.max-depth-guess = 3
+
 #### Checksum Checker Settings ####
 # Default dispatcher in case none specified
 plugin.single.org.dspace.checker.BitstreamDispatcher=org.dspace.checker.SimpleDispatcher

dspace/config/input-forms.xml

@@ -137,7 +137,7 @@ it, please enter the types and the actual numbers or codes below.</hint>
          <repeatable>true</repeatable>
          <label>Type</label>
          <input-type value-pairs-name="common_types">dropdown</input-type>
-         <hint> Select the type(s) of content you are submitting. To select more than one value in the list, you may have to hold down the "CTRL" or "Shift" key.</hint>
+         <hint> Select the type(s) of content of the item. To select more than one value in the list, you may have to hold down the "CTRL" or "Shift" key.</hint>
          <required></required>
        </field>
 

dspace/config/language-packs/Messages.properties

@@ -419,7 +419,7 @@ jsp.dspace-admin.wizard-basicinfo.shown = Shown in list on community home page
 jsp.dspace-admin.wizard-basicinfo.side = Side bar text:
 jsp.dspace-admin.wizard-basicinfo.title = Describe the Collection
 
-jsp.dspace-admin.wizard-default-item.dcore = Dublin Core Field
+jsp.dspace-admin.wizard-default-item.dcore = Metadata Field
 jsp.dspace-admin.wizard-default-item.enter = Enter Default Item Metadata
 jsp.dspace-admin.wizard-default-item.language = Language
 jsp.dspace-admin.wizard-default-item.select = Select field...
@@ -545,7 +545,7 @@ jsp.home.search2 = Enter some text in the box below to search DSpace.
 jsp.home.title = Home
 jsp.home.feeds = RSS Feeds
 
-jsp.layout.footer-default.text = <a target="_blank" href="http://www.dspace.org/">DSpace Software</a> Copyright&nbsp;&copy;&nbsp;2002-2006&nbsp;<a target="_blank" href="http://web.mit.edu/">MIT</a>&nbsp;and&nbsp;<a target="_blank" href="http://www.hp.com/">Hewlett-Packard</a>
+jsp.layout.footer-default.text = <a target="_blank" href="http://www.dspace.org/">DSpace Software</a> Copyright&nbsp;&copy;&nbsp;2002-2007&nbsp;<a target="_blank" href="http://web.mit.edu/">MIT</a>&nbsp;and&nbsp;<a target="_blank" href="http://www.hp.com/">Hewlett-Packard</a>
 jsp.layout.footer-default.feedback = Feedback
 
 jsp.layout.header-default.about = About DSpace Software
@@ -589,6 +589,7 @@ jsp.layout.navbar-default.subjectsearch = Subject Search
 
 jsp.login.chooser.heading = Choose a Login Method
 jsp.login.chooser.chooseyour = Choose one of these ways to login:
+jsp.login.chooser.title = Choose Login Method
 
 jsp.login.incorrect.heading = Log In to DSpace
 jsp.login.incorrect.text = The e-mail address and password you supplied were not valid.  Please try again, or have you <a href="{0}">forgotten your password</a>?
@@ -884,10 +885,10 @@ jsp.submit.creative-commons.info3 =Your browser must support IFrames to use this
 jsp.submit.creative-commons.skip.button =Skip Creative Commons &gt;
 jsp.submit.creative-commons.title =Use a Creative Commons License
 
-jsp.submit.edit-metadata.title = Describe Your Item
-jsp.submit.edit-metadata.heading = Submit: Describe Your Item
-jsp.submit.edit-metadata.info1 = Please fill in the requested information about your submission below.  In most browsers, you can use the tab key to move the cursor to the next input box or button, to save you having to use the mouse each time.
-jsp.submit.edit-metadata.info2 = Please fill further information about your submission below.
+jsp.submit.edit-metadata.title = Describe this Item
+jsp.submit.edit-metadata.heading = Submit: Describe this Item
+jsp.submit.edit-metadata.info1 = Please fill in the requested information about this submission below.  In most browsers, you can use the tab key to move the cursor to the next input box or button, to save you having to use the mouse each time.
+jsp.submit.edit-metadata.info2 = Please fill further information about this submission below.
 jsp.submit.edit-metadata.help = (More Help...)
 jsp.submit.edit-metadata.previous = &lt; Previous
 jsp.submit.edit-metadata.next = Next &gt;
@@ -913,7 +914,7 @@ jsp.submit.get-file-format.info2 =DSpace could not identify the format of this f
 jsp.submit.get-file-format.info3 =DSpace recognized the file format as {0}. <strong>Please be sure before you change this!</strong>
 jsp.submit.get-file-format.info5 =Select the format of the file from the list below, for example "Adobe PDF" or "Microsoft Word", <strong>OR</strong> if the format is not in the list, please describe the format file in the input box below the list.
 jsp.submit.get-file-format.info6 =Format Not in List
-jsp.submit.get-file-format.info7 =<strong>If the format is not in the above list</strong>, describe it in the format below.  Enter the name of the application you used to create the file, and the version number of the application (for example, "ACMESoft SuperApp version 1.5").
+jsp.submit.get-file-format.info7 =<strong>If the format is not in the above list</strong>, describe it in the format below.  Enter the name of the application used to create the file, and the version number of the application (for example, "ACMESoft SuperApp version 1.5").
 jsp.submit.get-file-format.known =(known)
 jsp.submit.get-file-format.supported =(supported)
 jsp.submit.get-file-format.title =Select File Format
@@ -922,9 +923,9 @@ jsp.submit.initial-questions.elem1 =The item has more than one title, e.g. a tra
 jsp.submit.initial-questions.elem2 =The item has been published or publicly distributed before
 jsp.submit.initial-questions.elem3 =The item consists of <em>more than one</em> file
 jsp.submit.initial-questions.elem4 =The item is a thesis
-jsp.submit.initial-questions.info =Please check the boxes next to the statements that apply to your submission.
-jsp.submit.initial-questions.heading =Submit: Describe Your Item
-jsp.submit.initial-questions.title =Describe Your Item
+jsp.submit.initial-questions.info =Please check the boxes next to the statements that apply to this submission.
+jsp.submit.initial-questions.heading =Submit: Describe this Item
+jsp.submit.initial-questions.title =Describe this Item
 
 jsp.submit.license-rejected.heading =Submit: License Rejected
 jsp.submit.license-rejected.info1 =You have chosen not to grant the license to distribute your submission via the DSpace system.  Your submission has not been deleted and can be accessed from the My DSpace page.
@@ -950,7 +951,7 @@ jsp.submit.review.heading = Submit: Verify Submission
 jsp.submit.review.info1 = <strong>Not quite there yet,</strong> but nearly!
 jsp.submit.review.info2 = Please spend a few minutes to examine what you've just submitted below. If anything is wrong, please go back and correct it by using the buttons next to the error, or by clicking on the progress bar at the top of the page.
 jsp.submit.review.info3 = <strong>If everything is OK,</strong> please click the "Next" button at the bottom of the page.
-jsp.submit.review.info4 = You can safely check the files you've uploaded - a new window will be opened to display them.
+jsp.submit.review.info4 = You can safely check the files which have been uploaded - a new window will be opened to display them.
 jsp.submit.review.init-question1 = Item has more than one title:
 jsp.submit.review.init-question2 = Previously published item:
 jsp.submit.review.init-question3 = Item consists of more than one file:
@@ -1023,7 +1024,7 @@ jsp.submit.upload-file-list.title = Uploaded Files
 jsp.submit.upload-file-list.heading1 = Submit: File Uploaded Successfully
 jsp.submit.upload-file-list.heading2 = Submit: Uploaded Files
 jsp.submit.upload-file-list.info1 = <strong>Your file was successfully uploaded.</strong>
-jsp.submit.upload-file-list.info2 = The table below shows the files you have uploaded for this item.
+jsp.submit.upload-file-list.info2 = The table below shows the files which have uploaded for this item.
 jsp.submit.upload-file-list.info3 = You can verify that the file(s) have been uploaded correctly by:
 jsp.submit.upload-file-list.info4 = Clicking on the filenames above.  This will download the file in a new browser window, so that you can check the contents.
 jsp.submit.upload-file-list.info5 = Comparing checksums displayed above with checksums worked out on your local computer.  They should be exactly the same.
@@ -1166,6 +1167,7 @@ jsp.tools.edit-item-form.addbit.button =Add Bitstream
 jsp.tools.edit-item-form.addcc.button = Add Creative Commons License
 jsp.tools.edit-item-form.collections =In Collections:
 jsp.tools.edit-item-form.delete-w-confirm.button =Delete (Expunge)...
+jsp.tools.edit-item-form.elem0 =Schema
 jsp.tools.edit-item-form.elem1 =Element
 jsp.tools.edit-item-form.elem2 =Qualifier
 jsp.tools.edit-item-form.elem3 =Value
@@ -1261,7 +1263,8 @@ jsp.tools.itemmap-main.title =Item Mapper
 jsp.tools.itemmap-browse.title = Browse Items
 jsp.tools.itemmap-browse.heading-authors = Browse Items matching author ''{0}''
 jsp.tools.itemmap-browse.heading-collection = Browse Collection {0}
-jsp.tools.itemmap-browse.infomsg = Check the box next to items you wish to add or remove, and choose 'add' or 'remove'.
+jsp.tools.itemmap-browse.add = Check the box next to items you wish to add, and choose 'add'.
+jsp.tools.itemmap-browse.remove = Check the box next to items you wish to remove, and choose 'remove'.
 jsp.tools.itemmap-browse.th.date = Date
 jsp.tools.itemmap-browse.th.author = First Author
 jsp.tools.itemmap-browse.th.title = Title
@@ -1315,6 +1318,7 @@ org.dspace.app.webui.jsptag.ItemTag.dcfield = DC Field
 org.dspace.app.webui.jsptag.ItemTag.value = Value
 org.dspace.app.webui.jsptag.ItemTag.lang = Language
 org.dspace.app.webui.jsptag.ItemTag.appears = Appears in Collections:
+org.dspace.app.webui.jsptag.ItemTag.submitted = Submitted to Collection:
 org.dspace.app.webui.jsptag.ItemTag.files = Files in This Item:
 org.dspace.app.webui.jsptag.ItemTag.description = Description
 org.dspace.app.webui.jsptag.ItemTag.files.no = There are no files associated with this item.
@@ -1324,7 +1328,7 @@ org.dspace.app.webui.jsptag.ItemTag.fileformat = Format
 org.dspace.app.webui.jsptag.ItemTag.view = View/Open
 org.dspace.app.webui.jsptag.ItemTag.itemprotected = This item is protected by original copyright
 org.dspace.app.webui.jsptag.ItemTag.thumbnail = Thumbnail
-org.dspace.app.webui.jsptag.ItemTag.viewlicence = View Licence
+org.dspace.app.webui.jsptag.ItemTag.viewlicence = View License
 
 org.dspace.app.webui.jsptag.SelectEPersonTag.selectPeople = Select E-people...
 org.dspace.app.webui.jsptag.SelectEPersonTag.selectPerson = Select E-person...
@@ -1353,7 +1357,6 @@ org.dspace.app.webui.servlet.admin.MetadataSchemaRegistryServlet.illegalchar = T
 org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.elemempty = The element cannot be empty.
 org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.elemtoolong = The element must be shorter than 64 characters.
 org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.badelemchar = The element cannot contain periods, underscores or spaces.
-org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.qualempty = The qualifier cannot be empty.
 org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.qualtoolong = The qualifier must be shorter than 64 characters.
 org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.badqualchar = The qualifier cannot contain periods, underscores or spaces.
 org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.movefailed = The requested field(s) could not be moved due to an identical field in the destination schema.

dspace/docs/appendix.html

@@ -0,0 +1,591 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"><html>
+<head>
+  <title>DSpace System Documentation: Appendices</title>
+  <link rel="StyleSheet" href="style.css" type="text/css">
+  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+</head>
+
+<body>
+  <h1>DSpace System Documentation: Appendices</h1>
+  <p><a href="index.html">Back to contents</a></p>
+  <h2><a name="dublincoreregistry" id="dublincoreregistry">Default Dublin Core Metadata Registry</a></h2>
+  <table border="1">
+    <tbody>
+      <tr>
+        <th>Element</th>
+        <th>Qualifier</th>
+        <th>Scope Note</th>
+      </tr>
+      <tr>
+        <td>contributor</td>
+        <td></td>
+        <td>A person, organization, or service responsible for the content of the resource.  Catch-all for unspecified contributors.<td>
+      <tr>
+        <td>contributor</td>
+        <td>advisor</td>
+        <td>Use primarily for thesis advisor.<td>
+      <tr>
+        <td>contributor<a href="#note1">&sup1;</a></td>
+        <td>author</td>
+        <td></td>
+      <tr>
+        <td>contributor</td>
+        <td>editor</td>
+        <td></td>
+      <tr>
+        <td>contributor</td>
+        <td>illustrator</td>
+        <td></td>
+      <tr>
+        <td>contributor</td>
+        <td>other</td>
+        <td></td>
+      <tr>
+        <td>coverage</td>
+        <td>spatial</td>
+        <td>Spatial characteristics of content.<td>
+      <tr>
+        <td>coverage</td>
+        <td>temporal</td>
+        <td>Temporal characteristics of content.<td>
+      <tr>
+        <td>creator</td>
+        <td></td>
+        <td>Do not use; only for harvested metadata.<td>
+      <tr>
+        <td>date</td>
+        <td></td>
+        <td>Use qualified form if possible.<td>
+      <tr>
+        <td>date<a href="#note1">&sup1;</a></td>
+        <td>accessioned</td>
+        <td>Date DSpace takes possession of item.<td>
+      <tr>
+        <td>date<a href="#note1">&sup1;</a></td>
+        <td>available</td>
+        <td>Date or date range item became available to the public.<td>
+      <tr>
+        <td>date</td>
+        <td>copyright</td>
+        <td>Date of copyright.<td>
+      <tr>
+        <td>date</td>
+        <td>created</td>
+        <td>Date of creation or manufacture of intellectual content if different from date.issued.<td>
+      <tr>
+        <td>date<a href="#note1">&sup1;</a></td>
+        <td>issued</td>
+        <td>Date of publication or distribution.<td>
+      <tr>
+        <td>date</td>
+        <td>submitted</td>
+        <td>Recommend for theses/dissertations.<td>
+      <tr>
+        <td>identifier</td>
+        <td></td>
+        <td>Catch-all for unambiguous identifiers not defined by qualified form; use identifier.other for a known identifier common to a local collection instead of unqualified form.<td>
+      <tr>
+        <td>identifier<a href="#note1">&sup1;</a></td>
+        <td>citation</td>
+        <td>Human-readable, standard bibliographic citation of non-DSpace format of this item
+      <tr>
+        <td>identifier<a href="#note1">&sup1;</a></td>
+        <td>govdoc</td>
+        <td>A government document number
+      <tr>
+        <td>identifier<a href="#note1">&sup1;</a></td>
+        <td>isbn</td>
+        <td>International Standard Book Number
+      <tr>
+        <td>identifier<a href="#note1">&sup1;</a></td>
+        <td>issn</td>
+        <td>International Standard Serial Number
+      <tr>
+        <td>identifier</td>
+        <td>sici</td>
+        <td>Serial Item and Contribution Identifier
+      <tr>
+        <td>identifier<a href="#note1">&sup1;</a></td>
+        <td>ismn</td>
+        <td>International Standard Music Number
+      <tr>
+        <td>identifier<a href="#note1">&sup1;</a></td>
+        <td>other</td>
+        <td>A known identifier type common to a local collection.<td>
+      <tr>
+        <td>identifier<a href="#note1">&sup1;</a></td>
+        <td>uri</td>
+        <td>Uniform Resource Identifier
+      <tr>
+        <td>description<a href="#note1">&sup1;</a></td>
+        <td></td>
+        <td>Catch-all for any description not defined by qualifiers.<td>
+      <tr>
+        <td>description<a href="#note1">&sup1;</a></td>
+        <td>abstract</td>
+        <td>Abstract or summary.<td>
+      <tr>
+        <td>description<a href="#note1">&sup1;</a></td>
+        <td>provenance</td>
+        <td>The history of custody of the item since its creation, including any changes successive custodians made to it.<td>
+      <tr>
+        <td>description<a href="#note1">&sup1;</a></td>
+        <td>sponsorship</td>
+        <td>Information about sponsoring agencies, individuals, or contractual arrangements for the item.<td>
+      <tr>
+        <td>description</td>
+        <td>statementofresponsibility</td>
+        <td>To preserve statement of responsibility from MARC records.<td>
+      <tr>
+        <td>description</td>
+        <td>tableofcontents</td>
+        <td>A table of contents for a given item.<td>
+      <tr>
+        <td>description</td>
+        <td>uri</td>
+        <td>Uniform Resource Identifier pointing to description of this item.<td>
+      <tr>
+        <td>format<a href="#note1">&sup1;</a></td>
+        <td></td>
+        <td>Catch-all for any format information not defined by qualifiers.<td>
+      <tr>
+        <td>format<a href="#note1">&sup1;</a></td>
+        <td>extent</td>
+        <td>Size or duration.<td>
+      <tr>
+        <td>format</td>
+        <td>medium</td>
+        <td>Physical medium.<td>
+      <tr>
+        <td>format<a href="#note1">&sup1;</a></td>
+        <td>mimetype</td>
+        <td>Registered MIME type identifiers.<td>
+      <tr>
+        <td>language</td>
+        <td></td>
+        <td>Catch-all for non-ISO forms of the language of the item, accommodating harvested values.<td>
+      <tr>
+        <td>language<a href="#note1">&sup1;</a></td>
+        <td>iso</td>
+        <td>Current ISO standard for language of intellectual content, including country codes (e.g. "en_US").<td>
+      <tr>
+        <td>publisher<a href="#note1">&sup1;</a></td>
+        <td></td>
+        <td>Entity responsible for publication, distribution, or imprint.<td>
+      <tr>
+        <td>relation</td>
+        <td></td>
+        <td>Catch-all for references to other related items.<td>
+      <tr>
+        <td>relation</td>
+        <td>isformatof</td>
+        <td>References additional physical form.<td>
+      <tr>
+        <td>relation</td>
+        <td>ispartof</td>
+        <td>References physically or logically containing item.<td>
+      <tr>
+        <td>relation<a href="#note1">&sup1;</a></td>
+        <td>ispartofseries</td>
+        <td>Series name and number within that series, if available.<td>
+      <tr>
+        <td>relation</td>
+        <td>haspart</td>
+        <td>References physically or logically contained item.<td>
+      <tr>
+        <td>relation</td>
+        <td>isversionof</td>
+        <td>References earlier version.<td>
+      <tr>
+        <td>relation</td>
+        <td>hasversion</td>
+        <td>References later version.<td>
+      <tr>
+        <td>relation</td>
+        <td>isbasedon</td>
+        <td>References source.<td>
+      <tr>
+        <td>relation</td>
+        <td>isreferencedby</td>
+        <td>Pointed to by referenced resource.<td>
+      <tr>
+        <td>relation</td>
+        <td>requires</td>
+        <td>Referenced resource is required to support function, delivery, or coherence of item.<td>
+      <tr>
+        <td>relation</td>
+        <td>replaces</td>
+        <td>References preceeding item.<td>
+      <tr>
+        <td>relation</td>
+        <td>isreplacedby</td>
+        <td>References succeeding item.<td>
+      <tr>
+        <td>relation</td>
+        <td>uri</td>
+        <td>References Uniform Resource Identifier for related item.<td>
+      <tr>
+        <td>rights</td>
+        <td></td>
+        <td>Terms governing use and reproduction.<td>
+      <tr>
+        <td>rights</td>
+        <td>uri</td>
+        <td>References terms governing use and reproduction.<td>
+      <tr>
+        <td>source</td>
+        <td></td>
+        <td>Do not use; only for harvested metadata.<td>
+      <tr>
+        <td>source</td>
+        <td>uri</td>
+        <td>Do not use; only for harvested metadata.<td>
+      <tr>
+        <td>subject<a href="#note1">&sup1;</a></td>
+        <td></td>
+        <td>Uncontrolled index term.<td>
+      <tr>
+        <td>subject</td>
+        <td>classification</td>
+        <td>Catch-all for value from local classification system. Global classification systems will receive specific qualifier
+      <tr>
+        <td>subject</td>
+        <td>ddc</td>
+        <td>Dewey Decimal Classification Number
+      <tr>
+        <td>subject</td>
+        <td>lcc</td>
+        <td>Library of Congress Classification Number
+      <tr>
+        <td>subject</td>
+        <td>lcsh</td>
+        <td>Library of Congress Subject Headings
+      <tr>
+        <td>subject</td>
+        <td>mesh</td>
+        <td>MEdical Subject Headings
+      <tr>
+        <td>subject</td>
+        <td>other</td>
+        <td>Local controlled vocabulary; global vocabularies will receive specific qualifier.<td>
+      <tr>
+        <td>title<a href="#note1">&sup1;</a></td>
+        <td></td>
+        <td>Title statement/title proper.<td>
+      <tr>
+        <td>title<a href="#note1">&sup1;</a></td>
+        <td>alternative</td>
+        <td>Varying (or substitute) form of title proper appearing in item,  e.g. abbreviation or translation
+      <tr>
+        <td>type<a href="#note1">&sup1;</a></td>
+        <td></td>
+        <td>Nature or genre of content.<td> 
+    </tbody>
+  </table>
+  <a name="note1">&sup1;Used by system: do not remove</a>
+  <p><a href="index.html">Back to contents</a></p>
+  <h2><a name="bitstreamformatregistry" id="bitstreamformatregistry">Default Bitstream Format Registry</a></h2>
+  <table border="1">
+    <tbody>
+      <tr>
+        <th>Mimetype</th>
+        <th>Short Description</th>
+        <th>Description</th>
+        <th>Support Level</th>
+        <th>Internal</th>
+        <th>Extensions</th>
+      </tr>
+      <tr>
+        <td>application/octet-stream<a href="#note2">&sup1;</a></td>
+        <td>Unknown</td>
+        <td>Unknown data format</td>
+        <td>Unknown</td>
+        <td>false</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>text/plain<a href="#note2">&sup1;</a></td>
+        <td>License</td>
+        <td>Item-specific license agreed upon to submission</td>
+        <td>Known</td>
+        <td>true</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>application/marc</td>
+        <td>MARC</td>
+        <td>Machine-Readable Cataloging records</td>
+        <td>Known</td>
+        <td>false</td>
+        <td></td>
+      </tr>            
+     <tr>
+        <td>application/mathematica</td>
+        <td>Mathematica</td>
+        <td>Mathematica Notebook</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>ma</td>
+      </tr>
+      <tr>
+        <td>application/msword</td>
+        <td>Microsoft Word</td>
+        <td>Microsoft Word</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>doc</td>
+      </tr>
+      <tr>
+        <td>application/pdf</td>
+        <td>Adobe PDF</td>
+        <td>Adobe Portable Document Format</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>pdf</td>
+      </tr>
+      <tr>
+        <td>application/postscript</td>
+        <td>Postscript</td>
+        <td>Postscript Files</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>ai, eps, ps</td>
+      </tr>
+      <tr>
+        <td>application/sgml</td>
+        <td>SGML</td>
+        <td>SGML application (RFC 1874)</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>sgm, sgml</td>
+      </tr>
+      <tr>
+        <td>application/vnd.ms-excel</td>
+        <td>Microsoft Excel</td>
+        <td>Microsoft Excel</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>xls</td>
+      </tr>
+      <tr>
+        <td>application/vnd.ms-powerpoint</td>
+        <td>Microsoft Powerpoint</td>
+        <td>Microsoft Powerpoint</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>ppt</td>
+      </tr>
+      <tr>
+        <td>application/vnd.ms-project</td>
+        <td>Microsoft Project</td>
+        <td>Microsoft Project</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>mpd, mpp, mpx</td>
+      </tr>
+      <tr>
+        <td>application/vnd.visio</td>
+        <td>Microsoft Visio</td>
+        <td>Microsoft Visio</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>vsd</td>
+      </tr>
+      <tr>
+        <td>application/wordperfect5.1</td>
+        <td>WordPerfect</td>
+        <td>WordPerfect 5.1 document</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>wpd</td>
+      </tr>
+      <tr>
+        <td>application/x-dvi</td>
+        <td>TeX dvi</td>
+        <td>TeX dvi format</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>dvi</td>
+      </tr>
+      <tr>
+        <td>application/x-filemaker</td>
+        <td>FMP3</td>
+        <td>Filemaker Pro</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>fm</td>
+      </tr>
+      <tr>
+        <td>application/x-latex</td>
+        <td>LateX</td>
+        <td>LaTeX document</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>latex</td>
+      </tr>
+      <tr>
+        <td>application/x-photoshop</td>
+        <td>Photoshop</td>
+        <td>Photoshop</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>pdd, psd</td>
+      </tr>
+      <tr>
+        <td>application/x-tex</td>
+        <td>TeX</td>
+        <td>Tex/LateX document</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>tex</td>
+      </tr>
+      <tr>
+        <td>audio/basic</td>
+        <td>audio/basic</td>
+        <td>Basic Audio</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>au, snd</td>
+      </tr>
+      <tr>
+        <td>audio/x-aiff</td>
+        <td>AIFF</td>
+        <td>Audio Interchange File Format</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>aif, aifc, aiff</td>
+      </tr>
+      <tr>
+        <td>audio/x-mpeg</td>
+        <td>MPEG Audio</td>
+        <td>MPEG Audio</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>abs, mpa, mpega</td>
+      </tr>
+      <tr>
+        <td>audio/x-pn-realaudio</td>
+        <td>RealAudio</td>
+        <td>RealAudio file</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>ra, ram</td>
+      </tr>
+      <tr>
+        <td>audio/x-wav</td>
+        <td>WAV</td>
+        <td>Broadcase Wave Format</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>wav</td>
+      </tr>
+      <tr>
+        <td>image/gif</td>
+        <td>GIF</td>
+        <td>Graphics Interchange Format</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>gif</td>
+      </tr>
+      <tr>
+        <td>image/jpeg</td>
+        <td>JPEG</td>
+        <td>Joint Photographic Experts Group/JPEG File Interchange Format (JFIF)</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>jpeg, jpg</td>
+      </tr>
+      <tr>
+        <td>image/png</td>
+        <td>image/png</td>
+        <td>Portable Network Graphics</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>png</td>
+      </tr>
+      <tr>
+        <td>image/tiff</td>
+        <td>TIFF</td>
+        <td>Tag Image File Format</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>tif, tiff</td>
+      </tr>
+      <tr>
+        <td>image/x-ms-bmp</td>
+        <td>BMP</td>
+        <td>Microsoft Windows bitmap</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>bmp</td>
+      </tr>
+      <tr>
+        <td>image/x-photo-cd</td>
+        <td>Photo CD</td>
+        <td>Kodak Photo CD image</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>pcd</td>
+      </tr>
+      <tr>
+        <td>text/css</td>
+        <td>CSS</td>
+        <td>Cascading Style Sheets</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>css</td>
+      </tr>
+      <tr>
+        <td>text/html</td>
+        <td>HTML</td>
+        <td>Hypertext Markup Language</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>htm, html</td>
+      </tr>
+      <tr>
+        <td>text/plain</td>
+        <td>Text</td>
+        <td>Plain Text</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>asc, txt</td>
+      </tr>
+      <tr>
+        <td>text/richtext</td>
+        <td>RTF</td>
+        <td>Rich Text Format</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>rtf</td>
+      </tr>
+      <tr>
+        <td>text/xml</td>
+        <td>XML</td>
+        <td>Extensible Markup Language</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>xml</td>
+      </tr>
+      <tr>
+        <td>video/mpeg</td>
+        <td>MPEG</td>
+        <td>Moving Picture Experts Group</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>mpe, mpeg, mpg</td>
+      </tr>
+      <tr>
+        <td>video/quicktime</td>
+        <td>Video Quicktime</td>
+        <td>Video Quicktime</td>
+        <td>Known </td>
+        <td>false</td>
+        <td>mov, qt</td>
+      </tr>
+      
+    </tbody>
+  </table> 
+  <a name="note2">&sup1; Used by system: do not remove</a>   
+</body>
+</html>

dspace/docs/application.html

@@ -16,7 +16,7 @@
 
   <p>The DSpace Web UI is the largest and most-used component in the application layer. Built on Java Servlet and JavaServer Page technology, it allows end-users to access DSpace over the Web via their Web browsers. As of Dspace 1.3.2 the UI meets both XHTML 1.0 standards and Web Accessibility Initiative (WAI) level-2 standard.</p>
 
-  <p>It also features an administration section, consisting of pages intended for use by central administrators. Presently, this part of the Web UI is not particularly sophisticated; users of the administration section need to know what they are doing! Selected parts of this may also be used by collection [FIXME: administrators or editors?]</p>
+  <p>It also features an administration section, consisting of pages intended for use by central administrators. Presently, this part of the Web UI is not particularly sophisticated; users of the administration section need to know what they are doing! Selected parts of this may also be used by collection administrators.</p>
 
   <h3>Web UI Files</h3>
 
@@ -387,14 +387,12 @@ https://dspace.mit.edu/html/1721.1/12345/figure1.gif
 
   <p>The HTML document servlet can work out which item the user is looking at, and then which Bitstream in it is called <code>figure1.gif</code>, and serve up that bitstream. Similar for following links to other HTML pages. Of course all the links and image references have to be relative and not absolute.</p>
 
-  <p>This can cope with relative links that refer to a deeper path, e.g.</p>
+  <p>HTML documents must be "self-contained", as <a href="functional.html#html">explained here</a>.  Provided that full path information is known by DSpace, any depth or complexity of HTML document can be served subject to those contraints.  This is usually possible with some kind of batch import.  If, however, the document has been uploaded one file at a time using the Web UI, the path information has been stripped.  The system can cope with relative links that refer to a deeper path, e.g.</p>
   <pre>
 &lt;IMG SRC="images/figure1.gif"&gt;
 </pre>
 
-  <p>Remember that in the Bitstream table in the database we have the 'name' field, which always contains the filename with no path (<code>figure1.gif</code>). We also have the <code>source</code> field, which <em>may</em> contain the full pathname of the file as it appeared on the submitter's hard drive, but this is browser- and OS-dependent, so we can't rely on it. All we can rely on is the filename.</p>
-
-  <p>We can still work out what images/figure1.gif is by making the HTML document servlet strip any path that comes in from the URL, e.g.</p>
+  <p>If the item has been uploaded via the Web submit UI, in the Bitstream table in the database we have the 'name' field, which will contain the filename with no path (<code>figure1.gif</code>).  We can still work out what <code>images/figure1.gif</code> is by making the HTML document servlet strip any path that comes in from the URL, e.g.</p>
   <pre>
 https://dspace.mit.edu/html/1721.1/12345/images/figure1.gif
                                          ^^^^^^^
@@ -416,13 +414,11 @@ https://dspace.mit.edu/html/1721.1/12345/chapter1_images/figure.gif
 https://dspace.mit.edu/html/1721.1/12345/chapter2_images/figure.gif
 </pre>
 
-  <p>since it would just have <code>figure.gif</code> in the Bitstream table. Thus, the limitations are:</p>
+  <p>since it would just have <code>figure.gif</code> 
 
-  <ul>
-    <li>All links must be relative and not refer to parents (e.g. <code>../images/foo.gif</code> or <code>/images/foo.gif</code>)</li>
+  <p>To prevent "infinite URL spaces" appearing (e.g. if a file <code>foo.html</code> linked to <code>bar/foo.html</code>, which would link to <code>bar/bar/foo.html</code>...) this behavior can be configured by setting the configuration property <code>webui.html.max-depth-guess</code>.</p>
 
-    <li>If links refer to deeper directory levels, all the filenames must be different (as explained above)</li>
-  </ul>
+  <p>For example, if we receive a request for <code>foo/bar/index.html</code>, and we have a bitstream called just <code>index.html</code>,  we will serve up that bitstream for the request if <code>webui.html.max-depth-guess</code>  is 2 or greater.  If <code>webui.html.max-depth-guess</code> is 1 or less, we would not serve that bitstream, as the depth of the file is greater.  If <code>webui.html.max-depth-guess</code> is zero, the request filename and path must always exactly match the bitstream name.  The default value (if that property is not present in <code>dspace.cfg</code>) is 3.</p>
 
   <h3>Thesis Blocking</h3>
 
@@ -591,10 +587,6 @@ The plugin name is <code>METS</code> by default, and it uses MODS for descriptiv
 
   <p>DSpace has a set of command line tools for importing and exporting items in batches, using the DSpace simple archive format. The tools are not terribly robust, but are useful and are easily modified. They also give a good demonstration of how to implement your own item importer if desired.</p>
 
-  <h3>Warning: templates may be applied</h3>
-
-  <p>Due to a bug as of 1.2 beta 2, if you have an Item template in your Collection, then those default values may be added to Items that you import. Be sure to remove the template if this is unwanted behavior.</p>
-
   <h3>DSpace simple archive format</h3>
 
   <p>The basic concept behind the DSpace's simple archive format is to create an archive, which is directory full of items, with a subdirectory per item. Each item directory contains a file for the item's descriptive metadata, and the files that make up the item.</p>

dspace/docs/business.html

@@ -560,9 +560,9 @@ packager plugin's implementation.</p>
 
   <p><code>plugin.single.interface = classname</code></p>
 
-  <p>For example, this configures the class <code>org.dspace.app.webui.SimpleAuthenticator</code> as the plugin for interface <code>org.dspace.app.webui.SiteAuthenticator</code>:</p>
+  <p>For example, this configures the class <code>org.dspace.checker.SimpleDispatcher</code> as the plugin for interface <code>org.dspace.checker.BitstreamDispatcher</code>:</p>
 
-  <p><code>plugin.single.org.dspace.app.webui.SiteAuthenticator = org.dspace.app.webui.SimpleAuthenticator</code></p>
+  <p><code>plugin.single.org.dspace.checker.BitstreamDispatcher=org.dspace.checker.SimpleDispatcher</code></p>
 
   <h4>Configuring Sequence of Plugins</h4>
 
@@ -666,18 +666,27 @@ plugin.selfnamed.crosswalk.org.dspace.content.metadata.DisseminationCrosswalk =
 
   <h4>A Singleton Plugin</h4>
 
-  <p>This shows how to configure and access a single anonymous plugin, such as the SiteAuthenticator plugin:</p>
+  <p>This shows how to configure and access a single anonymous plugin, such as the BitstreamDispatcher plugin:</p>
 
    <p>Configuration:</p>
 
-   <p><code>plugin.single.org.dspace.app.webui.SiteAuthenticator = edu.mit.dspace.MITAuthenticator</code><p>
+   <p><code>plugin.single.org.dspace.checker.BitstreamDispatcher=org.dspace.checker.SimpleDispatcher</code><p>
 
-   <p>The following code fragment shows how siteAuth, the service object, is initialized and used:</p>
+   <p>The following code fragment shows how dispatcher, the service object, is initialized and used:</p>
 
-   <p><pre>SiteAuthenticator siteAuth =
-    (SiteAuthenticator)PluginManager.getSinglePlugin(SiteAuthenticator.class);
+   <p><pre>BitstreamDispatcher dispatcher =
+    (BitstreamDispatcher)PluginManager.getSinglePlugin(BitstreamDispatcher.class);
 
-  siteAuth.startAuthentication(context, request, response);</pre></p>
+int id = dispatcher.next();
+
+while (id != BitstreamDispatcher.SENTINEL)
+{
+     /*
+        do some processing here
+     */
+
+     id = dispatcher.next();
+}</pre></p>
 
   <h4>Plugin that Names Itself</h4>
 

dspace/docs/configure.html

@@ -199,21 +199,46 @@ property2.name = ${dspace.dir}/rest/of/path
      
   </p>
  
-  <h2><a name="registries" id="registries">The Dublin Core and Bitstream Format Registries</a></h2>
+  <h2><a name="registries" id="registries">The Metadata and Bitstream Format Registries</a></h2>
 
-  <p>The <code><i>[dspace]</i>/config/registries</code> directory contains two XML files. These are used to load the <em>initial</em> contents of the Dublin Core type registry and Bitstream Format registry. After the initial loading (performed by <code>ant fresh_install</code> above), the registries reside in the database; the XML files are not updated.</p>
-
-  <p>Currently, the system requires that every item have a Dublin Core record. The exact Dublin Core elements and qualifiers that are used can be configured by editing the Dublin Core registry. This can either be done at install-time, by editing <code><i>[dspace]</i>/config/registries/dublin-core-types.xml</code>, or at run-time using the administration Web UI. However, note that some elements and qualifiers must be present for DSpace to function correctly since they are used for various purposes by the code. Details are in the relevant <code>.xml</code> file.</p>
-
-  <p>Also note that altering the Dublin Core registry does not, at the current time, cause corresponding changes in the Web UI (e.g. the submission interface or search indices).</p>
-
-  <p>The bitstream formats recognized by the system and levels of support are similarly stored in the bitstream format registry. This can also be edited at install-time via <code><i>[dspace]</i>/config/registries/bitstream-formats.xml</code> or by the administation Web UI. The contents of the bitstream format registry are entirely up to you, though the system requires that the following two formats are present:</p>
-
-  <ul>
-    <li><code>Unknown</code></li>
-
-    <li><code>License</code></li>
-  </ul>
+  <p>
+    The <code><i>[dspace]</i>/config/registries</code> directory contains two XML files. 
+    These are used to load the <em>initial</em> contents of the <a href="appendix.html#dublincoreregistry">Dublin Core Metadata registry</a> 
+    and <a href="appendix.html#bitstreamformatregistry">Bitstream Format registry</a>. 
+    After the initial loading (performed by <code>ant fresh_install</code> above), 
+    the registries reside in the database; the XML files are not updated. 
+  </p>
+  
+  <p>
+    In order to change the registries, you may adjust the XML files before the first installation of DSpace. 
+    On an allready running instance it is recommended to change the registries via DSpace admin UI. 
+    The changes made via admin UI are not reflected in the XML files.
+  </p>
+  
+  <h3>Metadata Format Registries</h3>
+ 	
+  <p>
+    The default metadata schema is Dublin Core, so DSpace is distributed with a default Dublin Core Metadata Registry. 
+    Currently, the system requires that every item have a Dublin Core record.<br/>
+    Via the DSpace admin UI you may define new Metadata Schemas, edit existing schemas and move elements between schemas.<br/>
+    There is a set of Dublin Core Elements, which is used by the system and should not be removed or moved to another schema, 
+    see <a href="appendix.html#dublincoreregistry">Appendix: Default Dublin Core Metadata registry</a>.<br/>
+    <strong>Note</strong>: altering a Metadata Registry has no effect on corresponding parts, e.g. item submission interface, item display, 
+    item import and vice versa. Every metadata element used in submission interface or item import must be registered before using it.<br />
+    <strong>Note</strong> also that deleting a metadata element will delete all its corresponding values.
+   </p>
+ 
+  <h3>Bitstream Format Registry</h3>
+  <p>
+    The bitstream formats recognized by the system and levels of support are similarly stored in the bitstream format registry. 
+    This can also be edited at install-time via <code><i>[dspace]</i>/config/registries/bitstream-formats.xml</code> or by the administation Web UI. 
+    The contents of the bitstream format registry are entirely up to you, though the system requires that the following two formats are present:
+    <ul>
+      <li><code>Unknown</code></li>
+      <li><code>License</code></li>
+    </ul>
+    <strong>Note:</strong> Deleting a format will cause any existing bitstreams of this format to be reverted to the unknown bitstream format.
+  </p>
   
   <h2><a name="license" id="license">The Default Submission License</a></h2>
   <p>For each submitted item, a license must be granted. The license will be stored along with the item in the bundle LICENSE in order to keep the information under which terms an items has been published.</p>
@@ -271,8 +296,8 @@ The DSpace 1.4 source includes the following crosswalk plugins available
 for use with OAI-PMH:
    <ul>
     <li><b><code>mets</code></b> - The manifest document from a DSpace METS SIP.</li>
-    <li><b><code>mods</code></b> - MODS metadata, produced by the <a href="mods">table-driven MODS dissemination crosswalk</a>.</li>
-    <li><b><code>qdc</code></b> - Qualfied Dublin Core, produced by the <a href="qdc">configurable QDC crosswalk</a>.
+    <li><b><code>mods</code></b> - MODS metadata, produced by the <a href="#mods">table-driven MODS dissemination crosswalk</a>.</li>
+    <li><b><code>qdc</code></b> - Qualfied Dublin Core, produced by the <a href="#qdc">configurable QDC crosswalk</a>.
         Note that this QDC does <em>not</em> include all of the
         DSpace "dublin core"
         metadata fields, since the XML standard for QDC is
@@ -407,7 +432,13 @@ cp <i>[dspace-source]</i>/build/dspace.war <i>[tomcat]</i>/webapps
 		<li><code>dc.identifier.uri(link)</code> refers to DC 'identifier.uri' and render as a link</li>
 		<li><code>dc.date.issued(date)</code> refers to DC 'date.issued' and render as a date</li>
 	 </ul>
-
+	 
+  <p>Links can be made from author and subject values to their applicable browse pages. By default
+  this is enabled for author names (links to browse-author) and disabled for subjects (links to browse-subject). They can be
+  changed by editing <code>webui.authorlinks.enable</code> and <code>webui.subjectlinks.enable</code>.
+  The metadata that constitutes authors and subjects is controlled by <code>webui.browse.index.author</code>
+  and <code>webui.browse.index.subject</code>.</p>
+  
   <h3>Customizing the Simple Item Display Metadata for Individual Collections</h3>
 
   <p>Create <code>dspace.cfg</code> entries for each of the "styles" of item display in the same way the default layout is configured. For example,</p>
@@ -425,6 +456,19 @@ metadata.dc.contributor.* = Authors
 metadata.dc.identifier.uri = Citation
 metadata.dc.description.abstract = Abstract</pre>
 
+  <h2><a name="mydspacegroupmembership" id="mydspacegroupmembership">MyDSpace Display of Group Memberships</a></h2>
+  <p>In the MyDSpace page of a user, all the groups the user is member of can be displayed by setting webui.mydspace.showgroupmemberships = true:
+  <pre>
+  ### MyDSpace display of group membership
+  #
+  # default behaviour is false
+  # 
+  # webui.mydspace.showgroupmemberships = false
+  </pre>
+  Setting this property to true will result in a list of all groups the user is explicitly or implicitly member of.<br />
+  <strong>Note: </strong>this list might not be very usable for the standard DSpace user as it displays the group names.<br />
+  If omitted the default behaviour is false.
+  </p>
   <h2><a name="authenticate" id="authenticate">Custom Authentication Code</a></h2>
 
   <p>Since many institutions and organizations have exisiting
@@ -591,7 +635,7 @@ metadata.dc.description.abstract = Abstract</pre>
 
   <p>If LDAP is enabled in the dspace.cfg file, then new users will be able to register by entering their username and password without being sent the registration token. If users do not have a username and password, then they can still register and login with just their email address the same way they do now.</p>
 
-  <p>If you want to give any special privileges to LDAP users, you will still need to extend the SiteAuthenticator class to automatically put people who have a netid into a special group. You might also want to give certain email addresses special privileges. Refer to the <a href="#authenticate">Custom Authentication Code</a> section above for more information about how to do this.</p>
+  <p>If you want to give any special privileges to LDAP users, create a stackable authentication method to automatically put people who have a netid into a special group. You might also want to give certain email addresses special privileges. Refer to the <a href="#authenticate">Custom Authentication Code</a> section above for more information about how to do this.</p>
 
   <p>Here is an explanation of what each of the different configuration parameters are for:</p>
 
@@ -696,12 +740,12 @@ filter.org.dspace.app.mediafilter.BrandedPreviewJPEGFilter.inputFormats = GIF, J
 
   <p>In order to get these scripts to work for you, open each of the following in turn:</p>
   <pre>
-dstat-general
-dstat-initial
-dstat-monthly
-dstat-report-general
-dstat-report-initial
-dstat-report-monthly
+stat-general
+stat-initial
+stat-monthly
+stat-report-general
+stat-report-initial
+stat-report-monthly
 </pre>
 
   <p>scripts eding with <code>-general</code> do the work for building reports spanning the entire history of the archive; scripts ending <code>-initial</code> are to initialise the reports by doing monthly reports from some start date up to the present; scripts ending <code>-monthly</code> generate a single monthly report <em>for the current month</em>. These scripts are just designed to make life easier, and are not particularly clever or elegant.</p>
@@ -718,7 +762,7 @@ dstat-report-monthly
 
   <p>the perl between the lines of hashes defines the variables which will be used to do all of the processing in the report. The following explains what the variables mean and what they should be set to for each of the scripts</p>
 
-  <p><strong>dstat-initial:</strong><br>
+  <p><strong>stat-initial:</strong><br>
   <code>$out_prefix</code>: prefix to place in front of each output file.<br>
   <code>$out_suffix</code>: suffix for output file. A date will be inserted between the prefix and suffix<br>
   <code>$start_year</code>: year to start back-analysing monthly logs from<br>
@@ -726,51 +770,51 @@ dstat-report-monthly
   <code>$dsrun</code>: path to your dsrun script, usually <code>[dspace]/bin/dsrun</code><br>
   <code>$out_directory</code>: directory into which to place analysis files, for example <code>[dspace]/bin/log/</code><br></p>
 
-  <p><strong>dstat-monthly:</strong><br>
+  <p><strong>stat-monthly:</strong><br>
   <code>$out_prefix</code>: prefix to place in front of each output file.<br>
   <code>$out_suffix</code>: suffix for output file. A date will be inserted between the prefix and suffix<br>
   <code>$dsrun</code>: path to your dsrun script, usually <code>[dspace]/bin/dsrun</code><br>
   <code>$out_directory</code>: directory into which to place analysis files, for example <code>[dspace]/bin/log/</code><br></p>
 
-  <p><strong>dstat-general:</strong><br>
+  <p><strong>stat-general:</strong><br>
   <code>$out_prefix</code>: prefix to place in front of each output file.<br>
   <code>$out_suffix</code>: suffix for output file. Today's date will be inserted between the prefix and suffix<br>
   <code>$dsrun</code>: path to your dsrun script, usually <code>[dspace]/bin/dsrun</code><br>
   <code>$out_directory</code>: directory into which to place analysis files, for example <code>[dspace]/bin/log/</code><br></p>
 
-  <p><strong>dstat-report-initial:</strong><br>
-  <code>$in_prefix</code>: the prefix of the files generated by dstat-initial<br>
-  <code>$in_suffix</code>: the suffix of the files generated by dstat-initial<br>
+  <p><strong>stat-report-initial:</strong><br>
+  <code>$in_prefix</code>: the prefix of the files generated by stat-initial<br>
+  <code>$in_suffix</code>: the suffix of the files generated by stat-initial<br>
   <code>$out_prefix</code>: the report file prefix. Should be "<code>report-</code>" in order to work with DSpace UI<br>
   <code>$out_suffix</code>: the report file suffix. Should be "<code>.html</code>" in order to work with DSpace UI<br>
-  <code>$start_year</code>: the start year used in dstat-initial<br>
-  <code>$start_month</code>: the start month used in dstat-initial<br>
+  <code>$start_year</code>: the start year used in stat-initial<br>
+  <code>$start_month</code>: the start month used in stat-initial<br>
   <code>$dsrun</code>: path to your dsrun script, usually <code>[dspace]/bin/dsrun</code><br>
-  <code>$in_directory</code>: directory where analysis files were placed in dstat-initial<br>
+  <code>$in_directory</code>: directory where analysis files were placed in stat-initial<br>
   <code>$out_directory</code>: the live reports directory: <code>[dspace]/reports/</code><br></p>
 
-  <p><strong>dstat-report-monthly:</strong><br>
-  <code>$in_prefix</code>: the prefix of the files generated by dstat-monthly<br>
-  <code>$in_suffix</code>: the suffix of the files generated by dstat-monthly<br>
+  <p><strong>stat-report-monthly:</strong><br>
+  <code>$in_prefix</code>: the prefix of the files generated by stat-monthly<br>
+  <code>$in_suffix</code>: the suffix of the files generated by stat-monthly<br>
   <code>$out_prefix</code>: the report file prefix. Should be "<code>report-</code>" in order to work with DSpace UI<br>
   <code>$out_suffix</code>: the report file suffix. Should be "<code>.html</code>" in order to work with DSpace UI<br>
   <code>$dsrun</code>: path to your dsrun script, usually <code>[dspace]/bin/dsrun</code><br>
-  <code>$in_directory</code>: directory where analysis files were placed in dstat-monthly<br>
+  <code>$in_directory</code>: directory where analysis files were placed in stat-monthly<br>
   <code>$out_directory</code>: the live reports directory: <code>[dspace]/reports/</code><br></p>
 
-  <p><strong>dstat-report-general:</strong><br>
-  <code>$in_prefix</code>: the prefix of the files generated by dstat-general<br>
-  <code>$in_suffix</code>: the suffix of the files generated by dstat-general<br>
+  <p><strong>stat-report-general:</strong><br>
+  <code>$in_prefix</code>: the prefix of the files generated by stat-general<br>
+  <code>$in_suffix</code>: the suffix of the files generated by stat-general<br>
   <code>$out_prefix</code>: the report file prefix. Should be "<code>report-general-</code>" in order to work with DSpace UI<br>
   <code>$out_suffix</code>: the report file suffix. Should be "<code>.html</code>" in order to work with DSpace UI<br>
   <code>$dsrun</code>: path to your dsrun script, usually <code>[dspace]/bin/dsrun</code><br>
-  <code>$in_directory</code>: directory where analysis files were placed in dstat-general<br>
+  <code>$in_directory</code>: directory where analysis files were placed in stat-general<br>
   <code>$out_directory</code>: the live reports directory: <code>[dspace]/reports/</code><br></p>
 
   <p>If you want additional customisations, you will need to modify the lines which build the command to be executed and change the parameters passed to the java processes which actually carry out the analysis. For more information on these processes either build the javadocs or run:</p>
 
-  <pre>[dspace]/bin/dsrun ac.ed.dspace.stats.LogAnalyser -help
-[dspace]/bin/dsrun ac.ed.dspace.stats.ReportGenerator -help</pre>
+  <pre>[dspace]/bin/dsrun org.dspace.app.statistics.LogAnalyser -help
+[dspace]/bin/dsrun org.dspace.app.statistics.ReportGenerator -help</pre>
 
   <h2><a name="preview" id="preview">Displaying Image Item Preview</a></h2>
 
@@ -1151,7 +1195,7 @@ for the interface <code>org.dspace.content.crosswalk.DisseminationCrosswalk</cod
 
 <p>You can add names for existing crosswalks, add new plugin classes, and add new configurations for the configurable crosswalks as noted below.</p>
 
-<h3>Configurable MODS dissemination crosswalk</h3>
+<h3><a name="mods">Configurable MODS dissemination crosswalk</a></h3>
 
 <p>The MODS crosswalk is a self-named plugin.  To configure an instance of
 the MODS crosswalk, add a property to the DSpace configuration starting
@@ -1187,7 +1231,7 @@ it, it is an artifact that the crosswalk ignores.
 into the output document.  Read the example configuration file for more
 details.
 
-<h3>Configurable Qualified Dublin Core (QDC) dissemination  crosswalk</h3>
+<h3><a name="qdc">Configurable Qualified Dublin Core (QDC) dissemination  crosswalk</a></h3>
 
 <p>The QDC crosswalk is a self-named plugin.  To configure an instance of
 the QDC crosswalk, add a property to the DSpace configuration starting

dspace/docs/functional.html

@@ -550,16 +550,18 @@ https://dspace.myu.edu/bitstream/123.456/789/24/foo.html
   <ul>
     <li>No dynamic content (CGI scripts and so forth)</li>
 
-    <li>All links to preserved content must be <em>relative links</em>, that do not refer to 'parents':
+    <li>All links to preserved content must be <em>relative links</em>, that do not refer to 'parents' above the 'root' of the HTML document/site:
 
       <ul>
         <li><code>diagram.gif</code> is OK</li>
 
         <li><code>image/foo.gif</code> is OK</li>
 
-        <li><code>/stylesheet.css</code> is not OK</li>
+        <li><code>../index.html</code> is only OK in a file that is at least a directory deep in the HTML document/site hierarchy</li>
 
-        <li><code>http://somedomain.com/content.html</code> is not OK</li>
+        <li><code>/stylesheet.css</code> is not OK (the link will break)</li>
+
+        <li><code>http://somedomain.com/content.html</code> is not OK (the link will continue to link to the external site which may change or disappear)</li>
       </ul>
     </li>
 

dspace/docs/history.html

@@ -10,6 +10,82 @@
 <h1>DSpace System Documentation: Version History</h1>
 <p><a href="index.html">Back to contents</a></p>
 
+<h2><a name="version1_4_1">Changes in DSpace 1.4.1</a></h2>
+
+<h3>General Improvements</h3>
+
+<ul>
+    <li>Error pages now return appropriate HTTP status codes (e.g. 404 not found)</li>
+    <li>Bad filenames in /bitstream/ URLs now result in 404 error -- prevents infinite URL spaces confusing crawlers and bad "persistent" bitstream IDs circulating</li>
+    <li>Prevent infinite URL spaces in HTMLServlet</li>
+    <li>InstallItem no longer sets dc.format.extent, dc.format.mimetype; no longer sets default value for dc.language.iso if one is not present</li>
+    <li>Empty values in drop-down submit fields are not added as empty metadata values</li>
+    <li>API methods for searching epeople and groups</li>
+    <li>Support stats from both 1.3 and 1.4</li>
+    <li>[dspace]/bin/update-handle-prefix now runs index-all</li>
+    <li>Remove cases of System.out from code executed in webapp</li>
+    <li>Change "View Licence" to "View License" in Messages.properties</li>
+    <li>dspace.cfg comments changed to indicate what default.language actually means</li>
+    <li>HandleServlet and BitstreamServlet support If-Modified-Since requests</li>
+    <li>Improved sanity-checking of XSL-based ingest crosswalks</li>
+    <li>Remove thumbnail filename from alt-text</li>
+    <li>Include item title in HTML title element</li>
+    <li>Improvements to help prevent spammers and sploggers</li>
+    <li>Make cleanup() commit outstanding work every 100 iterations</li>
+    <li>Better handling where email send failed due to wrong address for new user</li>
+    <li>Include robots.txt to limit bots navigating author, date and browse by subject pages</li>
+    <li>Add css styles for print media</li>
+    <li>RSS made more configurable and provide system-wide RSS feed, also moves text to Messages.properties</li>
+    <li>Jar file updates (includes required code changes for DSIndexer and DSQuery and new jars fontbox.jar and serializer.jar)</li>
+    <li>Various documentation additions and cleanups</li>
+    <li>XHTML compliance improvements</li>
+    <li>Move w3c valid xhtml boiler image into local repository</li>
+    <li>Remove uncessary Log4j Configuration in CheckerCommand</li>
+    <li>Include Windows CLASSPATH in dsrun.bat</li>
+</ul>
+
+<h3>Bug fixes</h3>
+<ul>
+    <li>1604037 - UIUtil.encodeBitstream() now correctly encodes URLs (no longer incorrectly substitutes '+' for spaces in non-query segment</li>
+    <li>1592984 - Date comparisons strip time in org.dspace.harvest.Harvest</li>
+    <li>1589902 - Duplicate [field] checking error [on input-forms.xml]</li>
+    <li>1596952 - Collection Wizard create Template missing schema</li>
+    <li>1596978 - View unfinished submissions - collection empty</li>
+    <li>1588625 - Incorrect text on item mapper screen</li>
+    <li>1597805 - DIDL Crosswalk: wrong resource management</li>
+    <li>1605635 - NPE in Utils.java</li>
+    <li>1597504 - Search result page shows shortened query string</li>
+    <li>1532389 - Item Templates do not work for non-dc fields</li>
+    <li>1066771 - Metadata edit form dropping DC qualifier</li>
+    <li>1548738 - Multiple Metadata Schema, schema not shown on edit item page</li>
+    <li>1589895 - Not possible to add unqualified Metadata Field</li>
+    <li>1543853 - Statistics do not work in 1.4</li>
+    <li>1541381 - Browse-by-date and browse-by-title not working</li>
+    <li>1556947 - NullPointerException when no user selected to del/edit</li>
+    <li>1554064 - Fix exception handling for ClassCastException in BitstreamServlet</li>
+    <li>1548865 - Browse errors on withdrawn item</li>
+    <li>1554056 - Community/collection handle URL with / redirects to homepage</li>
+    <li>1571490 - UTF-8 encoded characters in licence</li>
+    <li>1571519 - UTF-8 in statistics</li>
+    <li>1544807 - Browse-by-Subject/Author paging mechanism broken</li>
+    <li>1543966 - "Special" groups inside groups bug</li>
+    <li>1480496 - Cannot turn off "ignore authorization" flag!</li>
+    <li>1515148 - Community policies not deleting correctly</li>
+    <li>1556829 - Docs mention old SiteAuthenticator class</li>
+    <li>1606435 - Workflow text out of context</li>
+    <li>Fix for bitstream authorization timeout</li>
+    <li>Fix to make sure cleanup() doesn't fail with NullPointerException</li>
+    <li>Fix for removeBitstream() failing to update primary bitstream</li>
+    <li>Fix for Advanced Search ignoring conjunctions for arbitrary number of queries</li>
+    <li>Fix minor bug in Harvest.java for Oracle users</li>
+    <li>Fix missing title for news editor page</li>
+    <li>Small Messages.properties modification (change of DSpace copyright text)</li>
+    <li>fix PDFBox tmp file issue</li>
+    <li>Fix HttpServletRequest encoding issues</li>
+    <li>Fix bug in TableRow toString() method where NPE is thrown if tablename not set</li>
+    <li>Update DIDL license and change coding style to DSpace standard</li>
+</ul>
+
 <h2><a name="version1_4">Changes in DSpace 1.4</a></h2>
 
 <h3>General Improvements</h3>

dspace/docs/index.html

@@ -10,7 +10,7 @@
 
     <P>Authors: Robert Tansley, Mick Bass, Margret Branschofsky, Grace Carpenter, Greg McClellan, David Stuve, and others</P>
 
-    <P>For DSpace Version: <strong>1.4</strong> (18-July-2006)</P>
+    <P>For DSpace Version: <strong>1.4.1</strong> (8-December-2006)</P>
 
     <P><small>Documentation for other versions of DSpace are included with the source code.</small></P>
 
@@ -56,6 +56,7 @@
       </LI>
       <LI><A HREF="update.html">Updating a DSpace Installation</A>
         <UL>
+          <LI><A HREF="update.html#14_141">Updating From 1.4 to 1.4.1</A></LI>
           <LI><A HREF="update.html#132_14">Updating From 1.3.x to 1.4.x</A></LI>
           <LI><A HREF="update.html#131_132">Updating From 1.3.1 to 1.3.2</A></LI>
           <LI><A HREF="update.html#12_13">Updating From 1.2.x to 1.3.x</A></LI>
@@ -70,12 +71,13 @@
         <UL>
           <LI><A HREF="configure.html#dspacecfg">The <code>dspace.cfg</code> Configuration Properties File</A></LI>
           <LI><A HREF="configure.html#email">Wording of E-mail Messages</A></LI>
-          <LI><A HREF="configure.html#registries">The Dublin Core and Bitstream Format Registries</A></LI>
+          <LI><A HREF="configure.html#registries">The Metadata and Bitstream Format Registries</A></LI>
           <LI><A HREF="configure.html#license">The Default Submission License</A></LI>
           <LI><A HREF="configure.html#crosswalks">Activating Additional OAI-PMH Crosswalks</A></LI>
           <LI><A HREF="configure.html#templates">Configuration Files for Other Applications</A></LI>
           <LI><A HREF="configure.html#customui">Customizing the Web User Interface</A></LI>
           <LI><A HREF="configure.html#customsimpleitem">Customizing the Simple Item Display Metadata</A></LI>
+          <li><a href="configure.html#mydspacegroupmembership">MyDSpace Display of Group Memberships</li>
           <LI><A HREF="configure.html#authenticate">Custom Authentication Code</A></LI>
           <LI><A HREF="configure.html#ldap">Configuring LDAP Authentication</A></LI>
           <LI><A HREF="configure.html#search-index">Configuring Lucene Search Indexes</A></LI>
@@ -146,6 +148,7 @@
       </LI>
       <LI><A HREF="history.html">Version History</A>
         <UL>
+          <LI><A HREF="history.html#version1_4_1">Changes in DSpace 1.4.1</A></LI>
           <LI><A HREF="history.html#version1_4">Changes in DSpace 1.4</A></LI>
           <LI><A HREF="history.html#version1_3_2">Changes in DSpace 1.3.2</A></LI>
           <LI><A HREF="history.html#version1_3_1">Changes in DSpace 1.3.1</A></LI>
@@ -157,6 +160,12 @@
           <LI><A HREF="history.html#version1_1">Changes in DSpace 1.1</A></LI>
         </UL>
       </LI>
+      <li><a href="appendix.html">Appendices</a>
+        <ul>
+          <li><a href="appendix.html#dublincoreregistry">Default Dublin Core Metadata Registry</a></li>
+          <li><a href="appendix.html#bitstreamformatregistry">Default Bitstream Format Registry</a></li>
+        </ul>
+      </li> 
     </UL>
     <HR>
 

dspace/docs/install.html

@@ -161,7 +161,6 @@ cp * ..</pre>
 	</ol></p>
       </li>
 
-
       <li>
         <P>Edit <code><i>[dspace-source]</i>/config/dspace.cfg</code>, in particular you'll need to set these properties:
 
@@ -269,6 +268,8 @@ See the <code>dspace.cfg</code> file for examples.
 
     <p>Obviously, you should choose execution times which are most useful to you, and you should ensure that the <code>-report-</code> scripts run a short while after the analysis scripts to give them time to complete (a run of around 8 months worth of logs can take around 25 seconds to complete); the resulting reports will let you know how long analysis took and you can adjust your cron times accordingly.</p>
 
+	<p>Note that <a href="http://www.perl.com/download.csp">Perl</a> needs to be installed in order to run the statistical reports.</p>
+
     <P>For information on customising the output of this see <A HREF="configure.html#statistics">configuring system statistical reports</A>.</P>
 
 
@@ -488,7 +489,8 @@ $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keysize 1024 \
     <P>A Handle server runs as a separate process that receives TCP requests from other Handle servers, and issues resolution requests to a global server or servers if a Handle entered locally does not correspond to some local content.  The Handle protocol is based on TCP, so it will need to be installed on a server that can broadcast and receive TCP on port 2641.</P>
 
     <P>The Handle server code is included with the DSpace code in
-<code><i>[dspace-source]</i>/lib/handle.jar</code>.  A script exists to create a simple Handle configuration - simply run <code><i>[dspace]</i>/bin/make-handle-config</code> after you've set the appropriate parameters in <code>dspace.cfg</code>.  You can also create a Handle configuration directly by following the <A HREF="http://www.handle.net/hs_manual_18jan02/server_manual_2.html">installation instructions on handle.net</A>, but with these changes:</P>
+<code><i>[dspace-source]</i>/lib/handle.jar</code>. <strong>Note:</strong> The latest version of the <code>handle.jar</code> file is not included in the release due to licensing conditions changing between the provided version and later versions. It is recommended you read the <a href="http://www.handle.net/upgrade_6-2_DSpace.html">new license conditions</a> and decide whether you wish to update your installation's <code>handle.jar</code>. If you decide to update, you should replace the existing <code>handle.jar</code> in <i>[dspace-source]</i>/lib with the new version and rebuild your war files.</p>
+    <p>A script exists to create a simple Handle configuration - simply run <code><i>[dspace]</i>/bin/make-handle-config</code> after you've set the appropriate parameters in <code>dspace.cfg</code>.  You can also create a Handle configuration directly by following the <A HREF="http://www.handle.net/hs_manual_18jan02/server_manual_2.html">installation instructions on handle.net</A>, but with these changes:</P>
 
     <UL>
       <LI>Instead of running:

dspace/docs/submission.html

@@ -189,7 +189,7 @@
   </DL>
 
   <P>Look at the example <CODE>input-forms.xml</CODE> and experiment with a a trial custom form to learn this specification language thoroughly. It is a very simple way to express the layout of data-entry forms, but the only way to learn all its subtleties is to use it.</P>
-
+  <p>For the use of controlled vocabularies see the <a href="configure.html#controlledvocabulary">Configuring Controlled Vocabularies</a> section.
   <H4>Automatically Elided Fields</H4>
 
   <P>You may notice that some fields are automatically skipped when a custom form page is displayed, depending on the kind of item being submitted. This is because the DSpace user-interface engine skips Dublin Core fields which are not needed, according to the initial description of the item. For example, if the user indicates there are no alternate titles on the first "Describe" page (the one with a few checkboxes), the input for the <CODE>title.alternative</CODE> DC element is automatically elided, <EM>even on custom submission pages.</EM></P>When a user initiates a submission, DSpace first displays what we'll call the "initial-questions page". By default, it contains three questions with check-boxes:

dspace/docs/update.html

@@ -12,6 +12,59 @@
 
     <P>This section describes how to update a DSpace installation from one version to the next.  Details of the differences between the functionality of each version are given in the <A HREF="history.html">Version History</A> section.</P>
 
+    <h2><a name="14_141">Updating From 1.4 to 1.4.1</a></h2>
+
+   <p>The changes in 1.4.1 are only code and configuration changes so the update is simply a matter of rebuilding the wars and slight changes to your config file.</p>
+
+     <p>In the notes below <code><i>[dspace]</i></code> refers to the install directory for your existing DSpace installation, and <code><i>[dspace-1.4.1-source]</i></code> to the source directory for DSpace 1.4.1. Whenever you see these path references, be sure to replace them with the actual path names on your local system.</p>
+
+     <ol>
+      <li><p>Get the new DSpace 1.4.1 source code from <a href="http://sourceforge.net/projects/dspace/">the DSpace page on SourceForge</a> and unpack it somewhere.  Do not unpack it on top of your existing installation!!</p></li>
+
+      <li><p>Copy the PostgreSQL driver JAR to the source tree.  For example:</p>
+
+      <pre>cd <i>[dspace]</i>/lib
+cp postgresql.jar <i>[dspace-1.4.1-source]</i>/lib</pre></li>
+
+      <li><strong>Note:</strong> Licensing conditions for the <code>handle.jar</code> file have changed. As a result, the latest version of the <code>handle.jar</code> file is not included in this distribution. It is recommended you read the <a href="http://www.handle.net/upgrade_6-2_DSpace.html">new license conditions</a> and decide whether you wish to update your installation's <code>handle.jar</code>. If you decide to update, you should replace the existing <code>handle.jar</code> in <i>[dspace-1.4.1-source]</i>/lib with the new version.</li>
+
+      <li><p>Take down Tomcat (or whichever servlet container you're using).</p></li>
+
+      <li><p>A new configuration item <code>webui.html.max-depth-guess</code> has been added to avoid infinite URL spaces. Add the following to the dspace.cfg file:</p>
+<pre>#### Multi-file HTML document/site settings #####
+#
+# When serving up composite HTML items, how deep can the request be for us to
+# serve up a file with the same name?
+#
+# e.g. if we receive a request for "foo/bar/index.html"
+# and we have a bitstream called just "index.html"
+# we will serve up that bitstream for the request if webui.html.max-depth-guess
+# is 2 or greater.  If webui.html.max-depth-guess is 1 or less, we would not
+# serve that bitstream, as the depth of the file is greater.
+#
+# If webui.html.max-depth-guess is zero, the request filename and path must
+# always exactly match the bitstream name.  Default value is 3.
+#
+webui.html.max-depth-guess = 3</pre>
+	<p>If <code>webui.html.max-depth-guess</code> is not present in <code>dspace.cfg</code> the default value is used. If archiving entire web sites or deeply nested HTML documents it is advisable to change the default to a higher value more suitable for these types of materials.</p></li>
+
+      <li><p>Your 'localized' JSPs (those in jsp/local) now need to be maintained in the <em>source</em> directory. If you have locally modified JSPs in your <code><i>[dspace]</i>/jsp/local</code> directory, you will need to merge the changes in the new 1.4.1 versions into your locally modified ones. You can use the <code>diff</code> command to compare your JSPs against the 1.4.1 versions to do this. You can also check against the <a href="http://dspace.cvs.sourceforge.net/dspace/">DSpace CVS</a>.</p></li>
+
+      <li><p>In <code><i>[dspace-1.4.1-source]</i></code> run:</p>
+
+      <pre>ant -Dconfig=<i>[dspace]</i>/config/dspace.cfg update</pre></li>
+
+      <li><p>Copy the <code>.war</code> Web application files in <code><i>[dspace-1.4.1-source]</i>/build</code> to the <code>webapps</code> sub-directory of your servlet container (e.g. Tomcat).  e.g.:</p>
+
+      <pre>cp <i>[dspace-1.4.1-source]</i>/build/*.war <i>[tomcat]</i>/webapps</pre>
+
+      <p>If you're using Tomcat, you need to delete the directories corresponding to the old <code>.war</code> files.  For example, if <code>dspace.war</code> is installed in <code><i>[tomcat]</i>/webapps/dspace.war</code>, you should delete the <code><i>[tomcat]</i>/webapps/dspace</code> directory.  Otherwise, Tomcat will continue to use the old code in that directory. </p></li>
+
+      <li><p>Restart Tomcat.</p></li>
+    </ol>
+
+
+
     <h2><a name="132_14">Updating From 1.3.2 to 1.4.x</a></h2>
 
     <ol>
@@ -25,13 +78,15 @@
       </li>
 
       <li>
-        <p>Download the <A HREF="http://sourceforge.net/projects/dspace/">latest DSpace 1.4 source bundle</A> and unpack it in a suitable location (<em>not</em> over your existing DSpace installation or source tree!)</p>
+        <p>Download the <A HREF="http://sourceforge.net/projects/dspace/">latest DSpace 1.4.x source bundle</A> and unpack it in a suitable location (<em>not</em> over your existing DSpace installation or source tree!)</p>
       </li>
 
       <li><p>Copy the PostgreSQL driver JAR to the source tree.  For example:</p>
 
       <pre>cd <i>[dspace]</i>/lib
-cp postgresql.jar <i>[dspace-1.4-source]</i>/lib</pre></li>
+cp postgresql.jar <i>[dspace-1.4.x-source]</i>/lib</pre></li>
+
+      <li><strong>Note:</strong> Licensing conditions for the <code>handle.jar</code> file have changed. As a result, the latest version of the <code>handle.jar</code> file is not included in this distribution. It is recommended you read the <a href="http://www.handle.net/upgrade_6-2_DSpace.html">new license conditions</a> and decide whether you wish to update your installation's <code>handle.jar</code>. If you decide to update, you should replace the existing <code>handle.jar</code> in <i>[dspace-1.4.1-source]</i>/lib with the new version.</li>
 
       <li><p>Take down Tomcat (or whichever servlet container you're using).</p></li>
 
@@ -117,13 +172,13 @@ checker.retention.CHECKSUM_MATCH=8w</pre></li>
 
           <li><p>If you have custom Media Filters, note that these are now configured through <code>dspace.cfg</code> (instead of <code>mediafilter.cfg</code> which is obsolete.)</p></li>
 
-          <li><p>Also, take a look through the default <code>dspace.cfg</code> file supplied with DSpace 1.4, as this contains configuration options for various new features you might like to use.  In general, these new features default to 'off' and you'll need to add configuration properties as described in the default 1.4 <code>dspace.cfg</code> to activate them.</P></li>
+          <li><p>Also, take a look through the default <code>dspace.cfg</code> file supplied with DSpace 1.4.x, as this contains configuration options for various new features you might like to use.  In general, these new features default to 'off' and you'll need to add configuration properties as described in the default 1.4.x <code>dspace.cfg</code> to activate them.</P></li>
         </ul>
       </li>
 
-      <li><p>Your 'localized' JSPs (those in jsp/local) now need to be maintained in the <em>source</em> directory. If you have locally modified JSPs in your <code><i>[dspace]</i>/jsp/local</code> directory, you will need to merge the changes in the new 1.4 versions into your locally modified ones.</p></li>
+      <li><p>Your 'localized' JSPs (those in jsp/local) now need to be maintained in the <em>source</em> directory. If you have locally modified JSPs in your <code><i>[dspace]</i>/jsp/local</code> directory, you will need to merge the changes in the new 1.4.x versions into your locally modified ones. You can use the <code>diff</code> command to compare your JSPs against the 1.4.x versions to do this. You can also check against the <a href="http://dspace.cvs.sourceforge.net/dspace/">DSpace CVS</a>.</p></li>
 
-      <li><p>In <code><i>[dspace-1.4-source]</i></code> run:</p>
+      <li><p>In <code><i>[dspace-1.4.x-source]</i></code> run:</p>
 
       <pre>ant -Dconfig=<i>[dspace]</i>/config/dspace.cfg update</pre></li>
 
@@ -131,11 +186,11 @@ checker.retention.CHECKSUM_MATCH=8w</pre></li>
 
         <dl>
           <dt>For PostgreSQL</dt>
-          <dd><p><code><i>[dspace-1.4-source]</i>/etc/database_schema_13-14.sql</code> contains the SQL commands to achieve this for PostgreSQL.  To apply the changes, go to the source directory, and run:</P>
+          <dd><p><code><i>[dspace-1.4.x-source]</i>/etc/database_schema_13-14.sql</code> contains the SQL commands to achieve this for PostgreSQL.  To apply the changes, go to the source directory, and run:</P>
           <p><code>psql -f etc/database_schema_13-14.sql [DSpace database name] -h localhost</code></p></dd>
 
           <dt>For Oracle</dt>
-          <dd><p><code><i>[dspace-1.4-source]</i>/etc/oracle/database_schema_13-14.sql</code> should be run on the DSpace database to update the schema.</p></dd>
+          <dd><p><code><i>[dspace-1.4.x-source]</i>/etc/oracle/database_schema_13-14.sql</code> should be run on the DSpace database to update the schema.</p></dd>
         </dl>
       </li>
 

dspace/jsp/display-item.jsp

@@ -74,6 +74,8 @@
     // Attributes
     Boolean displayAllBoolean = (Boolean) request.getAttribute("display.all");
     boolean displayAll = (displayAllBoolean != null && displayAllBoolean.booleanValue());
+    Boolean suggest = (Boolean)request.getAttribute("suggest.enable");
+    boolean suggestLink = (suggest == null ? false : suggest.booleanValue());
     Item item = (Item) request.getAttribute("item");
     Collection[] collections = (Collection[]) request.getAttribute("collections");
     Boolean admin_b = (Boolean)request.getAttribute("admin_button");
@@ -200,7 +202,7 @@
     </form>
 <%
         }
-        if (ConfigurationManager.getBooleanProperty("webui.suggest.enable"))
+        if (suggestLink)
         {
 %>
     <a href="<%= request.getContextPath() %>/suggest?handle=<%= handle %>" target="new_window">

dspace/jsp/dspace-admin/wizard-default-item.jsp

@@ -46,6 +46,8 @@
   --%>
 
 <%@ page import="org.dspace.content.MetadataField" %>
+<%@ page import="org.dspace.content.MetadataSchema" %>
+<%@ page import="org.dspace.app.webui.util.UIUtil" %>
 <%@ page import="org.dspace.app.webui.servlet.admin.CollectionWizardServlet" %>
 <%@ page import="org.dspace.content.Collection" %>
 
@@ -108,7 +110,7 @@
 		for (int dc = 0; dc < dcTypes.length; dc++)
 		{ %>
 					<option value="<%= dcTypes[dc].getFieldID() %>"><%= dcTypes[dc].getQualifier() == null ?
-			dcTypes[dc].getElement() : dcTypes[dc].getElement() + "." + dcTypes[dc].getQualifier() %></option>
+					    MetadataSchema.find(UIUtil.obtainContext(request), dcTypes[dc].getSchemaID()).getName() + "." + dcTypes[dc].getElement() : MetadataSchema.find(UIUtil.obtainContext(request), dcTypes[dc].getSchemaID()).getName() + "." + dcTypes[dc].getElement() + "." + dcTypes[dc].getQualifier() %></option>
 <%      } %>
 				</select></td>
 				<td headers="t2" class="<%= row %>RowEvenCol">

dspace/jsp/index.jsp

@@ -92,7 +92,11 @@
 
         JSPManager.showInternalError(request, response);
     }
-    finally {
-      context.abort();
+    finally
+    {
+      if (context != null)
+      {
+      	context.abort();
+      }
     }
 %>

dspace/jsp/layout/footer-default.jsp

@@ -81,7 +81,7 @@
                         <tr>
                             <td>
                                 <a href="http://validator.w3.org/check?uri=referer"><img
-                                    src="http://www.w3.org/Icons/valid-xhtml10"
+                                    src="<%= request.getContextPath() %>/image/valid-xhtml10.png"
                                     alt="Valid XHTML 1.0!" height="31" width="88" /></a>
                             </td>
                             <td class="pageFootnote">

dspace/jsp/layout/header-default.jsp

@@ -70,6 +70,7 @@
         <title><%= siteName %>: <%= title %></title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <link rel="stylesheet" href="<%= request.getContextPath() %>/styles.css.jsp" type="text/css" />
+        <link rel="stylesheet" href="<%= request.getContextPath() %>/print.css" media="print" type="text/css" />
         <link rel="shortcut icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon"/>
 <%
     if (!"NONE".equals(feedRef))

dspace/jsp/layout/navbar-default.jsp

@@ -61,6 +61,10 @@
     // Is anyone logged in?
     EPerson user = (EPerson) request.getAttribute("dspace.current.user");
 
+    // Is the logged in user an admin
+    Boolean admin = (Boolean)request.getAttribute("is.admin");
+    boolean isAdmin = (admin == null ? false : admin.booleanValue());
+
     // Get the current page, minus query string
     String currentPage = UIUtil.getOriginalURL(request);
     int c = currentPage.indexOf( '?' );
@@ -225,6 +229,22 @@
     </td>
   </tr>
 
+<%
+  if (isAdmin)
+  {
+%>  
+  <tr class="navigationBarItem">
+    <td>
+      <img alt="" src="<%= request.getContextPath() %>/image/<%= ( currentPage.endsWith( "/profile" ) ? "arrow-highlight" : "arrow" ) %>.gif" width="16" height="16"/>
+    </td>
+    <td nowrap="nowrap" class="navigationBarItem">
+      <a href="<%= request.getContextPath() %>/dspace-admin"><fmt:message key="jsp.administer"/></a>
+    </td>
+  </tr>
+<%
+  }
+%>
+
   <tr>
     <td colspan="2">&nbsp;</td>
   </tr>
@@ -246,5 +266,4 @@
       <a href="http://www.dspace.org/"><fmt:message key="jsp.layout.navbar-default.about"/></a>
     </td>
   </tr>
-
 </table>

dspace/jsp/mydspace/main.jsp

@@ -94,6 +94,10 @@
 
     SupervisedItem[] supervisedItems =
         (SupervisedItem[]) request.getAttribute("supervised.items");
+    
+    // Is the logged in user an admin
+    Boolean displayMembership = (Boolean)request.getAttribute("display.groupmemberships");
+    boolean displayGroupMembership = (displayMembership == null ? false : displayMembership.booleanValue());
 %>
 
 <dspace:layout titlekey="jsp.mydspace" nocache="true">
@@ -417,7 +421,7 @@
 <%
   }
 
-  if(groupMemberships.length>0)
+  if(displayGroupMembership && groupMemberships.length>0)
   {
 %>
     <h2><fmt:message key="jsp.mydspace.main.heading6"/></h2>

dspace/jsp/print.css

@@ -0,0 +1,13 @@
+/* Print style sheet for DSpace  */
+body, a {
+    color: black;
+    background: white;
+    }
+
+a {
+    text-decoration: none;
+    }
+
+.navigationBar, .sidebar {
+    display:none;
+    }

dspace/jsp/search/advanced.jsp

@@ -116,7 +116,7 @@
             <td align="left" valign="top" nowrap="nowrap" width="68%">
                 <%-- Search for: <br> --%>
               	<label for="tquery1"><fmt:message key="jsp.search.advanced.searchfor"/></label> <br/>
-                <input type="text" name="query1" id="tquery1" value='<%=StringEscapeUtils.escapeHtml(query1)%>' size="30" />
+                <input type="text" name="query1" id="tquery1" value="<%=StringEscapeUtils.escapeHtml(query1)%>" size="30" />
                 <br/>
               <p/>
             </td>

dspace/jsp/search/results.jsp

@@ -158,7 +158,7 @@
                         </tr>
                         <tr>
                             <td align="center">
-                                <fmt:message key="jsp.search.results.searchfor"/>&nbsp;<input type="text" name="query" value='<%= (query==null ? "" : StringEscapeUtils.escapeHtml(query)) %>'/>&nbsp;<input type="submit" value="<fmt:message key="jsp.general.go"/>" />
+                                <fmt:message key="jsp.search.results.searchfor"/>&nbsp;<input type="text" name="query" value="<%= (query==null ? "" : StringEscapeUtils.escapeHtml(query)) %>"/>&nbsp;<input type="submit" value="<fmt:message key="jsp.general.go"/>" />
                             </td>
                         </tr>
                     </table>

dspace/jsp/tools/edit-item-form.jsp

@@ -80,6 +80,7 @@
     String handle = (String) request.getAttribute("handle");
     Collection[] collections = (Collection[]) request.getAttribute("collections");
     MetadataField[] dcTypes = (MetadataField[])  request.getAttribute("dc.types");
+    HashMap metadataFields = (HashMap) request.getAttribute("metadataFields");
 %>
 
 
@@ -215,11 +216,12 @@
                 <th id="t2" class="oddRowOddCol"><strong>Value</strong></th>
                 <th id="t3" class="oddRowEvenCol"><strong>Language</strong></th> --%>
                 
-				<th id="t1" class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem1"/></strong></th>
-                <th id="t2" class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem2"/></strong></th>
-                <th id="t3" class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem3"/></strong></th>
-                <th id="t4" class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem4"/></strong></th>
-                <th id="t5" class="oddRowOddCol">&nbsp;</th>
+                <th id="t0" class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem0"/></strong></th>
+                <th id="t1" class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem1"/></strong></th>
+                <th id="t2" class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem2"/></strong></th>
+                <th id="t3" class="oddRowEvenCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem3"/></strong></th>
+                <th id="t4" class="oddRowOddCol"><strong><fmt:message key="jsp.tools.edit-item-form.elem4"/></strong></th>
+                <th id="t5" class="oddRowEvenCol">&nbsp;</th>
             </tr>
 <%
     DCValue[] dcv = item.getMetadata(Item.ANY, Item.ANY, Item.ANY, Item.ANY);
@@ -258,15 +260,16 @@
         }
  %>
             <tr>
-                <td headers="t1" class="<%= row %>RowOddCol"><%= dcv[i].element %>&nbsp;&nbsp;</td>
-                <td headers="t2" class="<%= row %>RowEvenCol"><%= (dcv[i].qualifier == null ? "" : dcv[i].qualifier) %></td>
-                <td headers="t3" class="<%= row %>RowOddCol">
+                <td headers="t0" class="<%= row %>RowOddCol"><%=dcv[i].schema %></td>
+                <td headers="t1" class="<%= row %>RowEvenCol"><%= dcv[i].element %>&nbsp;&nbsp;</td>
+                <td headers="t2" class="<%= row %>RowOddCol"><%= (dcv[i].qualifier == null ? "" : dcv[i].qualifier) %></td>
+                <td headers="t3" class="<%= row %>RowEvenCol">
                     <textarea name="value_<%= key %>_<%= sequenceNumber %>" rows="3" cols="50"><%= dcv[i].value %></textarea>
                 </td>
-                <td headers="t4" class="<%= row %>RowEvenCol">
+                <td headers="t4" class="<%= row %>RowOddCol">
                     <input type="text" name="language_<%= key %>_<%= sequenceNumber %>" value="<%= (dcv[i].language == null ? "" : dcv[i].language) %>" size="5"/>
                 </td>
-                <td headers="t5" class="<%= row %>RowOddCol">
+                <td headers="t5" class="<%= row %>RowEvenCol">
                     <%-- <input type="submit" name="submit_remove_<%= key %>_<%= sequenceNumber %>" value="Remove" /> --%>
 					<input type="submit" name="submit_remove_<%= key %>_<%= sequenceNumber %>" value="<fmt:message key="jsp.tools.general.remove"/>"/>
                 </td>
@@ -277,10 +280,15 @@
             <tr><td>&nbsp;</td></tr>
 
             <tr>
-                <td headers="t1" colspan="2" class="<%= row %>RowEvenCol">
+     	
+                <td headers="t1" colspan="3" class="<%= row %>RowEvenCol">
                     <select name="addfield_dctype">
-<%  for (int i = 0; i < dcTypes.length; i++) { %>
-                        <option value="<%= dcTypes[i].getFieldID() %>"><%= dcTypes[i].getElement() %><%= (dcTypes[i].getQualifier() == null ? "" : "." + dcTypes[i].getQualifier()) %></option>
+<%  for (int i = 0; i < dcTypes.length; i++) 
+    { 
+    	Integer fieldID = new Integer(dcTypes[i].getFieldID());
+    	String displayName = (String)metadataFields.get(fieldID);
+%>
+                        <option value="<%= fieldID.intValue() %>"><%= displayName %></option>
 <%  } %>
                     </select>
                 </td>

dspace/jsp/tools/itemmap-browse.jsp

@@ -87,7 +87,14 @@
     </h2>
 
     <%-- <p>Check the box next to items you wish to add or remove, and choose 'add' or 'remove'.</p> --%>
-    <p><fmt:message key="jsp.tools.itemmap-browse.infomsg"/></p>
+    <% if (browsetype.equals("Add")){ %>
+    <p><fmt:message key="jsp.tools.itemmap-browse.add"/></p>
+    <% }%>
+    <% if (browsetype.equals("Remove")){ %>
+    <p><fmt:message key="jsp.tools.itemmap-browse.remove"/></p>
+    <% } %>
+    
+    <%-- %>p><fmt:message key="jsp.tools.itemmap-browse.infomsg"/></p--%>
     <form method="post" action="<%= request.getContextPath() %>/tools/itemmap">
         <input type="hidden" name="cid" value="<%=collection.getID()%>" />
 

dspace/lib/README

@@ -1,32 +1,35 @@
 Libraries used by DSpace - Release 1.4:
 
-activation.jar:      The Java Activation Framework, used by JavaMail (v1.0.2)
+activation.jar:      The Java Activation Framework, used by JavaMail (v1.1)
 commons-cli.jar:     Jakarta Commons command line processing (v1.0)
 commons-codec-1.3.jar: Jakarta Commons Codec (v1.3)
-commons-collections.jar: Jakarta Commons collections API (v3.0)
+commons-collections.jar: Jakarta Commons collections API (v3.2)
 commons-dbcp.jar:    Jakarta Commons database connection pool (v1.2.1)
-commons-fileupload.jar: Jakarta Commons file upload package (v1.0)
-commons-pool.jar:    Jakarta Commons object pooling API (v1.2)
+commons-fileupload.jar: Jakarta Commons file upload package (v1.1.1)
+commons-io.jar:		 Jakarta Commons IO, required for fileupload.jar (v1.2)
+commons-pool.jar:    Jakarta Commons object pooling API (v1.3)
+fontbox.jar:         Java library for parsing font files, required for PDFBox.jar (v0.1.0)
 handle.jar:          CNRI Handle Server (version 5.3.4)
-jakarta-poi.jar:     MS file reader, used by text extraction (v2.0)
-jargon.jar:          SRB server access library (v.1.4.11)
-jaxen-1.1-beta-7.jar:XPath engine (v1.1-beta7)
+jakarta-poi.jar:     MS file reader, used by text extraction (v2.5.1)
+jargon.jar:          SRB server access library (v.1.4.25)
+jaxen.jar:           XPath engine (v1.1-beta11)
 jdom.jar             Java DOM API library (version 1.0)
 jena.jar:            The Jena RDF framework (version 1.4.0)
 jstl.jar:            Java Standard Tag Library (JSTL) API (version 1.0.6)
-log4j.jar:           Log4j, for system logging (version 1.2.8)
-lucene.jar:          Lucene search engine (version 1.4.3)
-lucene-sandbox.jar:  Lucene search engine (version ??)
-mail.jar:            JavaMail, used for sending e-mail (version 1.3.2)
-mets.jar*:           Harvard University Libraries METS toolkit (version 1.3.4)
-oaicat.jar:          OCLC's OAI data provider implementation (version 1.5.41)
+log4j.jar:           Log4j, for system logging (version 1.2.14)
+lucene.jar:          Lucene search engine (version 2.0.0)
+lucene-sandbox.jar:  Lucene search engine (version - compiled against Lucene 2.0.0 jar)
+mail.jar:            JavaMail, used for sending e-mail (version 1.4)
+mets.jar*:           Harvard University Libraries METS toolkit (version 1.5.2)
+oaicat.jar:          OCLC's OAI data provider implementation (version 1.5.48)
 oro.jar:             Jakarta-ORO, provide regular expressions (v2.0.8)
-PDFBox.jar           PDF Utilities, used for text extraction v 0.6.4
-rome.jar             RSS syndication support (version 0.7)
+PDFBox.jar:          PDF Utilities, used for text extraction (v0.7.3)
+rome.jar:            RSS syndication support (version 0.7)
+serializer.jar:      Serializer component of Xalan-Java, bundled with latest Xalan (??)
 servlet.jar:         Servlet interfaces (version 2.3)
 standard.jar:        Jakarta JSTL Implementation (version 1.0.6)
-tm-extractors.jar:   textmining.org PDFExtract and WordExtract classes (v.0.2)
-xalan.jar:           XSLT processor - used for XPath functionality (v2.6.0)
+tm-extractors.jar:   textmining.org PDFExtract and WordExtract classes (v.0.4)
+xalan.jar:           XSLT processor - used for XPath functionality (v2.7.0)
 xercesImpl.jar:      XML processor - used for parsing XML files (v2.7.1)
 xml-apis.jar         XML SAX & DOM APIs (v1.3.1)
 

dspace/lib/licenses/activation.jar.license

@@ -1,245 +1,300 @@
-                 Sun Microsystems, Inc.
-             Binary Code License Agreement
+Software: JavaBeans Activation Framework 1.1.
 
-   READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED
-   SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY
-   "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE
-   MEDIA PACKAGE.  BY OPENING THE SOFTWARE MEDIA
-   PACKAGE, YOU AGREE TO THE TERMS OF THIS
-   AGREEMENT.  IF YOU ARE ACCESSING THE SOFTWARE
-   ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE
-   TERMS BY SELECTING THE "ACCEPT" BUTTON AT THE END
-   OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO ALL
-   THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE
-   TO YOUR PLACE OF PURCHASE FOR A REFUND OR, IF THE
-   SOFTWARE IS ACCESSED ELECTRONICALLY, SELECT THE
-   "DECLINE" BUTTON AT THE END OF THIS AGREEMENT.
+License Term:  Perpetual (subject to termination under the SLA).
 
-   1.  LICENSE TO USE.  Sun grants you a
-   non-exclusive and non-transferable license for the
-   internal use only of the accompanying software and
-   documentation and any error corrections provided
-   by Sun (collectively "Software"), by the number of
-   users and the class of computer hardware for which
-   the corresponding fee has been paid.
+Licensed Unit: Software Copy.
 
-   2.  RESTRICTIONS.  Software is confidential and
-   copyrighted. Title to Software and all associated
-   intellectual property rights is retained by Sun
-   and/or its licensors.  Except as specifically
-   authorized in any Supplemental License Terms, you
-   may not make copies of Software, other than a
-   single copy of Software for archival purposes.
-   Unless enforcement is prohibited by applicable
-   law, you may not modify, decompile, or reverse
-   engineer Software.  You acknowledge that Software
-   is not designed, licensed or intended for use in
-   the design, construction, operation or maintenance
-   of any nuclear facility.  Sun disclaims any
-   express or implied warranty of fitness for such
-   uses.  No right, title or interest in or to any
-   trademark, service mark, logo or trade name of Sun
-   or its licensors is granted under this Agreement.
+Licensed unit Count: Unlimited.
 
-   3. LIMITED WARRANTY.  Sun warrants to you that for
-   a period of ninety (90) days from the date of
-   purchase, as evidenced by a copy of the receipt,
-   the media on which Software is furnished (if any)
-   will be free of defects in materials and
-   workmanship under normal use.  Except for the
-   foregoing, Software is provided "AS IS".  Your
-   exclusive remedy and Sun's entire liability under
-   this limited warranty will be at Sun's option to
-   replace Software media or refund the fee paid for
-   Software.
+Permitted Uses:
 
-   4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN
-   THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
-   REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
-   IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
-   PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE
-   DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
-   DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
+1. You may reproduce and use the Software for Individual, Commercial,
+or Research and Instructional Use for the purposes of designing,
+developing, testing, and running Your applets and
+application("Programs").
 
-   5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT
-   PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS
-   LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT
-   OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL,
-   INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED
-   REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT
-   OF OR RELATED TO THE USE OF OR INABILITY TO USE
-   SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGES.  In no event will
-   Sun's liability to you, whether in contract, tort
-   (including negligence), or otherwise, exceed the
-   amount paid by you for Software under this
-   Agreement.  The foregoing limitations will apply
-   even if the above stated warranty fails of its
-   essential purpose.
+2. Subject to the terms and conditions of this Agreement and
+restrictions and exceptions set forth in the Software's documentation,
+You may reproduce and distribute portions of Software identified as a
+redistributable in the documentation ("Redistributable"), provided
+that:
 
-   6.  Termination.  This Agreement is effective
-   until terminated.  You may terminate this
-   Agreement at any time by destroying all copies of
-   Software.  This Agreement will terminate
-   immediately without notice from Sun if you fail to
-   comply with any provision of this Agreement.  Upon
-   Termination, you must destroy all copies of
-   Software.
+(a) you distribute Redistributable complete and unmodified and only
+bundled as part of Your Programs,
 
-   7. Export Regulations. All Software and technical
-   data delivered under this Agreement are subject to
-   US export control laws and may be subject to
-   export or import regulations in other countries.
-   You agree to comply strictly with all such laws
-   and regulations and acknowledge that you have the
-   responsibility to obtain such licenses to export,
-   re-export, or import as may be required after
-   delivery to you.
+(b) your Programs add significant and primary functionality to the
+Redistributable,
 
-   8.   U.S. Government Restricted Rights.  If
-   Software is being acquired by or on behalf of the
-   U.S. Government or by a U.S. Government prime
-   contractor or subcontractor (at any tier), then
-   the Government's rights in Software and
-   accompanying documentation will be only as set
-   forth in this Agreement; this is in accordance
-   with 48 CFR 227.7201 through 227.7202-4 (for
-   Department of Defense (DOD) acquisitions) and with
-   48 CFR 2.101 and 12.212 (for non-DOD
-   acquisitions).
+(c) you distribute Redistributable for the sole purpose of running your
+Programs,
 
-   9.  Governing Law.  Any action related to this
-   Agreement will be governed by California law and
-   controlling U.S. federal law.  No choice of law
-   rules of any jurisdiction will apply.
+(d) you do not distribute additional software intended to replace any
+component(s) of the Redistributable,
 
-   10.  Severability. If any provision of this
-   Agreement is held to be unenforceable, this
-   Agreement will remain in effect with the provision
-   omitted, unless omission would frustrate the
-   intent of the parties, in which case this
-   Agreement will immediately terminate.
+(e) you do not remove or alter any proprietary legends or notices
+contained in or on the Redistributable.
 
-   11.  Integration.  This Agreement is the entire
-   agreement between you and Sun relating to its
-   subject matter.  It supersedes all prior or
-   contemporaneous oral or written communications,
-   proposals, representations and warranties and
-   prevails over any conflicting or additional terms
-   of any quote, order, acknowledgment, or other
-   communication between the parties relating to its
-   subject matter during the term of this Agreement.
-   No modification of this Agreement will be binding,
-   unless in writing and signed by an authorized
-   representative of each party.
+(f) you only distribute the Redistributable subject to a license
+agreement that protects Sun's interests consistent with the terms
+contained in this Agreement, and
 
-                 JAVA OPTIONAL PACKAGE
+(g) you agree to defend and indemnify Sun and its licensors from and
+against any damages, costs, liabilities, settlement amounts and/or
+expenses  (including attorneys' fees) incurred in connection with any
+claim, lawsuit or action by any third party that arises or results from
+the use or distribution of any and all Programs and/or
+Redistributable.
 
-   JAVABEANS(TM) ACTIVATION FRAMEWORK, VERSION 1.0.2
-               SUPPLEMENTAL LICENSE TERMS
+3. Java Technology Restrictions.  You may not create, modify, or change
+the behavior of, or authorize your licensees to create, modify, or
+change the behavior of, classes, interfaces, or subpackages that are in
+any way identified as "java", "javax", "sun" or similar convention as
+specified by Sun in any naming convention designation.
 
-   These supplemental license terms ("Supplemental
-   Terms") add to or modify the terms of the Binary
-   Code License Agreement (collectively, the
-   "Agreement"). Capitalized terms not defined in
-   these Supplemental Terms shall have the same
-   meanings ascribed to them in the Agreement. These
-   Supplemental Terms shall supersede any
-   inconsistent or conflicting terms in the
-   Agreement, or in any license contained within the
-   Software.
+B. Sun Microsystems, Inc. ("Sun")
+SOFTWARE LICENSE AGREEMENT
 
-   1. Software Internal Use and Development License
-   Grant.  Subject to the terms and conditions of
-   this Agreement, including, but not limited to
-   Section 3 (Java(TM) Technology Restrictions) of
-   these Supplemental Terms, Sun grants you a
-   non-exclusive, non-transferable, limited license
-   to reproduce internally and use internally the
-   binary form of the Software, complete and
-   unmodified, for the sole purpose of designing,
-   developing and testing your Java applets and
-   applications ("Programs").
+READ THE TERMS OF THIS AGREEMENT ("AGREEMENT") CAREFULLY BEFORE OPENING
+SOFTWARE MEDIA PACKAGE. BY OPENING SOFTWARE MEDIA PACKAGE, YOU AGREE TO
+THE TERMS OF THIS AGREEMENT. IF YOU ARE ACCESSING SOFTWARE
+ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING
+THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT. IF YOU DO NOT AGREE
+TO ALL OF THE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE
+OF PURCHASE FOR A REFUND OR, IF SOFTWARE IS ACCESSED ELECTRONICALLY,
+SELECT THE "DECLINE" (OR "EXIT") BUTTON AT THE END OF THIS AGREEMENT.
+IF YOU HAVE SEPARATELY AGREED TO LICENSE TERMS ("MASTER TERMS") FOR
+YOUR LICENSE TO THIS SOFTWARE, THEN SECTIONS 1-5 OF THIS AGREEMENT
+("SUPPLEMENTAL LICENSE TERMS") SHALL SUPPLEMENT AND SUPERSEDE THE
+MASTER TERMS IN RELATION TO THIS SOFTWARE.
 
-   2. License to Distribute Software.  In addition to
-   the license granted in Section 1 (Software
-   Internal Use and Development License Grant) of
-   these Supplemental Terms, subject to the terms and
-   conditions of this Agreement, including but not
-   limited to, Section 3 (Java Technology
-   Restrictions) of these Supplemental Terms, Sun
-   grants you a non-exclusive, non-transferable,
-   limited license to reproduce and distribute the
-   Software in binary code form only, provided that
-   you (i) distribute the Software complete and
-   unmodified and only bundled as part of your
-   Programs, (ii) do not distribute additional
-   software intended to replace any component(s) of
-   the Software, (iii) do not remove or alter any
-   proprietary legends or notices contained in the
-   Software, (iv) only distribute the Software
-   subject to a license agreement that protects Sun's
-   interests consistent with the terms contained in
-   this Agreement, and (v) agree to defend and
-   indemnify Sun and its licensors from and against
-   any damages, costs, liabilities, settlement
-   amounts and/or expenses (including attorneys'
-   fees) incurred in connection with any claim,
-   lawsuit or action by any third party that arises
-   or results from the use or distribution of any and
-   all Programs and/or Software.
+1.      Definitions.
 
-   3. Java Technology Restrictions. You may not
-   modify the Java Platform Interface ("JPI",
-   identified as classes contained within the "java"
-   package or any subpackages of the "java" package),
-   by creating additional classes within the JPI or
-   otherwise causing the addition to or modification
-   of the classes in the JPI.  In the event that you
-   create an additional class and associated API(s)
-   which (i) extends the functionality of the Java
-   platform, and (ii) is exposed to third party
-   software developers for the purpose of developing
-   additional software which invokes such additional
-   API, you must promptly publish broadly an accurate
-   specification for such API for free use by all
-   developers.  You may not create, or authorize your
-   licensees to create additional classes,
-   interfaces, or subpackages that are in any way
-   identified as "java", "javax", "sun" or similar
-   convention as specified by Sun in any naming
-   convention designation.
+(a)     "Entitlement" means the collective set of applicable documents
+authorized by Sun evidencing your obligation to pay associated fees (if
+any) for the license, associated Services, and the authorized scope of
+use of Software under this Agreement.
 
-   4. No Support. Sun is under no obligation to
-   support the Software or to provide you with
-   updates or error corrections. You acknowledge that
-   the Software may have defects or deficiencies
-   which cannot or will not be corrected by Sun.
+(b)     "Licensed Unit" means the unit of measure by which your use of
+Software and/or Service is licensed, as described in your Entitlement.
 
-   5. Trademarks and Logos. You acknowledge and agree
-   as between you and Sun that Sun owns the SUN,
-   SOLARIS, JAVA, JINI, FORTE, and iPLANET trademarks
-   and all SUN, SOLARIS, JAVA, JINI, FORTE, and
-   iPLANET-related trademarks, service marks, logos
-   and other brand designations ("Sun Marks"), and
-   you agree to comply with the Sun Trademark and
-   Logo Usage Requirements currently located at
-   http://www.sun.com/policies/trademarks. Any use
-   you make of the Sun Marks inures to Sun's benefit.
+(c)     "Permitted Use" means the licensed Software use(s) authorized
+in this Agreement as specified in your Entitlement. The Permitted Use
+for any bundled Sun software not specified in your Entitlement will be
+evaluation use as provided in Section 3.
 
-   6. Source Code. Software may contain source code
-   that is provided solely for reference purposes
-   pursuant to the terms of this Agreement.  Source
-   code may not be redistributed unless expressly
-   provided for in this Agreement.
+(d)     "Service" means the service(s) that Sun or its delegate will
+provide, if any, as selected in your Entitlement and as further
+described in the applicable service listings at
+www.sun.com/service/servicelist.
 
-   7. Termination for Infringement.  Either party may
-   terminate this Agreement immediately should any
-   Software become, or in either party's opinion be
-   likely to become, the subject of a claim of
-   infringement of any intellectual property right.
+(e)     "Software" means the Sun software described in your
+Entitlement. Also, certain software may be included for evaluation use
+under Section 3.
 
-   For inquiries please contact: Sun Microsystems,
-   Inc.  901 San Antonio Road, Palo Alto, California
-   94303
-   (LFI#115020/Form ID#011801)
+(f)     "You" and "Your" means the individual or legal entity specified
+in the Entitlement, or for evaluation purposes, the entity performing
+the evaluation.
+
+2.      License Grant and Entitlement.
+
+Subject to the terms of your Entitlement, Sun grants you a
+nonexclusive, nontransferable limited license to use Software for its
+Permitted Use for the license term. Your Entitlement will specify (a)
+Software licensed, (b) the Permitted Use, (c) the license term, and (d)
+the Licensed Units.
+
+Additionally, if your Entitlement includes Services, then it will also
+specify the (e) Service and (f) service term.
+
+If your rights to Software or Services are limited in duration and the
+date such rights begin is other than the purchase date, your
+Entitlement will provide that beginning date(s).
+
+The Entitlement may be delivered to you in various ways depending on
+the manner in which you obtain Software and Services, for example, the
+Entitlement may be provided in your receipt, invoice or your contract
+with Sun or authorized Sun reseller. It may also be in electronic
+format if you download Software.
+
+3.      Permitted Use.
+
+As selected in your Entitlement, one or more of the following Permitted
+Uses will apply to your use of Software. Unless you have an Entitlement
+that expressly permits it, you may not use Software for any of the
+other Permitted Uses. If you don't have an Entitlement, or if your
+Entitlement doesn't cover additional software delivered to you, then
+such software is for your Evaluation Use.
+
+(a) Evaluation Use. You may evaluate Software internally for a period
+of 90 days from your first use.
+
+(b) Research and Instructional Use. You may use Software internally to
+design, develop and test, and also to provide instruction on such
+uses.
+
+(c) Individual Use. You may use Software internally for personal,
+individual use.
+
+(d) Commercial Use. You may use Software internally for your own
+commercial purposes.
+
+(e) Service Provider Use. You may make Software functionality
+accessible (but not by providing Software itself or through outsourcing
+services) to your end users in an extranet deployment, but not to your
+affiliated companies or to government agencies.
+
+4.      Licensed Units.
+
+Your Permitted Use is limited to the number of Licensed Units stated in
+your Entitlement. If you require additional Licensed Units, you will
+need additional Entitlement(s).
+
+5.	Restrictions.
+
+(a) The copies of Software provided to you under this Agreement are
+licensed, not sold, to you by Sun. Sun reserves all rights not
+expressly granted. (b) You may make a single archival copy of Software,
+but otherwise may not copy, modify, or distribute Software. However if
+the Sun documentation accompanying Software lists specific portions of
+Software, such as header files, class libraries, reference source code,
+and/or redistributable files, that may be handled differently, you may
+do so only as provided in the Sun documentation. (c) You may not rent,
+lease, lend or encumber Software. (d) Unless enforcement is prohibited
+by applicable law, you may not decompile, or reverse engineer
+Software.  (e) The terms and conditions of this Agreement will apply to
+any Software updates, provided to you at Sun's discretion, that replace
+and/or supplement the original Software, unless such update contains a
+separate license. (f) You may not publish or provide the results of any
+benchmark or comparison tests run on Software to any third party
+without the prior written consent of Sun. (g) Software is confidential
+and copyrighted. (h) Unless otherwise specified, if Software is
+delivered with embedded or bundled software that enables functionality
+of Software, you may not use such software on a stand-alone basis or
+use any portion of such software to interoperate with any program(s)
+other than Software.  (i) Software may contain programs that perform
+automated collection of system data and/or automated software updating
+services. System data collected through such programs may be used by
+Sun, its subcontractors, and its service delivery partners for the
+purpose of providing you with remote system services and/or improving
+Sun's software and systems. (j) Software is not designed, licensed or
+intended for use in the design, construction, operation or maintenance
+of any nuclear facility and Sun and its licensors disclaim any express
+or implied warranty of fitness for such uses. (k) No right, title or
+interest in or to any trademark, service mark, logo or trade name of
+Sun or its licensors is granted under this Agreement.
+
+6.	Term and Termination. 
+
+The license and service term are set forth in your Entitlement(s). Your
+rights under this Agreement will terminate immediately without notice
+from Sun if you materially breach it or take any action in derogation
+of Sun's and/or its licensors' rights to Software. Sun may terminate
+this Agreement should any Software become, or in Sun's reasonable
+opinion likely to become, the subject of a claim of intellectual
+property infringement or trade secret misappropriation. Upon
+termination, you will cease use of, and destroy, Software and confirm
+compliance in writing to Sun. Sections 1, 5, 6, 7, and 9-15 will
+survive termination of the Agreement.
+
+7.      Java Compatibility and Open Source.
+
+Software may contain Java technology. You may not create additional
+classes to, or modifications of, the Java technology, except under
+compatibility requirements available under a separate agreement
+available at www.java.net.
+
+Sun supports and benefits from the global community of open source
+developers, and thanks the community for its important contributions
+and open standards-based technology, which Sun has adopted into many of
+its products.
+
+Please note that portions of Software may be provided with notices and
+open source licenses from such communities and third parties that
+govern the use of those portions, and any licenses granted hereunder do
+not alter any rights and obligations you may have under such open
+source licenses, however, the disclaimer of warranty and limitation of
+liability provisions in this Agreement will apply to all Software in
+this distribution.
+
+8.      Limited Warranty.
+
+Sun warrants to you that for a period of 90 days from the date of
+purchase, as evidenced by a copy of the receipt, the media on which
+Software is furnished (if any) will be free of defects in materials and
+workmanship under normal use. Except for the foregoing, Software is
+provided "AS IS". Your exclusive remedy and Sun's entire liability
+under this limited warranty will be at Sun's option to replace Software
+media or refund the fee paid for Software. Some states do not allow
+limitations on certain implied warranties, so the above may not apply
+to you. This limited warranty gives you specific legal rights. You may
+have others, which vary from state to state.
+
+9.      Disclaimer of Warranty.
+
+UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
+REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT
+ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO
+BE LEGALLY INVALID.
+
+10.     Limitation of Liability.
+
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS
+LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES,
+HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR
+RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event will Sun's
+liability to you, whether in contract, tort (including negligence), or
+otherwise, exceed the amount paid by you for Software under this
+Agreement. The foregoing limitations will apply even if the above
+stated warranty fails of its essential purpose. Some states do not
+allow the exclusion of incidental or consequential damages, so some of
+the terms above may not be applicable to you.
+
+11.     Export Regulations.
+
+All Software, documents, technical data, and any other materials
+delivered under this Agreement are subject to U.S. export control laws
+and may be subject to export or import regulations in other countries.
+You agree to comply strictly with these laws and regulations and
+acknowledge that you have the responsibility to obtain any licenses to
+export, re-export, or import as may be required after delivery to you.
+
+12.     U.S. Government Restricted Rights.
+
+If Software is being acquired by or on behalf of the U.S. Government or
+by a U.S. Government prime contractor or subcontractor (at any tier),
+then the Government's rights in Software and accompanying documentation
+will be only as set forth in this Agreement; this is in accordance with
+48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD)
+acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD
+acquisitions).
+
+13.     Governing Law.
+
+Any action related to this Agreement will be governed by California law
+and controlling U.S. federal law. No choice of law rules of any
+jurisdiction will apply.
+
+14.     Severability.
+
+If any provision of this Agreement is held to be unenforceable, this
+Agreement will remain in effect with the provision omitted, unless
+omission would frustrate the intent of the parties, in which case this
+Agreement will immediately terminate.
+
+15.     Integration.
+
+This Agreement, including any terms contained in your Entitlement, is
+the entire agreement between you and Sun relating to its subject
+matter. It supersedes all prior or contemporaneous oral or written
+communications, proposals, representations and warranties and prevails
+over any conflicting or additional terms of any quote, order,
+acknowledgment, or other communication between the parties relating to
+its subject matter during the term of this Agreement. No modification
+of this Agreement will be binding, unless in writing and signed by an
+authorized representative of each party.
+
+Please contact Sun Microsystems, Inc. 4150 Network Circle, Santa Clara,
+California 95054 if you have questions.

dspace/lib/licenses/activation.jar.license.distribution-addendum

@@ -0,0 +1,38 @@
+DistributionREADME
+
+DISTRIBUTION BY DEVELOPERS.  Subject to the terms and conditions of the
+Software License Agreement and the obligations, restrictions, and
+exceptions set forth below, You may reproduce and distribute the
+portions of Software identified below (each a "Redistributable"),
+provided that:
+
+(a) you distribute the Redistributable complete and unmodified and only
+bundled as part of Your applets and applications ("Programs"),
+
+(b) your Programs add significant and primary functionality to the
+Software
+
+(c) you distribute Redistributable for the sole purpose of running your
+Programs,
+
+(d) you do not distribute additional software intended to replace any
+component(s) of the Redistributable,
+
+(e) you do not remove or alter any proprietary legends or notices
+contained in or on the Redistributable.
+
+(f) you only distribute the Redistributable subject to a license
+agreement that protects Sun's interests consistent with the terms
+contained in the Software License Agreement, and
+
+(g) you agree to defend and indemnify Sun and its licensors from and
+against any damages, costs, liabilities, settlement amounts and/or
+expenses  (including attorneys' fees) incurred in connection with any
+claim, lawsuit or action by any third party that arises or results from
+the use or distribution of any and all Programs and/or
+Redistributable.
+
+The following files are each a Redistributable:
+
+activation.jar
+

dspace/lib/licenses/commons-collections.jar.license

@@ -1,59 +1,203 @@
-Apache software license (commons-collections.jar, commons-dbcp.jar, 
-commons-pool.jar, log4j.jar, lucene.jar, oro.jar, xalan.jar, xerces.jar)
 
-/*
- * The Apache Software License, Version 1.1
- *
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation.  All rights 
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:  
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written 
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.ibm.com.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

dspace/lib/licenses/commons-fileupload.jar.license

@@ -1,53 +1,203 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
- *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

dspace/lib/licenses/commons-io.jar.license

@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

dspace/lib/licenses/commons-pool.jar.license

@@ -1,59 +1,203 @@
-Apache software license (commons-collections.jar, commons-dbcp.jar, 
-commons-pool.jar, log4j.jar, lucene.jar, oro.jar, xalan.jar, xerces.jar)
 
-/*
- * The Apache Software License, Version 1.1
- *
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation.  All rights 
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:  
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written 
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.ibm.com.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

dspace/lib/licenses/fontbox.jar.license

@@ -0,0 +1,25 @@
+Copyright (c) 2003-2005, www.fontbox.org
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of fontbox; nor the names of its
+   contributors may be used to endorse or promote products derived from this
+   software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

dspace/lib/licenses/jakarta-poi.jar.license

@@ -1,55 +1,203 @@
-This is the license for the POI library
 
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- *    "Apache POI" must not be used to endorse or promote products
- *    derived from this software without prior written permission. For
- *    written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    "Apache POI", nor may "Apache" appear in their name, without
- *    prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

dspace/lib/licenses/jargon.jar.license

@@ -1,30 +1,27 @@
-Copyright (c) 2005, Regents of the University of California
+Copyright (c) 2006, Regents of the University of California
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-   * Redistributions of source code must retain the above
-     copyright notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
-   * Neither the name of the San Diego Super Computer Center (SDSC) nor the
-     names of its contributors may be used to endorse or promote products
-     derived from this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+  * Neither the name of the University of California, San Diego (UCSD) nor the
+names of its contributors may be used to endorse or promote products
+derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO,PROCUREMENT OF SUBSTITUTE GOODS OR 
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
-OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

dspace/lib/licenses/jaxen.jar.license

@@ -0,0 +1,33 @@
+/*
+ $Id$
+
+ Copyright 2003-2006 The Werken Company. All Rights Reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of the Jaxen Project nor the names of its
+    contributors may be used to endorse or promote products derived 
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ */

dspace/lib/licenses/log4j.jar.license

@@ -1,59 +1,203 @@
-Apache software license (commons-collections.jar, commons-dbcp.jar, 
-commons-pool.jar, log4j.jar, lucene.jar, oro.jar, xalan.jar, xerces.jar)
 
-/*
- * The Apache Software License, Version 1.1
- *
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation.  All rights 
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:  
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written 
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.ibm.com.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

dspace/lib/licenses/lucene.jar.license

@@ -1,59 +1,203 @@
-Apache software license (commons-collections.jar, commons-dbcp.jar, 
-commons-pool.jar, log4j.jar, lucene.jar, oro.jar, xalan.jar, xerces.jar)
 
-/*
- * The Apache Software License, Version 1.1
- *
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation.  All rights 
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:  
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written 
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.ibm.com.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

dspace/lib/licenses/mail.jar.license

@@ -0,0 +1,300 @@
+Software: JavaBeans Activation Framework 1.1.
+
+License Term:  Perpetual (subject to termination under the SLA).
+
+Licensed Unit: Software Copy.
+
+Licensed unit Count: Unlimited.
+
+Permitted Uses:
+
+1. You may reproduce and use the Software for Individual, Commercial,
+or Research and Instructional Use for the purposes of designing,
+developing, testing, and running Your applets and
+application("Programs").
+
+2. Subject to the terms and conditions of this Agreement and
+restrictions and exceptions set forth in the Software's documentation,
+You may reproduce and distribute portions of Software identified as a
+redistributable in the documentation ("Redistributable"), provided
+that:
+
+(a) you distribute Redistributable complete and unmodified and only
+bundled as part of Your Programs,
+
+(b) your Programs add significant and primary functionality to the
+Redistributable,
+
+(c) you distribute Redistributable for the sole purpose of running your
+Programs,
+
+(d) you do not distribute additional software intended to replace any
+component(s) of the Redistributable,
+
+(e) you do not remove or alter any proprietary legends or notices
+contained in or on the Redistributable.
+
+(f) you only distribute the Redistributable subject to a license
+agreement that protects Sun's interests consistent with the terms
+contained in this Agreement, and
+
+(g) you agree to defend and indemnify Sun and its licensors from and
+against any damages, costs, liabilities, settlement amounts and/or
+expenses  (including attorneys' fees) incurred in connection with any
+claim, lawsuit or action by any third party that arises or results from
+the use or distribution of any and all Programs and/or
+Redistributable.
+
+3. Java Technology Restrictions.  You may not create, modify, or change
+the behavior of, or authorize your licensees to create, modify, or
+change the behavior of, classes, interfaces, or subpackages that are in
+any way identified as "java", "javax", "sun" or similar convention as
+specified by Sun in any naming convention designation.
+
+B. Sun Microsystems, Inc. ("Sun")
+SOFTWARE LICENSE AGREEMENT
+
+READ THE TERMS OF THIS AGREEMENT ("AGREEMENT") CAREFULLY BEFORE OPENING
+SOFTWARE MEDIA PACKAGE. BY OPENING SOFTWARE MEDIA PACKAGE, YOU AGREE TO
+THE TERMS OF THIS AGREEMENT. IF YOU ARE ACCESSING SOFTWARE
+ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING
+THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT. IF YOU DO NOT AGREE
+TO ALL OF THE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE
+OF PURCHASE FOR A REFUND OR, IF SOFTWARE IS ACCESSED ELECTRONICALLY,
+SELECT THE "DECLINE" (OR "EXIT") BUTTON AT THE END OF THIS AGREEMENT.
+IF YOU HAVE SEPARATELY AGREED TO LICENSE TERMS ("MASTER TERMS") FOR
+YOUR LICENSE TO THIS SOFTWARE, THEN SECTIONS 1-5 OF THIS AGREEMENT
+("SUPPLEMENTAL LICENSE TERMS") SHALL SUPPLEMENT AND SUPERSEDE THE
+MASTER TERMS IN RELATION TO THIS SOFTWARE.
+
+1.      Definitions.
+
+(a)     "Entitlement" means the collective set of applicable documents
+authorized by Sun evidencing your obligation to pay associated fees (if
+any) for the license, associated Services, and the authorized scope of
+use of Software under this Agreement.
+
+(b)     "Licensed Unit" means the unit of measure by which your use of
+Software and/or Service is licensed, as described in your Entitlement.
+
+(c)     "Permitted Use" means the licensed Software use(s) authorized
+in this Agreement as specified in your Entitlement. The Permitted Use
+for any bundled Sun software not specified in your Entitlement will be
+evaluation use as provided in Section 3.
+
+(d)     "Service" means the service(s) that Sun or its delegate will
+provide, if any, as selected in your Entitlement and as further
+described in the applicable service listings at
+www.sun.com/service/servicelist.
+
+(e)     "Software" means the Sun software described in your
+Entitlement. Also, certain software may be included for evaluation use
+under Section 3.
+
+(f)     "You" and "Your" means the individual or legal entity specified
+in the Entitlement, or for evaluation purposes, the entity performing
+the evaluation.
+
+2.      License Grant and Entitlement.
+
+Subject to the terms of your Entitlement, Sun grants you a
+nonexclusive, nontransferable limited license to use Software for its
+Permitted Use for the license term. Your Entitlement will specify (a)
+Software licensed, (b) the Permitted Use, (c) the license term, and (d)
+the Licensed Units.
+
+Additionally, if your Entitlement includes Services, then it will also
+specify the (e) Service and (f) service term.
+
+If your rights to Software or Services are limited in duration and the
+date such rights begin is other than the purchase date, your
+Entitlement will provide that beginning date(s).
+
+The Entitlement may be delivered to you in various ways depending on
+the manner in which you obtain Software and Services, for example, the
+Entitlement may be provided in your receipt, invoice or your contract
+with Sun or authorized Sun reseller. It may also be in electronic
+format if you download Software.
+
+3.      Permitted Use.
+
+As selected in your Entitlement, one or more of the following Permitted
+Uses will apply to your use of Software. Unless you have an Entitlement
+that expressly permits it, you may not use Software for any of the
+other Permitted Uses. If you don't have an Entitlement, or if your
+Entitlement doesn't cover additional software delivered to you, then
+such software is for your Evaluation Use.
+
+(a) Evaluation Use. You may evaluate Software internally for a period
+of 90 days from your first use.
+
+(b) Research and Instructional Use. You may use Software internally to
+design, develop and test, and also to provide instruction on such
+uses.
+
+(c) Individual Use. You may use Software internally for personal,
+individual use.
+
+(d) Commercial Use. You may use Software internally for your own
+commercial purposes.
+
+(e) Service Provider Use. You may make Software functionality
+accessible (but not by providing Software itself or through outsourcing
+services) to your end users in an extranet deployment, but not to your
+affiliated companies or to government agencies.
+
+4.      Licensed Units.
+
+Your Permitted Use is limited to the number of Licensed Units stated in
+your Entitlement. If you require additional Licensed Units, you will
+need additional Entitlement(s).
+
+5.	Restrictions.
+
+(a) The copies of Software provided to you under this Agreement are
+licensed, not sold, to you by Sun. Sun reserves all rights not
+expressly granted. (b) You may make a single archival copy of Software,
+but otherwise may not copy, modify, or distribute Software. However if
+the Sun documentation accompanying Software lists specific portions of
+Software, such as header files, class libraries, reference source code,
+and/or redistributable files, that may be handled differently, you may
+do so only as provided in the Sun documentation. (c) You may not rent,
+lease, lend or encumber Software. (d) Unless enforcement is prohibited
+by applicable law, you may not decompile, or reverse engineer
+Software.  (e) The terms and conditions of this Agreement will apply to
+any Software updates, provided to you at Sun's discretion, that replace
+and/or supplement the original Software, unless such update contains a
+separate license. (f) You may not publish or provide the results of any
+benchmark or comparison tests run on Software to any third party
+without the prior written consent of Sun. (g) Software is confidential
+and copyrighted. (h) Unless otherwise specified, if Software is
+delivered with embedded or bundled software that enables functionality
+of Software, you may not use such software on a stand-alone basis or
+use any portion of such software to interoperate with any program(s)
+other than Software.  (i) Software may contain programs that perform
+automated collection of system data and/or automated software updating
+services. System data collected through such programs may be used by
+Sun, its subcontractors, and its service delivery partners for the
+purpose of providing you with remote system services and/or improving
+Sun's software and systems. (j) Software is not designed, licensed or
+intended for use in the design, construction, operation or maintenance
+of any nuclear facility and Sun and its licensors disclaim any express
+or implied warranty of fitness for such uses. (k) No right, title or
+interest in or to any trademark, service mark, logo or trade name of
+Sun or its licensors is granted under this Agreement.
+
+6.	Term and Termination. 
+
+The license and service term are set forth in your Entitlement(s). Your
+rights under this Agreement will terminate immediately without notice
+from Sun if you materially breach it or take any action in derogation
+of Sun's and/or its licensors' rights to Software. Sun may terminate
+this Agreement should any Software become, or in Sun's reasonable
+opinion likely to become, the subject of a claim of intellectual
+property infringement or trade secret misappropriation. Upon
+termination, you will cease use of, and destroy, Software and confirm
+compliance in writing to Sun. Sections 1, 5, 6, 7, and 9-15 will
+survive termination of the Agreement.
+
+7.      Java Compatibility and Open Source.
+
+Software may contain Java technology. You may not create additional
+classes to, or modifications of, the Java technology, except under
+compatibility requirements available under a separate agreement
+available at www.java.net.
+
+Sun supports and benefits from the global community of open source
+developers, and thanks the community for its important contributions
+and open standards-based technology, which Sun has adopted into many of
+its products.
+
+Please note that portions of Software may be provided with notices and
+open source licenses from such communities and third parties that
+govern the use of those portions, and any licenses granted hereunder do
+not alter any rights and obligations you may have under such open
+source licenses, however, the disclaimer of warranty and limitation of
+liability provisions in this Agreement will apply to all Software in
+this distribution.
+
+8.      Limited Warranty.
+
+Sun warrants to you that for a period of 90 days from the date of
+purchase, as evidenced by a copy of the receipt, the media on which
+Software is furnished (if any) will be free of defects in materials and
+workmanship under normal use. Except for the foregoing, Software is
+provided "AS IS". Your exclusive remedy and Sun's entire liability
+under this limited warranty will be at Sun's option to replace Software
+media or refund the fee paid for Software. Some states do not allow
+limitations on certain implied warranties, so the above may not apply
+to you. This limited warranty gives you specific legal rights. You may
+have others, which vary from state to state.
+
+9.      Disclaimer of Warranty.
+
+UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
+REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT
+ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO
+BE LEGALLY INVALID.
+
+10.     Limitation of Liability.
+
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS
+LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES,
+HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR
+RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event will Sun's
+liability to you, whether in contract, tort (including negligence), or
+otherwise, exceed the amount paid by you for Software under this
+Agreement. The foregoing limitations will apply even if the above
+stated warranty fails of its essential purpose. Some states do not
+allow the exclusion of incidental or consequential damages, so some of
+the terms above may not be applicable to you.
+
+11.     Export Regulations.
+
+All Software, documents, technical data, and any other materials
+delivered under this Agreement are subject to U.S. export control laws
+and may be subject to export or import regulations in other countries.
+You agree to comply strictly with these laws and regulations and
+acknowledge that you have the responsibility to obtain any licenses to
+export, re-export, or import as may be required after delivery to you.
+
+12.     U.S. Government Restricted Rights.
+
+If Software is being acquired by or on behalf of the U.S. Government or
+by a U.S. Government prime contractor or subcontractor (at any tier),
+then the Government's rights in Software and accompanying documentation
+will be only as set forth in this Agreement; this is in accordance with
+48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD)
+acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD
+acquisitions).
+
+13.     Governing Law.
+
+Any action related to this Agreement will be governed by California law
+and controlling U.S. federal law. No choice of law rules of any
+jurisdiction will apply.
+
+14.     Severability.
+
+If any provision of this Agreement is held to be unenforceable, this
+Agreement will remain in effect with the provision omitted, unless
+omission would frustrate the intent of the parties, in which case this
+Agreement will immediately terminate.
+
+15.     Integration.
+
+This Agreement, including any terms contained in your Entitlement, is
+the entire agreement between you and Sun relating to its subject
+matter. It supersedes all prior or contemporaneous oral or written
+communications, proposals, representations and warranties and prevails
+over any conflicting or additional terms of any quote, order,
+acknowledgment, or other communication between the parties relating to
+its subject matter during the term of this Agreement. No modification
+of this Agreement will be binding, unless in writing and signed by an
+authorized representative of each party.
+
+Please contact Sun Microsystems, Inc. 4150 Network Circle, Santa Clara,
+California 95054 if you have questions.

dspace/lib/licenses/mail.jar.license.distribution-addendum

@@ -0,0 +1,42 @@
+DistributionREADME
+
+DISTRIBUTION BY DEVELOPERS.  Subject to the terms and conditions of the
+Software License Agreement and the obligations, restrictions, and
+exceptions set forth below, You may reproduce and distribute the
+portions of Software identified below (each a "Redistributable"),
+provided that:
+
+(a) you distribute the Redistributable complete and unmodified and only
+bundled as part of Your applets and applications ("Programs"),
+
+(b) your Programs add significant and primary functionality to the
+Software
+
+(c) you distribute Redistributable for the sole purpose of running your
+Programs,
+
+(d) you do not distribute additional software intended to replace any
+component(s) of the Redistributable,
+
+(e) you do not remove or alter any proprietary legends or notices
+contained in or on the Redistributable.
+
+(f) you only distribute the Redistributable subject to a license
+agreement that protects Sun's interests consistent with the terms
+contained in the Software License Agreement, and
+
+(g) you agree to defend and indemnify Sun and its licensors from and
+against any damages, costs, liabilities, settlement amounts and/or
+expenses  (including attorneys' fees) incurred in connection with any
+claim, lawsuit or action by any third party that arises or results from
+the use or distribution of any and all Programs and/or
+Redistributable.
+
+The following files are each a Redistributable:
+
+mail.jar
+lib/mailapi.jar
+lib/imap.jar
+lib/smtp.jar
+lib/pop3.jar
+lib/dsn.jar

dspace/lib/licenses/pdfbox.jar.license

@@ -1,4 +1,4 @@
-Copyright (c) 2003, www.pdfbox.org
+Copyright (c) 2003-2005, www.pdfbox.org
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

dspace/lib/licenses/serializer.jar.license

@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

dspace/src/org/dspace/administer/CreateAdministrator.java

@@ -148,15 +148,21 @@ public class CreateAdministrator
             }
 
             // Create the administrator e-person
-            EPerson eperson = EPerson.create(context);
-
-            eperson.setEmail(email);
+            EPerson eperson = EPerson.findByEmail(context,email);
+            
+            // check if the email belongs to a registered user,
+            // if not create a new user with this email
+            if (eperson == null)
+            {
+                eperson = EPerson.create(context);
+                eperson.setEmail(email);
+                eperson.setCanLogIn(true);
+                eperson.setRequireCertificate(false);
+                eperson.setSelfRegistered(false);
+            }
             eperson.setLastName(lastName);
             eperson.setFirstName(firstName);
             eperson.setPassword(password1);
-            eperson.setCanLogIn(true);
-            eperson.setRequireCertificate(false);
-            eperson.setSelfRegistered(false);
             eperson.update();
 
             admins.addMember(eperson);

dspace/src/org/dspace/app/checker/ChecksumChecker.java

@@ -253,7 +253,7 @@ public class ChecksumChecker
         {
             checker.setReportVerbose(true);
         }
-        checker.configureLog();
+
         checker.setProcessStartDate(processStart);
         checker.setDispatcher(dispatcher);
         checker.setCollector(logger);

dspace/src/org/dspace/app/didl/UUID.java

@@ -1,87 +1,142 @@
-/******************************************************************************
- * DSPACE DIDL MODULE UUID GENERATOR
- * AUTHOR
- *        Los Alamos National Laboratory
- *        Research Library
- *        Digital Library Research & Prototyping Team
- *        Henry Jerez
- *        2004, 2005
- *CONTACT
- *   proto@gws.lanl.gov
- *VERSION
- *  Beta 1
- *  date 07/26/2005
- * ACKNOWLEDGMENT
- *    Development of this code is part of the aDORe repository project by the Research Library of the Los Alamos National Laboratory.
-* BASED ON:
- * Implementation of UUID version 4 (the one that uses random/pseudo-random
- * numbers) 
- * By: Ashraf Amrou
- * Old Dominion University
- * Aug 14, 2003
- *****************************************************************************/
+/*
+ * Copyright (c) 2004-2005, Hewlett-Packard Company and Massachusetts
+ * Institute of Technology.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Hewlett-Packard Company nor the name of the
+ * Massachusetts Institute of Technology nor the names of their
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
 package org.dspace.app.didl;
 
-import java.io.*;
+import java.io.Serializable;
 /**
- * This class implements UUID version 4
- * The values for the various fields are crypto random values set by 
- * the factory class UUIDFactory
+ * This class implements UUID version 4. The values for the various fields are
+ * crypto random values set by the factory class UUIDFactory
+ * 
+ * Development of this code was part of the aDORe repository project by the
+ * Research Library of the Los Alamos National Laboratory.
+ * 
+ * This code is based on the implementation of UUID version 4 (the one that
+ * uses random/pseudo-random numbers by Ashraf Amrou of the Old Dominion University
+ * (Aug 14, 2003)
  **/
-public final class UUID implements java.io.Serializable {
+public final class UUID implements Serializable
+{
     private long hi;
     private long lo;
-    ///////////////////////////////////////////////////
+
     /**
-     * Construct a Version 4 UUID object form another UUID object
+     * Construct a Version 4 UUID object from another UUID object
+     * 
+     * @param uuid
+     *          the UUID to use as a base for the new UUID 
      **/
-    public UUID(UUID uuid) {
+    public UUID(UUID uuid)
+    {
         this.hi = uuid.hi;
         this.lo = uuid.lo;
     }
-    ///////////////////////////////////////////////////
+    
     /**
      * Construct a Version 4 UUID object form the two given long values.
      * These values are (pseudo)random numbers (best if crypto quality)
+     * 
+     * @param _hi
+     *      first long value
+     *      
+     * @param _lo
+     *      second long value
+     *      
      **/
-    public UUID(long _hi, long _lo) {
+    public UUID(long _hi, long _lo)
+    {
         this.hi = _hi;
         this.lo = _lo;
         // IETF variant (10)b
         lo &= 0x3FFFFFFFFFFFFFFFL; lo |= 0x8000000000000000L;
-        // set multicast bit (so that it there is no chance it will clash with other UUIDs generated based on real IEEE 802 addresses)
+        // set multicast bit (so that it there is no chance it will clash
+        // with other UUIDs generated based on real IEEE 802 addresses)
         lo |= 0x0000800000000000L;
         // version 4 (100)b: the one based on random/pseudo-random numbers
         hi &= 0xFFFFFFFFFFFF0FFFL; hi |= 0x0000000000004000L;
     }
-    ///////////////////////////////////////////////////
+
     /**
-     * Returns true if equal
+     * Compare UUID objects 
+     * 
+     * @param obj
+     *      the object to compare this UUID against
+     * 
+     * @return true or false
      **/
-    public boolean equals( Object obj ) {
+    public boolean equals(Object obj)
+    {
         if(this == obj) // comparing to myself
             return true;
         if(obj instanceof UUID)
             return equals((UUID)obj);
         return false;
     }
-    ///////////////////////////////////////////////////
+
     /**
-     * Returns true if equal
+     * Compare UUIDs 
+     * 
+     * @param uuid
+     *      the UUID to compare this UUID against
+     * 
+     * @return true or false
      **/
-    public boolean equals(UUID uuid) {
+    public boolean equals(UUID uuid)
+    {
         return (hi == uuid.hi && lo == uuid.lo);
     }
-    ///////////////////////////////////////////////////
-    public int hashCode(){
-        return new Long(hi ^ lo).hashCode();
-        //return new Long(((((long)(new Long(hi).hashCode())) << 32) + ((long)(new Long(lo).hashCode())))).hashCode();
-    }
-    ///////////////////////////////////////////////////
+
+    
     /**
-     * Returns the string representation of this UUID
+     * Generate a hash for the UUID 
+     * 
+     * @return hash code for the UUID
+     * 
      **/
-    public String toString() {
+    public int hashCode()
+    {
+        return new Long(hi ^ lo).hashCode();
+    }
+ 
+    
+    /**
+     * Obtain a string representation of the UUID object
+     * 
+     * @return the string representation of this UUID
+     * 
+     **/
+    public String toString()
+    {
         return (/**"urn:uuid:" + **/
                 hexDigits(hi >> 32, 4)  // time_low: 4 hexOctet (8 hex digits)
                 + "-" + 
@@ -93,9 +148,19 @@ public final class UUID implements java.io.Serializable {
                 + "-" +
                 hexDigits(lo, 6));      // node: 6 hexOctet (12 hex digits)
     }
-    ///////////////////////////////////////////////////
+
     /**
-     * Returns the Hex value of the nHexOctets lest significant octets from the long value lVal as a String
+     * Obtain the Hex value of a given number of least significant octets
+     * from a long value as a String
+     * 
+     * @param lVal
+     *          the long value to retrieve octets from
+     * 
+     * @param nHexOctets
+     *          number of hex octets to return
+     * 
+     * @return hex value of least significant octets as a string 
+     * 
      **/
     private static String hexDigits(long lVal, int nHexOctets) {
         long tmp = 1L << (nHexOctets * 2 * 4); // e.g., if nHexOctets is 2, tmp = (1 0000 0000 0000 0000)b & tmp - 1 = (1111 1111 1111 1111)b
@@ -103,6 +168,4 @@ public final class UUID implements java.io.Serializable {
         result = tmp | result; // make sure the digit at position (nDigits + 1) equals 1 (to preserve leading zeroes)
         return Long.toHexString(result).substring(1); // getride ot the digit at position nDigits + 1
     }
-    ///////////////////////////////////////////////////
-}
-
+}

dspace/src/org/dspace/app/didl/UUIDFactory.java

@@ -1,25 +1,36 @@
-/******************************************************************************
- * DSPACE DIDL MODULE UUID GENERATOR
- * AUTHOR
- *        Los Alamos National Laboratory
- *        Research Library
- *        Digital Library Research & Prototyping Team
- *        Henry Jerez
- *        2004, 2005
- *CONTACT
- *   proto@gws.lanl.gov
- *VERSION
- *  Beta 1
- *  date 07/26/2005 
- * ACKNOWLEDGMENT
- *    Development of this code is part of the aDORe repository project by the Research Library of the Los Alamos National Laboratory.
-* BASED ON:
- *Implementation of UUID version 4 (the one that uses random/pseudo-random
- * numbers) 
- * By: Ashraf Amrou
- * Old Dominion University
- * Aug 14, 2003
- *****************************************************************************/
+/*
+ * Copyright (c) 2004-2005, Hewlett-Packard Company and Massachusetts
+ * Institute of Technology.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Hewlett-Packard Company nor the name of the
+ * Massachusetts Institute of Technology nor the names of their
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
 package org.dspace.app.didl;
 
 import java.security.SecureRandom;
@@ -27,32 +38,39 @@ import java.util.Random;
 /**
  * Factory class for generating UUID version 4. All what this class does is
  * creating UUID version 4 objects using crypto-quality random numbers.
+ * 
+ * Development of this code was part of the aDORe repository project by the
+ * Research Library of the Los Alamos National Laboratory.
+ * 
+ * This code is based on the implementation of UUID version 4 (the one that
+ * uses random/pseudo-random numbers by Ashraf Amrou of the Old Dominion University
+ * (Aug 14, 2003)
  *
  **/
-public final class UUIDFactory{
+public final class UUIDFactory
+{	
+    /** Random number generator */
+    private Random rand = null;
     
-    /**
-     * Random number generator
-     **/
-    private java.util.Random rand = null;
-    /**
-     *  an instance
-     **/
+    /**	an instance	 */
     private static UUIDFactory generator = new UUIDFactory();
-    ///////////////////////////////////////////////////    
-    /**
-     * private constructor (Singleton class)
-     **/
-    private UUIDFactory() {
+        
+    /** private constructor (Singleton class) */
+    private UUIDFactory()
+    {
         // crypto-quality random number generator
         rand = new SecureRandom();
     }
-    ///////////////////////////////////////////////////
+    
     /**
+     * 
      * Customers of this class call this method to generete new UUID objects
+     * 
+     * @return a new UUID object
+     * 
      **/
-    public synchronized static UUID generateUUID(){
+    public synchronized static UUID generateUUID()
+    {
         return new UUID(generator.rand.nextLong(),generator.rand.nextLong());
     }
-    ///////////////////////////////////////////////////
-}
+}

dspace/src/org/dspace/app/itemimport/ItemImport.java

@@ -111,6 +111,8 @@ public class ItemImport
     static boolean isTest = false;
 
     static boolean isResume = false;
+    
+    static boolean template = false;
 
     static PrintWriter mapOut = null;
 
@@ -155,6 +157,7 @@ public class ItemImport
                 "send submission through collection's workflow");
         options.addOption("t", "test", false,
                 "test run - do not actually import items");
+        options.addOption("p", "template", false, "apply template");
         options.addOption("R", "resume", false,
                 "resume a failed import (add only)");
 
@@ -209,6 +212,11 @@ public class ItemImport
             isTest = true;
             System.out.println("**Test Run** - not actually importing items.");
         }
+        
+        if (line.hasOption('p'))
+        {
+            template = true;
+        }
 
         if (line.hasOption('s')) // source
         {
@@ -404,11 +412,11 @@ public class ItemImport
 
             if (command.equals("add"))
             {
-                myloader.addItems(c, mycollections, sourcedir, mapfile);
+                myloader.addItems(c, mycollections, sourcedir, mapfile, template);
             }
             else if (command.equals("replace"))
             {
-                myloader.replaceItems(c, mycollections, sourcedir, mapfile);
+                myloader.replaceItems(c, mycollections, sourcedir, mapfile, template);
             }
             else if (command.equals("delete"))
             {
@@ -445,7 +453,7 @@ public class ItemImport
     }
 
     private void addItems(Context c, Collection[] mycollections,
-            String sourceDir, String mapFile) throws Exception
+            String sourceDir, String mapFile, boolean template) throws Exception
     {
         Map skipItems = new HashMap(); // set of items to skip if in 'resume'
         // mode
@@ -495,14 +503,14 @@ public class ItemImport
             }
             else
             {
-                addItem(c, mycollections, sourceDir, dircontents[i], mapOut);
+                addItem(c, mycollections, sourceDir, dircontents[i], mapOut, template);
                 System.out.println(i + " " + dircontents[i]);
             }
         }
     }
 
     private void replaceItems(Context c, Collection[] mycollections,
-            String sourceDir, String mapFile) throws Exception
+            String sourceDir, String mapFile, boolean template) throws Exception
     {
         // verify the source directory
         File d = new java.io.File(sourceDir);
@@ -566,7 +574,7 @@ public class ItemImport
             
             deleteItem(c, oldItem);
             
-            newItem = addItem(c, mycollections, sourceDir, newItemName, null);
+            newItem = addItem(c, mycollections, sourceDir, newItemName, null, template);
         }
     }
 
@@ -606,7 +614,7 @@ public class ItemImport
      * we're writing
      */
     private Item addItem(Context c, Collection[] mycollections, String path,
-            String itemname, PrintWriter mapOut) throws Exception
+            String itemname, PrintWriter mapOut, boolean template) throws Exception
     {
         String mapOutput = null;
 
@@ -618,7 +626,7 @@ public class ItemImport
 
         if (!isTest)
         {
-            wi = WorkspaceItem.create(c, mycollections[0], false);
+            wi = WorkspaceItem.create(c, mycollections[0], template);
             myitem = wi.getItem();
         }
 

dspace/src/org/dspace/app/mediafilter/PDFFilter.java

@@ -42,19 +42,22 @@ package org.dspace.app.mediafilter;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-import org.pdfbox.cos.COSDocument;
+import org.apache.log4j.Logger;
 import org.pdfbox.pdfparser.PDFParser;
 import org.pdfbox.pdmodel.PDDocument;
 import org.pdfbox.util.PDFTextStripper;
 
 /*
- * 
+ *
  * to do: helpful error messages - can't find mediafilter.cfg - can't
  * instantiate filter - bitstream format doesn't exist
- *  
+ *
  */
 public class PDFFilter extends MediaFilter
 {
+
+    private static Logger log = Logger.getLogger(PDFFilter.class);
+
     public String getFilteredName(String oldFilename)
     {
         return oldFilename + ".txt";
@@ -62,7 +65,7 @@ public class PDFFilter extends MediaFilter
 
     /**
      * @return String bundle name
-     *  
+     *
      */
     public String getBundleName()
     {
@@ -88,7 +91,7 @@ public class PDFFilter extends MediaFilter
     /**
      * @param source
      *            source input stream
-     * 
+     *
      * @return InputStream the resulting input stream
      */
     public InputStream getDestinationStream(InputStream source)
@@ -97,17 +100,26 @@ public class PDFFilter extends MediaFilter
         // get input stream from bitstream
         // pass to filter, get string back
         PDFTextStripper pts = new PDFTextStripper();
-        PDFParser parser = new PDFParser(source);
+        PDFParser parser = null;
+        String extractedText = null;
 
-        parser.parse();
-
-        COSDocument cos = parser.getDocument();
-
-        String extractedText = pts
-                .getText(new PDDocument(parser.getDocument()));
-
-        // now close the pdf
-        cos.close();
+        try
+        {
+            parser = new PDFParser(source);
+            parser.parse();
+            extractedText = pts.getText(new PDDocument(parser.getDocument()));
+        }
+        finally
+        {
+            try
+            {
+                parser.getDocument().close();
+            }
+            catch(Exception e)
+            {
+               log.error("Error closing temporary PDF file: " + e.getMessage(), e);
+            }
+        }
 
         // if verbose flag is set, print out extracted text
         // to STDOUT
@@ -116,10 +128,13 @@ public class PDFFilter extends MediaFilter
             System.out.println(extractedText);
         }
 
+
         // generate an input stream with the extracted text
         byte[] textBytes = extractedText.getBytes();
         ByteArrayInputStream bais = new ByteArrayInputStream(textBytes);
 
         return bais; // will this work? or will the byte array be out of scope?
+
+
     }
 }

dspace/src/org/dspace/app/oai/DIDLCrosswalk.java

@@ -1,29 +1,5 @@
 /*
-* DSPACE DIDL CROSSWALK MODULE
-*AUTHOR
-*         Los Alamos National Laboratory
-*         Research Library
-*         Digital Library Research & Prototyping Team
-*         Henry Jerez
-*         2004, 2005
-*
-*CONTACT
-*    proto@gws.lanl.gov
-*VERSION
-*    beta1    
-*    date 07/26/2005
-*ACKNOWLEDGMENT
-*    Development of this code is part of the aDORe repository project by the Research Library of the Los Alamos National Laboratory.
-*
- *Based on:
- *
- * OAIDCCrosswalk.java
- *
- * Version: $Revision$
- *
- * Date: $Date$
- *
- * Copyright (c) 2002, Hewlett-Packard Company and Massachusetts
+ * Copyright (c) 2004-2005, Hewlett-Packard Company and Massachusetts
  * Institute of Technology.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,6 +41,7 @@ import java.lang.*;
 import java.sql.SQLException;
 import ORG.oclc.oai.server.crosswalk.Crosswalk;
 import ORG.oclc.oai.server.verb.CannotDisseminateFormatException;
+import ORG.oclc.oai.server.verb.ServerVerb;
 import org.dspace.content.DCDate;
 import org.dspace.content.DCValue;
 import org.dspace.content.Item;
@@ -78,12 +55,21 @@ import org.dspace.search.HarvestedItemInfo;
 import sun.misc.BASE64Encoder;
 import org.dspace.core.*;
 
+/**
+ * DSpace Item DIDL crosswalk.
+ * 
+ * Development of this code was part of the aDORe repository project 
+ * by the Research Library of the Los Alamos National Laboratory.
+ * 
+ * @author Henry Jerez
+ * @author Los Alamos National Laboratory
+ */
 
 public class DIDLCrosswalk extends Crosswalk
 {
     public DIDLCrosswalk(Properties properties)
     {
-	super("urn:mpeg:mpeg21:2002:02-DIDL-NS http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-21_schema_files/did/didl.xsd ");
+    	super("urn:mpeg:mpeg21:2002:02-DIDL-NS http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-21_schema_files/did/didl.xsd ");
     }
     
     
@@ -99,8 +85,8 @@ public class DIDLCrosswalk extends Crosswalk
     {
         Item item = ((HarvestedItemInfo) nativeItem).item;
        
-         Date d = ((HarvestedItemInfo) nativeItem).datestamp;
-         String ITEMDATE = new DCDate(d).toString();
+        Date d = ((HarvestedItemInfo) nativeItem).datestamp;
+        String ITEMDATE = new DCDate(d).toString();
         
         // Get all the DC
         DCValue[] allDC = item.getDC(Item.ANY, Item.ANY, Item.ANY);
@@ -109,27 +95,27 @@ public class DIDLCrosswalk extends Crosswalk
         StringBuffer metadata1 = new StringBuffer();
         String itemhandle=item.getHandle();
         int maxsize=  Integer.parseInt(ConfigurationManager.getProperty("oai.didl.maxresponse")); 
-        String currdate=ORG.oclc.oai.server.verb.ServerVerb.createResponseDate(new Date());
+        String currdate=ServerVerb.createResponseDate(new Date());
         
         metadata.append("<didl:DIDL ")
-	        .append(" xmlns:didl=\"urn:mpeg:mpeg21:2002:02-DIDL-NS\"  ")
+            .append(" xmlns:didl=\"urn:mpeg:mpeg21:2002:02-DIDL-NS\"  ")
             .append(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ")
             .append("xsi:schemaLocation=\"urn:mpeg:mpeg21:2002:02-DIDL-NS http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-21_schema_files/did/didl.xsd \">")
-        	.append ("<didl:DIDLInfo>")
-			.append ("<dcterms:created xmlns:dcterms=\"http://purl.org/dc/terms/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://purl.org/dc/terms/ \">")
-			.append  (currdate)
-			.append ("</dcterms:created> </didl:DIDLInfo>" )
-			.append("<didl:Item id=\"")
-		.append("uuid-" + UUIDFactory.generateUUID().toString()+"\">");
+            .append ("<didl:DIDLInfo>")
+            .append ("<dcterms:created xmlns:dcterms=\"http://purl.org/dc/terms/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://purl.org/dc/terms/ \">")
+            .append  (currdate)
+            .append ("</dcterms:created> </didl:DIDLInfo>" )
+            .append("<didl:Item id=\"")
+            .append("uuid-" + UUIDFactory.generateUUID().toString()+"\">");
         metadata.append("<didl:Descriptor>")
-        		.append("<didl:Statement mimeType=\"application/xml; charset=utf-8\">")
-				.append("<dii:Identifier xmlns:dii=\"urn:mpeg:mpeg21:2002:01-DII-NS\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"urn:mpeg:mpeg21:2002:01-DII-NS http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-21_schema_files/dii/dii.xsd\">")
-				.append("urn:hdl:" + itemhandle)
-				.append("</dii:Identifier>")
-				.append("</didl:Statement>")
-				.append("</didl:Descriptor>");
-			metadata.append("<didl:Descriptor>")
-					.append("<didl:Statement mimeType=\"application/xml; charset=utf-8\">");
+            .append("<didl:Statement mimeType=\"application/xml; charset=utf-8\">")
+            .append("<dii:Identifier xmlns:dii=\"urn:mpeg:mpeg21:2002:01-DII-NS\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"urn:mpeg:mpeg21:2002:01-DII-NS http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-21_schema_files/dii/dii.xsd\">")
+            .append("urn:hdl:" + itemhandle)
+            .append("</dii:Identifier>")
+            .append("</didl:Statement>")
+            .append("</didl:Descriptor>");
+        metadata.append("<didl:Descriptor>")
+            .append("<didl:Statement mimeType=\"application/xml; charset=utf-8\">");
 					
         for (int i = 0; i < allDC.length; i++)
         {
@@ -176,110 +162,114 @@ public class DIDLCrosswalk extends Crosswalk
                     .append(">");
             }
         }
-			metadata.append("<oai_dc:dc xmlns:oai_dc=\"http://www.openarchives.org/OAI/2.0/oai_dc/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd\">");
-						
+        
+        metadata.append("<oai_dc:dc xmlns:oai_dc=\"http://www.openarchives.org/OAI/2.0/oai_dc/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd\">");
+        				
         metadata.append(metadata1);
         
         metadata.append("</oai_dc:dc>")
-				.append("</didl:Statement>")
-				.append("</didl:Descriptor>");				
-				
-				/**putfirst item here**/
-			
-				
-		//**CYCLE HERE!!!!**//
+            .append("</didl:Statement>")
+            .append("</didl:Descriptor>");				
+        
+        /**putfirst item here**/
+        
+        
+        //**CYCLE HERE!!!!**//
        
         try
         {
-        	Bundle[] bundles= item.getBundles("ORIGINAL");    
-		
-			if (bundles.length == 0)
-	        {
-	            metadata.append("<P>There are no files associated with this item.</P>");
-	        }
-	        else
-	        {  
-		     
-	/**cycle bundles**/
-				for (int i = 0; i < bundles.length; i++)
-	            { 
-					int flag=0;			
-	                Bitstream[] bitstreams = bundles[i].getBitstreams();
-		/**cycle bitstreams**/
-	                for (int k = 0; k < bitstreams.length ; k++)
-	                {
-	                    // Skip internal types
-	                    if (!bitstreams[k].getFormat().isInternal())
-	                    {
-	                    if (flag==0)	
-	                    	{
-	                   		flag=1;
-	                    	}
-	               metadata.append("<didl:Component id=" + "\"uuid-"+ UUIDFactory.generateUUID().toString() + "\">");
-				   metadata.append("<didl:Resource ref=\""+ConfigurationManager.getProperty("dspace.url")+"/bitstream/"+itemhandle+"/"+bitstreams[k].getSequenceID()+"/"+bitstreams[k].getName() );
-	               metadata.append("\" mimeType=\"");
-	               metadata.append(bitstreams[k].getFormat().getMIMEType());
-	               metadata.append("\">");
-		       metadata.append("</didl:Resource>");
-		 
-			  if (bitstreams[k].getSize()< maxsize){
-				
-					metadata.append("<didl:Resource mimeType=\"");
-					metadata.append(bitstreams[k].getFormat().getMIMEType());
-			 		metadata.append("\" encoding=\"base64\">");
-			 		try
-			 		{
-                        /*
-                         * Assume that size of in-line bitstreams will always be
-                         * smaller than MAXINT bytes
-                         */
-			 			int intSize = (int) bitstreams[k].getSize();
-                        
-			 			byte[] buffer = new byte[intSize];
-			 			
-			 			//BufferedInputStream bis=new BufferedInputStream(bitstreams[k].retrieve());
-			 			Context contextl= new Context();
-			 			BufferedInputStream bis=new BufferedInputStream(BitstreamStorageManager.retrieve(contextl,bitstreams[k].getID()));
-			 			int size=bis.read(buffer);
-			 		    contextl.complete();
-			 			
-			 			sun.misc.BASE64Encoder encoder=(sun.misc.BASE64Encoder) Class.forName("sun.misc.BASE64Encoder").newInstance();
-			 			 String encoding = encoder.encodeBuffer(buffer);
-			 			 metadata.append(encoding);
-			 		}
-			 		catch (Exception ex)
-			 		{
-			 			System.err.println("Caught exception:"+ex.getCause());
-			 			ex.printStackTrace();
-			 metadata.append("http://retrieve/"+ new Integer(bitstreams[k].getID()).toString()  +"bitstream=" + k +"/" );
-			 		
-			 		}
-			
-							
-	                        metadata.append("</didl:Resource>");
-	                }
-			        metadata.append("</didl:Component>");	
-	               
-			     }
-	            /*end bitstream cycle*/     
-	           }
-	           /*end bundle cycle*/
-          }
+            Bundle[] bundles= item.getBundles("ORIGINAL");    
+            
+            if (bundles.length == 0)
+            {
+                metadata.append("<P>There are no files associated with this item.</P>");
+            }
+            else
+            {  
+            	/**cycle bundles**/
+                for (int i = 0; i < bundles.length; i++)
+                { 
+                    int flag=0;			
+                    Bitstream[] bitstreams = bundles[i].getBitstreams();
+                    
+                    /**cycle bitstreams**/
+                    for (int k = 0; k < bitstreams.length ; k++)
+                    {
+                        // Skip internal types
+                        if (!bitstreams[k].getFormat().isInternal())
+                        {
+                            if (flag==0)	
+                            {
+                                flag=1;
+                            }
+                        	
+                            metadata.append("<didl:Component id=" + "\"uuid-"+ UUIDFactory.generateUUID().toString() + "\">");
+                           
+                           if (bitstreams[k].getSize()> maxsize) 
+                           {
+                               metadata.append("<didl:Resource ref=\""+ConfigurationManager.getProperty("dspace.url")+"/bitstream/"+itemhandle+"/"+bitstreams[k].getSequenceID()+"/"+bitstreams[k].getName() );
+                               metadata.append("\" mimeType=\"");
+                               metadata.append(bitstreams[k].getFormat().getMIMEType());
+                               metadata.append("\">");
+                               metadata.append("</didl:Resource>");
+                           }
+                           else
+                           {    
+                            
+                                try
+                                {
+                                    metadata.append("<didl:Resource mimeType=\"");
+                                    metadata.append(bitstreams[k].getFormat().getMIMEType());
+                                    metadata.append("\" encoding=\"base64\">");
+                                                                       
+                                    /*
+                                     * Assume that size of in-line bitstreams will always be
+                                     * smaller than MAXINT bytes
+                                     */
+                                    int intSize = (int) bitstreams[k].getSize();
+                                    
+                                    byte[] buffer = new byte[intSize];
+                                    
+                                    Context contextl= new Context();
+                                    BufferedInputStream bis=new BufferedInputStream(BitstreamStorageManager.retrieve(contextl,bitstreams[k].getID()));
+                                    int size=bis.read(buffer);
+                                    contextl.complete();
+                                    
+                                    BASE64Encoder encoder=(BASE64Encoder) Class.forName("sun.misc.BASE64Encoder").newInstance();
+                                    String encoding = encoder.encodeBuffer(buffer);
+                                    metadata.append(encoding);
+                                }
+                                catch (Exception ex)
+                                {
+                                    ex.printStackTrace();                       
+                                    
+                                    metadata.append("<didl:Resource ref=\""+ConfigurationManager.getProperty("dspace.url")+"/bitstream/"+itemhandle+"/"+bitstreams[k].getSequenceID()+"/"+bitstreams[k].getName() );
+                                    metadata.append("\" mimeType=\"");
+                                    metadata.append(bitstreams[k].getFormat().getMIMEType());
+                                    metadata.append("\">");
+                                }
 
-      }
-     }
-     catch (SQLException sqle)
-     {
- 		System.err.println("Caught exception:"+sqle.getCause());
- 		sqle.printStackTrace();
-     }
-
-				
-		//**END CYCLE HERE **//		
-	
+                                metadata.append("</didl:Resource>");
+                            }
+                            metadata.append("</didl:Component>");	
+                        }
+                        /*end bitstream cycle*/     
+                    }
+                    /*end bundle cycle*/
+                }
+            }
+        }
+        catch (SQLException sqle)
+        {
+            System.err.println("Caught exception:"+sqle.getCause());
+            sqle.printStackTrace();
+        }
+    		
+        //**END CYCLE HERE **//		
+        
         metadata.append("</didl:Item>")
-        		.append("</didl:DIDL>");
-
+                .append("</didl:DIDL>");
+    
         return metadata.toString();
     }
-}
+}

dspace/src/org/dspace/app/oai/DSpaceOAICatalog.java

@@ -40,6 +40,7 @@
 package org.dspace.app.oai;
 
 import java.sql.SQLException;
+import java.text.ParseException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -268,6 +269,10 @@ public class DSpaceOAICatalog extends AbstractCatalog
 
             throw new OAIInternalServerError(se.toString());
         }
+        catch (ParseException pe)
+        {
+            throw new OAIInternalServerError(pe.toString());
+        }
         finally
         {
             if (context != null)
@@ -621,6 +626,10 @@ public class DSpaceOAICatalog extends AbstractCatalog
 
             throw new OAIInternalServerError(se.toString());
         }
+        catch (ParseException pe)
+        {
+        	throw new OAIInternalServerError(pe.toString());
+        }
         finally
         {
             if (context != null)

dspace/src/org/dspace/app/oai/OAIDCCrosswalk.java

@@ -109,6 +109,24 @@ public class OAIDCCrosswalk extends Crosswalk
 
                 // Escape XML chars <, > and &
                 String value = allDC[i].value;
+                
+                if (value != null)
+                {
+                    // remove control unicode char
+                    String temp = value.trim();
+                    char[] dcvalue = temp.toCharArray();
+                    for (int charPos = 0; charPos < dcvalue.length; charPos++)
+                    {
+                        if (Character.isISOControl(dcvalue[charPos]) &&
+                            !String.valueOf(dcvalue[charPos]).equals("\u0009") &&
+                            !String.valueOf(dcvalue[charPos]).equals("\n") &&
+                            !String.valueOf(dcvalue[charPos]).equals("\r"))
+                        {
+                            dcvalue[charPos] = ' ';
+                        }
+                    }
+                    value = String.valueOf(dcvalue);
+                }
 
                 // First do &'s - need to be careful not to replace the
                 // & in "&amp;" again!

dspace/src/org/dspace/app/statistics/LogAnalyser.java

@@ -191,8 +191,11 @@ public class LogAnalyser
    /** single character regular expression pattern */
    private static Pattern singleRX = null;
    
-   /** a pattern to match a valid log file line */
-   private static Pattern valid = null;
+   /** a pattern to match a valid version 1.3 log file line */
+   private static Pattern valid13 = null;
+   
+   /** a pattern to match a valid version 1.4 log file line */
+   private static Pattern valid14 = null;
    
    /** pattern to match valid log file names */
    private static Pattern logRegex = null;
@@ -843,8 +846,10 @@ public class LogAnalyser
         singleRX = Pattern.compile("( . |^. | .$)");
         
         // set up the standard log file line regular expression
-        String logLine = "^(\\d\\d\\d\\d-\\d\\d\\-\\d\\d) \\d\\d:\\d\\d:\\d\\d,\\d\\d\\d (\\w+)\\s+\\S+ @ ([^:]+):[^:]+:[^:]+:([^:]+):(.*)";
-        valid = Pattern.compile(logLine);
+        String logLine13 = "^(\\d\\d\\d\\d-\\d\\d\\-\\d\\d) \\d\\d:\\d\\d:\\d\\d,\\d\\d\\d (\\w+)\\s+\\S+ @ ([^:]+):[^:]+:([^:]+):(.*)";
+        String logLine14 = "^(\\d\\d\\d\\d-\\d\\d\\-\\d\\d) \\d\\d:\\d\\d:\\d\\d,\\d\\d\\d (\\w+)\\s+\\S+ @ ([^:]+):[^:]+:[^:]+:([^:]+):(.*)";
+        valid13 = Pattern.compile(logLine13);
+        valid14 = Pattern.compile(logLine14);
         
         // set up the pattern for validating log file names
         logRegex = Pattern.compile(fileTemplate);
@@ -1120,7 +1125,6 @@ public class LogAnalyser
      * line matches the required regular expression.
      *
      * @param   line    the line to be segmented
-     *
      * @return          a Log Line object for the given line
      */
     public static LogLine getLogLine(String line)
@@ -1128,7 +1132,16 @@ public class LogAnalyser
         // FIXME: consider moving this code into the LogLine class.  To do this
         // we need to much more carefully define the structure and behaviour
         // of the LogLine class
-        Matcher match = valid.matcher(line);
+        Matcher match;
+        
+        if (line.indexOf(":ip_addr") > 0)
+        {
+            match = valid14.matcher(line);
+        }
+        else
+        {
+            match = valid13.matcher(line);
+        }
         
         if (match.matches())
         {

dspace/src/org/dspace/app/webui/jsptag/ItemTag.java

@@ -54,6 +54,7 @@ import org.dspace.core.Constants;
 import org.dspace.core.Utils;
 
 import java.io.IOException;
+import java.net.URLEncoder;
 
 import java.sql.SQLException;
 import java.util.Enumeration;
@@ -280,7 +281,8 @@ public class ItemTag extends TagSupport
     private void render() throws IOException
     {
         JspWriter out = pageContext.getOut();
-
+        HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
+        
         String configLine = ConfigurationManager
                 .getProperty("webui.itemdisplay." + style);
 
@@ -303,6 +305,8 @@ public class ItemTag extends TagSupport
         	String field = st.nextToken().trim();
             boolean isDate = false;
             boolean isLink = false;
+            boolean isAuthor = isAuthor(field);
+            boolean isSubject = isSubject(field);
 
             // Find out if the field should rendered as a date or link
 
@@ -362,6 +366,18 @@ public class ItemTag extends TagSupport
                         // Parse the date
                         out.print(UIUtil.displayDate(dd, false, false));
                     }
+                    else if (isAuthor)
+                    {
+                        out.print("<a href=\"" + request.getContextPath() + "/items-by-author?author="
+                            + URLEncoder.encode(values[j].value, "UTF-8") + "\">" + values[j].value
+                            + "</a>");
+                    }
+                    else if (isSubject)
+                    {
+                        out.print("<a href=\"" + request.getContextPath() + "/items-by-subject?subject="
+                            + URLEncoder.encode(values[j].value, "UTF-8") + "\">" + values[j].value
+                            + "</a>");
+                    }
                     else
                     {
                         out.print(Utils.addEntities(values[j].value));
@@ -482,10 +498,18 @@ public class ItemTag extends TagSupport
 
         if (collections != null)
         {
-            out.print("<tr><td class=\"metadataFieldLabel\">"
-                    + LocaleSupport.getLocalizedMessage(pageContext,
-                            "org.dspace.app.webui.jsptag.ItemTag.appears")
-                    + "</td><td class=\"metadataFieldValue\">");
+            out.print("<tr><td class=\"metadataFieldLabel\">");
+            if (item.getHandle()==null)  // assume workspace item
+            {
+                out.print(LocaleSupport.getLocalizedMessage(pageContext,
+                        "org.dspace.app.webui.jsptag.ItemTag.submitted"));
+            }
+            else
+            {
+                out.print(LocaleSupport.getLocalizedMessage(pageContext,
+                          "org.dspace.app.webui.jsptag.ItemTag.appears"));
+            }
+            out.print("</td><td class=\"metadataFieldValue\">");
 
             for (int i = 0; i < collections.length; i++)
             {
@@ -603,8 +627,18 @@ public class ItemTag extends TagSupport
             		}
 
             		out.print("<tr><td headers=\"t1\" class=\"standard\">");
-            		out.print(primaryBitstream.getName());
-
+                    out.print("<a target=\"_blank\" href=\"");
+                    out.print(request.getContextPath());
+                    out.print("/html/");
+                    out.print(handle + "/");
+                    out
+                        .print(UIUtil.encodeBitstreamName(primaryBitstream
+                                .getName(), Constants.DEFAULT_ENCODING));
+                    out.print("\">");
+                    out.print(primaryBitstream.getName());
+                    out.print("</a>");
+                    
+                    
             		if (multiFile)
             		{
             			out.print("</td><td headers=\"t2\" class=\"standard\">");
@@ -641,9 +675,37 @@ public class ItemTag extends TagSupport
             				// Skip internal types
             				if (!bitstreams[k].getFormat().isInternal())
             				{
+
+                                // Work out what the bitstream link should be
+                                // (persistent
+                                // ID if item has Handle)
+                                String bsLink = "<a target=\"_blank\" href=\""
+                                        + request.getContextPath();
+
+                                if ((handle != null)
+                                        && (bitstreams[k].getSequenceID() > 0))
+                                {
+                                    bsLink = bsLink + "/bitstream/"
+                                            + item.getHandle() + "/"
+                                            + bitstreams[k].getSequenceID() + "/";
+                                }
+                                else
+                                {
+                                    bsLink = bsLink + "/retrieve/"
+                                            + bitstreams[k].getID() + "/";
+                                }
+
+                                bsLink = bsLink
+                                        + UIUtil.encodeBitstreamName(bitstreams[k]
+                                            .getName(),
+                                            Constants.DEFAULT_ENCODING) + "\">";
+
             					out
                                     .print("<tr><td headers=\"t1\" class=\"standard\">");
+                                out.print(bsLink);
             					out.print(bitstreams[k].getName());
+                                out.print("</a>");
+                                
 
             					if (multiFile)
             					{
@@ -663,30 +725,6 @@ public class ItemTag extends TagSupport
             					out
                                     .print("</td><td class=\"standard\" align=\"center\">");
 
-            					// Work out what the bitstream link should be
-            					// (persistent
-            					// ID if item has Handle)
-            					String bsLink = "<a target=\"_blank\" href=\""
-                                    	+ request.getContextPath();
-
-            					if ((handle != null)
-            							&& (bitstreams[k].getSequenceID() > 0))
-            					{
-            						bsLink = bsLink + "/bitstream/"
-                                        	+ item.getHandle() + "/"
-                                        	+ bitstreams[k].getSequenceID() + "/";
-            					}
-            					else
-            					{
-            						bsLink = bsLink + "/retrieve/"
-                                        	+ bitstreams[k].getID() + "/";
-            					}
-
-            					bsLink = bsLink
-                                    	+ UIUtil.encodeBitstreamName(bitstreams[k]
-                                            .getName(),
-                                            Constants.DEFAULT_ENCODING) + "\">";
-
             					// is there a thumbnail bundle?
             					if ((thumbs.length > 0) && showThumbs)
             					{
@@ -856,4 +894,121 @@ public class ItemTag extends TagSupport
             }
         }
     }
+    
+    /**
+     * Is the given field name an Author field? 
+     * 
+     * If undefined in dspace.cfg (webui.browse.index.author) it defaults
+     * to using any field containing 'creator'.
+     * 
+     * @param field
+     * @return Whether or not the given String is an author 
+     */
+    private boolean isAuthor(String field)
+    {
+        // Does the user want to link to authors?
+        if (ConfigurationManager.getBooleanProperty("webui.authorlinks.enable", true) == false)
+        {
+           return false; 
+        }
+        
+        //Check whether a given metadata field should be considered an author field.
+        String authorField = ConfigurationManager.getProperty("webui.browse.index.author");
+        if (authorField == null)
+        {
+            if (field.indexOf("contributor") > 0 || field.indexOf("creator") > 0)
+                return true;
+            else
+                return false;
+        }
+        else
+        {
+            StringTokenizer st = new StringTokenizer(authorField, ",");
+            String aField;
+
+            while (st.hasMoreTokens())
+            {
+                aField = st.nextToken().trim();
+                // does dspace.cfg allow all qualifiers for this element?
+                if (aField.endsWith(".*"))
+                {
+                    // does the field have a qualifier?
+                    int i = field.lastIndexOf(".");
+                    if (i != field.indexOf("."))
+                    {
+                        // lop off qualifier
+                        field = field.substring(0, i);
+                    }
+                }
+                // check field against dspace.cfg
+                if (aField.indexOf(field) >= 0)
+                    return true;
+            }
+            //no match found
+            return false;
+        }
+    }
+    
+    /**
+     * Is the given field name a Subject field? 
+     * 
+     * If undefined in dspace.cfg (webui.browse.index.subject) it defaults
+     * to using any field containing 'subject'.
+     * 
+     * @param field
+     * @return Whether or not the given String is a subject 
+     */
+    private boolean isSubject(String field)
+    {
+        // Does the user want to link to subjects?
+        if (ConfigurationManager.getBooleanProperty("webui.subjectlinks.enable", false) == false)
+        {
+           return false; 
+        }
+        
+        // Check whether a given metadata field should be considered a subject field
+        String subjectField = ConfigurationManager.getProperty("webui.browse.index.subject");
+        
+        if (subjectField == null)
+        {
+            if (field.indexOf("subject") > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        else
+        {
+            StringTokenizer st = new StringTokenizer(subjectField, ",");
+            String sField;
+            
+            while (st.hasMoreTokens())
+            {
+                sField = st.nextToken().trim();
+                // does dspace.cfg allow all qualifiers for this element?
+                if (sField.endsWith(".*"))
+                {
+                    // does the field have a qualifier?
+                    int i = field.lastIndexOf(".");
+                    if (i != field.indexOf("."))
+                    {
+                        // lop off qualifier
+                        field = field.substring(0, i);
+                    }
+                }
+
+                // check field against dspace.cfg
+                if (sField.indexOf(field) >= 0)
+                {
+                    return true;
+                }
+            }
+            
+            //no match found
+            return false;
+        }
+    }
 }

dspace/src/org/dspace/app/webui/servlet/BitstreamServlet.java

@@ -92,6 +92,7 @@ public class BitstreamServlet extends DSpaceServlet
         String idString = request.getPathInfo();
         String handle = "";
         String sequenceText = "";
+        String filename = null;
         int sequenceID;
 
         // Parse 'handle' and 'sequence' (bitstream seq. number) out
@@ -117,9 +118,10 @@ public class BitstreamServlet extends DSpaceServlet
                 handle = idString.substring(0, slashIndex);
                 int slash2 = idString.indexOf('/', slashIndex + 1);
                 if (slash2 != -1)
+                {
                     sequenceText = idString.substring(slashIndex+1,slash2);
-                else
-                    sequenceText = idString.substring(slashIndex+1);
+                    filename = idString.substring(slash2+1);
+                }
             }
         }
 
@@ -167,10 +169,10 @@ public class BitstreamServlet extends DSpaceServlet
             }
         }
 
-        if (bitstream == null)
+        if (bitstream == null || filename == null
+                || !filename.equals(bitstream.getName()))
         {
-            // No bitstream found -- ID was invalid
-
+            // No bitstream found or filename was wrong -- ID invalid
             log.info(LogManager.getHeader(context, "invalid_id", "path="
                     + idString));
             JSPManager.showInvalidIDError(request, response, idString,
@@ -199,16 +201,16 @@ public class BitstreamServlet extends DSpaceServlet
             return;
         }
         
-        // Set the response MIME type
+        // Pipe the bits
+        InputStream is = bitstream.retrieve();
+     
+				// Set the response MIME type
         response.setContentType(bitstream.getFormat().getMIMEType());
 
         // Response length
         response.setHeader("Content-Length", String
                 .valueOf(bitstream.getSize()));
 
-        // Pipe the bits
-        InputStream is = bitstream.retrieve();
-
         Utils.bufferedCopy(is, response.getOutputStream());
         is.close();
         response.getOutputStream().flush();

dspace/src/org/dspace/app/webui/servlet/FeedServlet.java

@@ -43,6 +43,7 @@ package org.dspace.app.webui.servlet;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.text.MessageFormat;
+import java.text.ParseException;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.Locale;
@@ -271,8 +272,15 @@ public class FeedServlet extends DSpaceServlet
         String endDate = dcEndDate.toString().substring(0, 10);
         
         // this invocation should return a non-empty list if even 1 item has changed
-        return (Harvest.harvest(context, dso, startDate, endDate,
+        try {
+        	return (Harvest.harvest(context, dso, startDate, endDate,
         		                0, 1, false, false, false).size() > 0);
+        }
+        catch (ParseException pe)
+        {
+        	// This should never get thrown as we have generated the dates ourselves
+        	return false;
+        }
     }
     
     /**

dspace/src/org/dspace/app/webui/servlet/FeedbackServlet.java

@@ -40,6 +40,7 @@
 package org.dspace.app.webui.servlet;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.sql.SQLException;
 import java.util.Date;
 
@@ -59,7 +60,7 @@ import org.dspace.eperson.EPerson;
 
 /**
  * Servlet for handling user feedback
- * 
+ *
  * @author Peter Breton
  * @author Robert Tansley
  * @version $Revision$
@@ -75,7 +76,27 @@ public class FeedbackServlet extends DSpaceServlet
     {
         // Obtain information from request
         // The page where the user came from
-        String fromPage = request.getParameter("fromPage");
+        String fromPage = request.getHeader("Referer");
+
+        // Prevent spammers and splogbots from poisoning the feedback page
+        String host = ConfigurationManager.getProperty("dspace.hostname");
+
+        String basicHost = "";
+        if (host.equals("localhost") || host.equals("127.0.0.1")
+        		|| host.equals(InetAddress.getLocalHost().getHostAddress()))
+            basicHost = host;
+        else
+        {
+            // cut off all but the hostname, to cover cases where more than one URL
+            // arrives at the installation; e.g. presence or absence of "www"
+            int lastDot = host.lastIndexOf(".");
+            basicHost = host.substring(host.substring(0, lastDot).lastIndexOf("."));
+        }
+
+        if (fromPage == null || fromPage.indexOf(basicHost) == -1)
+        {
+            throw new AuthorizeException();
+        }
 
         // The email address they provided
         String formEmail = request.getParameter("email");

dspace/src/org/dspace/app/webui/servlet/HTMLServlet.java

@@ -54,6 +54,7 @@ import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
 import org.dspace.content.Item;
+import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
@@ -63,9 +64,21 @@ import org.dspace.handle.HandleManager;
 /**
  * Servlet for HTML bitstream support.
  * <P>
- * <code>/html/handle/filename</code>
+ * If we receive a request like this:
+ * <P>
+ * <code>http://dspace.foo.edu/html/123.456/789/foo/bar/index.html</code>
+ * <P>
+ * we first check for a bitstream with the *exact* filename
+ * <code>foo/bar/index.html</code>. Otherwise, we strip the path information
+ * (up to three levels deep to prevent infinite URL spaces occurring) and see if
+ * we have a bitstream with the filename <code>index.html</code> (with no
+ * path). If this exists, it is served up. This is because if an end user
+ * uploads a composite HTML document with the submit UI, we will not have
+ * accurate path information, and so we assume that if the browser is requesting
+ * foo/bar/index.html but we only have index.html, that this is the desired file
+ * but we lost the path information on upload.
  * 
- * @author Robert Tansley
+ * @author Austin Kim, Robert Tansley
  * @version $Revision$
  */
 public class HTMLServlet extends DSpaceServlet
@@ -73,6 +86,31 @@ public class HTMLServlet extends DSpaceServlet
     /** log4j category */
     private static Logger log = Logger.getLogger(HTMLServlet.class);
 
+    /**
+     * Default maximum number of path elements to strip when testing if a
+     * bitstream called "foo.html" should be served when "xxx/yyy/zzz/foo.html"
+     * is requested.
+     */
+    private int maxDepthGuess;
+
+    /**
+     * Create an HTML Servlet
+     */
+    public HTMLServlet()
+    {
+        super();
+
+        if (ConfigurationManager.getProperty("webui.html.max-depth-guess") != null)
+        {
+            maxDepthGuess = ConfigurationManager
+                    .getIntProperty("webui.html.max-depth-guess");
+        }
+        else
+        {
+            maxDepthGuess = 3;
+        }
+    }
+    
     // Return bitstream whose name matches the target bitstream-name
     // bsName, or null if there is no match.  Match must be exact.
     // NOTE: This does not detect duplicate bitstream names, just returns first.
@@ -108,13 +146,15 @@ public class HTMLServlet extends DSpaceServlet
             HttpServletResponse response) throws ServletException, IOException,
             SQLException, AuthorizeException
     {
+        Item item = null;
         Bitstream bitstream = null;
 
-        // Get the ID from the URL
         String idString = request.getPathInfo();
-        String filename = "";
-        String handle = "";
+        String filenameNoPath = null;
+        String fullpath = null;
+        String handle = null;
 
+        // Parse URL
         if (idString != null)
         {
             // Remove leading slash
@@ -123,51 +163,37 @@ public class HTMLServlet extends DSpaceServlet
                 idString = idString.substring(1);
             }
 
-            // Get filename
-            int slashIndex = idString.lastIndexOf('/');
-
-            if (slashIndex != -1)
-            {
-                filename = idString.substring(slashIndex + 1);
-                filename = URLDecoder.decode(filename,
-                        Constants.DEFAULT_ENCODING);
-                handle = idString.substring(0, slashIndex);
-            }
-
-            // If there's still a second slash, remove it and anything after it,
-            // it might be a relative directory name
-            slashIndex = handle.indexOf('/');
-            slashIndex = handle.indexOf('/', slashIndex + 1);
-
-            if (slashIndex != -1)
-            {
-                handle = handle.substring(0, slashIndex);
-            }
-
-            /* Get entire relative path after handle, in case it
-             * is actually the bitstream name.  e.g. for item
-             * with handle 1234.56/13, the URL for an item could be:
-             * .../dspace/1234.56/13/sub1/sub2/foo.html
-             * so return relative path: "sub1/sub2/foo.html"
-             * Also translate any encoded slashes, etc. to match bitstream name.
-             */
-            String relPath = null;
-            slashIndex = idString.indexOf('/');
+            // Get handle and full file path
+            int slashIndex = idString.indexOf('/');
             if (slashIndex != -1)
             {
                 slashIndex = idString.indexOf('/', slashIndex + 1);
                 if (slashIndex != -1)
-                    relPath = URLDecoder.decode(idString.substring(slashIndex + 1),
-                                                Constants.DEFAULT_ENCODING);
-            }
+                {
+                    handle = idString.substring(0, slashIndex);
+                    fullpath = URLDecoder.decode(idString
+                            .substring(slashIndex + 1),
+                            Constants.DEFAULT_ENCODING);
 
-            // Find the corresponding bitstream
+                    // Get filename with no path
+                    slashIndex = fullpath.indexOf('/');
+                    if (slashIndex != -1)
+                    {
+                        String[] pathComponents = fullpath.split("/");
+                        if (pathComponents.length <= maxDepthGuess + 1)
+                        {
+                            filenameNoPath = pathComponents[pathComponents.length - 1];
+                        }
+                    }
+                }
+            }
+        }
+
+        if (handle != null && fullpath != null)
+        {
+            // Find the item
             try
             {
-                boolean found = false;
-
-                Item item = null;
-
                 /*
                  * If the original item doesn't have a Handle yet (because it's
                  * in the workflow) what we actually have is a fake Handle in
@@ -186,21 +212,6 @@ public class HTMLServlet extends DSpaceServlet
                     item = (Item) HandleManager
                             .resolveToObject(context, handle);
                 }
-
-                if (item == null)
-                {
-                    log.info(LogManager.getHeader(context, "invalid_id",
-                            "path=" + handle));
-                    JSPManager
-                            .showInvalidIDError(request, response, handle, -1);
-
-                    return;
-                }
-
-                if (relPath == null ||
-                    (bitstream = getItemBitstreamByName(item, relPath)) == null)
-                    bitstream = getItemBitstreamByName(item, filename);
-
             }
             catch (NumberFormatException nfe)
             {
@@ -208,11 +219,24 @@ public class HTMLServlet extends DSpaceServlet
             }
         }
 
+        if (item != null)
+        {
+            // Try to find bitstream with exactly matching name + path
+            bitstream = getItemBitstreamByName(item, fullpath);
+            
+            if (bitstream == null && filenameNoPath != null)
+            {
+                // No match with the full path, but we can try again with
+                // only the filename
+                bitstream = getItemBitstreamByName(item, filenameNoPath);
+            }
+        }
+
         // Did we get a bitstream?
         if (bitstream != null)
         {
-            log.info(LogManager.getHeader(context, "view_bitstream",
-                    "bitstream_id=" + bitstream.getID()));
+            log.info(LogManager.getHeader(context, "view_html", "handle="
+                    + handle + ",bitstream_id=" + bitstream.getID()));
 
             // Set the response MIME type
             response.setContentType(bitstream.getFormat().getMIMEType());
@@ -231,7 +255,7 @@ public class HTMLServlet extends DSpaceServlet
         else
         {
             // No bitstream - we got an invalid ID
-            log.info(LogManager.getHeader(context, "view_bitstream",
+            log.info(LogManager.getHeader(context, "view_html",
                     "invalid_bitstream_id=" + idString));
 
             JSPManager.showInvalidIDError(request, response, idString,

dspace/src/org/dspace/app/webui/servlet/HandleServlet.java

@@ -61,6 +61,7 @@ import org.dspace.content.Community;
 import org.dspace.content.DCValue;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
+import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
@@ -304,7 +305,31 @@ public class HandleServlet extends DSpaceServlet
             displayAll = true;
         }
 
+        // Enable suggest link or not
+        boolean suggestEnable = false;
+        if (!ConfigurationManager.getBooleanProperty("webui.suggest.enable"))
+        {
+            // do nothing, the suggestLink is allready set to false 
+        }
+        else
+        {
+            // it is in general enabled
+            suggestEnable= true;
+            
+            // check for the enable only for logged in users option
+            if(!ConfigurationManager.getBooleanProperty("webui.suggest.loggedinusers.only"))
+            {
+                // do nothing, the suggestLink stays as it is
+            }
+            else
+            {
+                // check whether there is a logged in user
+                suggestEnable = (context.getCurrentUser() == null ? false : true);
+            }
+        }
+        
         // Set attributes and display
+        request.setAttribute("suggest.enable", new Boolean(suggestEnable));
         request.setAttribute("display.all", new Boolean(displayAll));
         request.setAttribute("item", item);
         request.setAttribute("collections", collections);

dspace/src/org/dspace/app/webui/servlet/MyDSpaceServlet.java

@@ -56,8 +56,10 @@ import org.dspace.content.Item;
 import org.dspace.content.ItemIterator;
 import org.dspace.content.SupervisedItem;
 import org.dspace.content.WorkspaceItem;
+import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
+import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
 import org.dspace.handle.HandleManager;
 import org.dspace.workflow.WorkflowItem;
@@ -580,40 +582,41 @@ public class MyDSpaceServlet extends DSpaceServlet
             SQLException, AuthorizeException
     {
         log.info(LogManager.getHeader(context, "view_mydspace", ""));
+        EPerson currentUser = context.getCurrentUser();
 
         // FIXME: WorkflowManager should return arrays
-        List ownedList = WorkflowManager.getOwnedTasks(context, context
-                .getCurrentUser());
+        List ownedList = WorkflowManager.getOwnedTasks(context, currentUser);
         WorkflowItem[] owned = new WorkflowItem[ownedList.size()];
         owned = (WorkflowItem[]) ownedList.toArray(owned);
 
         // Pooled workflow items
-        List pooledList = WorkflowManager.getPooledTasks(context, context
-                .getCurrentUser());
+        List pooledList = WorkflowManager.getPooledTasks(context, currentUser);
         WorkflowItem[] pooled = new WorkflowItem[pooledList.size()];
         pooled = (WorkflowItem[]) pooledList.toArray(pooled);
 
         // User's WorkflowItems
-        WorkflowItem[] workflowItems = WorkflowItem.findByEPerson(context,
-                context.getCurrentUser());
+        WorkflowItem[] workflowItems = WorkflowItem.findByEPerson(context, currentUser);
 
         // User's PersonalWorkspace
-        WorkspaceItem[] workspaceItems = WorkspaceItem.findByEPerson(context,
-                context.getCurrentUser());
+        WorkspaceItem[] workspaceItems = WorkspaceItem.findByEPerson(context, currentUser);
 
         // User's authorization groups
-        Group[] memberships = context.getCurrentUser().getGroupMemberships();
+        Group[] memberships = Group.allMemberGroups(context, currentUser);
+        
+        // Should the group memberships be displayed
+        boolean displayMemberships = ConfigurationManager.getBooleanProperty("webui.mydspace.showgroupmemberships", false);
 
         SupervisedItem[] supervisedItems = SupervisedItem.findbyEPerson(
-                context, context.getCurrentUser());
+                context, currentUser);
 
         // Set attributes
-        request.setAttribute("mydspace.user", context.getCurrentUser());
+        request.setAttribute("mydspace.user", currentUser);
         request.setAttribute("workspace.items", workspaceItems);
         request.setAttribute("workflow.items", workflowItems);
         request.setAttribute("workflow.owned", owned);
         request.setAttribute("workflow.pooled", pooled);
         request.setAttribute("group.memberships", memberships);
+        request.setAttribute("display.groupmemberships", new Boolean(displayMemberships));
         request.setAttribute("supervised.items", supervisedItems);
 
         // Forward to main mydspace page

dspace/src/org/dspace/app/webui/servlet/StatisticsServlet.java

@@ -237,7 +237,7 @@ public class StatisticsServlet extends org.dspace.app.webui.servlet.DSpaceServle
         catch (IOException e) 
         {
             // FIXME: no error handing yet
-            System.exit(0);
+            throw new RuntimeException(e.getMessage(),e);
         } 
         
         // FIXME: there's got to be a better way of doing this

dspace/src/org/dspace/app/webui/servlet/SubmitServlet.java

@@ -877,7 +877,10 @@ public class SubmitServlet extends DSpaceServlet
     	      {
     	      	for (int z = 0; z < vals.length; z++)
     	      	{
-    	      		item.addMetadata(dcSchema, dcElement, dcQualifier, "en", vals[z]);
+                    if (!vals[z].equals(""))
+                    {
+                        item.addMetadata(dcSchema, dcElement, dcQualifier, "en", vals[z]);
+                    }
     	      	}
     	      }
     	   }
@@ -2466,7 +2469,7 @@ public class SubmitServlet extends DSpaceServlet
      */
     private void readDate(HttpServletRequest request, Item item,
             String schema, String element, String qualifier) throws SQLException
-        {
+    {
         String dcname = MetadataField.formKey(schema,element,qualifier);
 
         int year = UIUtil.getIntParameter(request, dcname + "_year");

dspace/src/org/dspace/app/webui/servlet/SuggestServlet.java

@@ -193,8 +193,15 @@ public class SuggestServlet extends DSpaceServlet
                 {
                 	email.setReplyTo(senderAddr);
                 }
-
-                email.send();
+                
+                // Only actually send the email if feature is enabled
+                if (ConfigurationManager.getBooleanProperty("webui.suggest.enable", false))
+                {
+                    email.send();
+                } else
+                {
+                    throw new MessagingException("Suggest item email not sent - webui.suggest.enable = false");
+                }
 
                 log.info(LogManager.getHeader(context, "sent_suggest",
                 		                      "from=" + senderAddr));

dspace/src/org/dspace/app/webui/servlet/ViewWorkspaceItemServlet.java

@@ -115,7 +115,8 @@ public class ViewWorkspaceItemServlet
         // get the workspace item, item and collections from the request value
         WorkspaceItem wsItem = WorkspaceItem.find(c, wsItemID);
         Item item = wsItem.getItem();
-        Collection[] collections = item.getCollections();
+        //Collection[] collections = item.getCollections();
+        Collection[] collections = {wsItem.getCollection()};
         
         // Ensure the user has authorisation
         AuthorizeManager.authorizeAction(c, item, Constants.READ);

dspace/src/org/dspace/app/webui/servlet/admin/EditCommunitiesServlet.java

@@ -549,11 +549,7 @@ public class EditCommunitiesServlet extends DSpaceServlet
             int step = Integer.parseInt(button.substring(17));
 
             // Create new group
-            Group newGroup = Group.create(context);
-            newGroup.setName("COLLECTION_" + collection.getID() + "_WFSTEP_"
-                    + step);
-            newGroup.update();
-            collection.setWorkflowGroup(step, newGroup);
+            Group newGroup = collection.createWorkflowGroup(step);
             collection.update();
 
             // Forward to group edit page

dspace/src/org/dspace/app/webui/servlet/admin/EditItemServlet.java

@@ -47,6 +47,7 @@ import java.io.InputStream;
 import java.sql.SQLException;
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -334,11 +335,31 @@ public class EditItemServlet extends DSpaceServlet
 
         // All DC types in the registry
         MetadataField[] types = MetadataField.findAll(context);
+        
+        // Get a HashMap of metadata field ids and a field name to display
+        HashMap metadataFields = new HashMap();
+        
+        // Get all existing Schemas
+        MetadataSchema[] schemas = MetadataSchema.findAll(context);
+        for (int i = 0; i < schemas.length; i++)
+        {
+            String schemaName = schemas[i].getName();
+            // Get all fields for the given schema
+            MetadataField[] fields = MetadataField.findAllInSchema(context, schemas[i].getSchemaID());
+            for (int j = 0; j < fields.length; j++)
+            {
+                Integer fieldID = new Integer(fields[j].getFieldID());
+                String displayName = "";
+                displayName = schemaName + "." + fields[j].getElement() + (fields[j].getQualifier() == null ? "" : "." + fields[j].getQualifier());
+                metadataFields.put(fieldID, displayName);
+            }
+        }
 
         request.setAttribute("item", item);
         request.setAttribute("handle", handle);
         request.setAttribute("collections", collections);
         request.setAttribute("dc.types", types);
+        request.setAttribute("metadataFields", metadataFields);
 
         JSPManager.showJSP(request, response, "/tools/edit-item-form.jsp");
     }

dspace/src/org/dspace/app/webui/servlet/admin/MetadataFieldRegistryServlet.java

@@ -339,12 +339,12 @@ public class MetadataFieldRegistryServlet extends DSpaceServlet
         }
 
         String qualifier = request.getParameter("qualifier");
+        if (qualifier == "")
+        {
+            qualifier = null;
+        }
         if (qualifier != null)
         {
-            if (qualifier.length() == 0)
-            {
-                return error(request, labels.getString(clazz + ".qualempty"));
-            }
             if (qualifier.length() > 64)
             {
                 return error(request, labels.getString(clazz + ".qualtoolong"));

dspace/src/org/dspace/app/webui/util/Authenticate.java

@@ -40,6 +40,7 @@
 package org.dspace.app.webui.util;
 
 import java.io.IOException;
+import java.sql.SQLException;
 import java.util.Iterator;
 
 import javax.servlet.ServletException;
@@ -48,6 +49,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
+import org.dspace.authorize.AuthorizeManager;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
 import org.dspace.eperson.EPerson;
@@ -251,6 +253,22 @@ public class Authenticate
         HttpSession session = request.getSession();
 
         context.setCurrentUser(eperson);
+        
+        boolean isAdmin = false;
+        
+        try
+        {
+            isAdmin = AuthorizeManager.isAdmin(context);
+        }
+        catch (SQLException se)
+        {
+            log.warn("Unable to use AuthorizeManager " + se);
+        }
+        finally 
+        {
+            request.setAttribute("is.admin", new Boolean(isAdmin));
+        }
+    
 
         // We store the current user in the request as an EPerson object...
         request.setAttribute("dspace.current.user", eperson);
@@ -279,6 +297,7 @@ public class Authenticate
         HttpSession session = request.getSession();
 
         context.setCurrentUser(null);
+        request.removeAttribute("is.admin");
         request.removeAttribute("dspace.current.user");
         session.removeAttribute("dspace.current.user.id");
     }

dspace/src/org/dspace/app/webui/util/DCInputsReader.java

@@ -52,6 +52,7 @@ import javax.xml.parsers.*;
 
 import org.apache.log4j.Logger;
 
+import org.dspace.content.MetadataSchema;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.app.webui.servlet.SubmitServlet;
 
@@ -460,40 +461,58 @@ public class DCInputsReader
      */
     private String checkForDups(String formName, HashMap field, Vector pages)
     {
-    	int matches = 0;
-    	String err = null;
-    	String elem = (String)field.get("dc-element");
-    	String qual = (String)field.get("dc-qualifier");
-
-    	for (int i = 0; i < pages.size(); i++)
-    	{
-		    Vector pg = (Vector)pages.get(i);
-		    for (int j = 0; j < pg.size(); j++)
-		    {
-		    	HashMap fld = (HashMap)pg.get(j);
-		    	if (((String)fld.get("dc-element")).equals(elem))
-		    	{
-		    		String ql = (String)fld.get("dc-qualifier");
-		    		if (qual != null)
-		    		{
-		    			if ((ql != null) && ql.equals(qual))
-		    			{
-		    				matches++;
-		    			}
-		    		}
-		    		else if (ql == null)
-		    		{
-		    			matches++;
-		    		}
-		    	}
-		    }
-    	}
-    	if (matches > 1)
-    	{
-    		err = "Duplicate field " + elem + "." + qual + " detected in form " + formName;
-    	}
-
-    	return err;
+        int matches = 0;
+        String err = null;
+        String schema = (String)field.get("dc-schema");
+        String elem = (String)field.get("dc-element");
+        String qual = (String)field.get("dc-qualifier");
+        if ((schema == null) || (schema.equals("")))
+        {
+            schema = MetadataSchema.DC_SCHEMA;
+        }
+        String schemaTest;
+        
+        for (int i = 0; i < pages.size(); i++)
+        {
+            Vector pg = (Vector)pages.get(i);
+            for (int j = 0; j < pg.size(); j++)
+            {
+                HashMap fld = (HashMap)pg.get(j);
+                if ((fld.get("dc-schema") == null) || 
+                    (((String)fld.get("dc-schema")).equals("")))
+                {
+                    schemaTest = MetadataSchema.DC_SCHEMA;
+                }
+                else
+                {
+                    schemaTest = (String)fld.get("dc-schema");
+                }
+                
+                // Are the schema and element the same? If so, check the qualifier
+                if ((((String)fld.get("dc-element")).equals(elem)) && 
+                    (schemaTest.equals(schema)))
+                {
+                    String ql = (String)fld.get("dc-qualifier");
+                    if (qual != null)
+                    {
+                        if ((ql != null) && ql.equals(qual))
+                        {
+                            matches++;
+                        }
+                    }
+                    else if (ql == null)
+                    {
+                        matches++;
+                    }
+                }
+            }
+        }
+        if (matches > 1)
+        {
+            err = "Duplicate field " + schema + "." + elem + "." + qual + " detected in form " + formName;
+        }
+        
+        return err;
     }
 
 

dspace/src/org/dspace/app/webui/util/JSPManager.java

@@ -102,6 +102,7 @@ public class JSPManager
     public static void showInternalError(HttpServletRequest request,
             HttpServletResponse response) throws ServletException, IOException
     {
+        response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
         showJSP(request, response, "/error/internal.jsp");
     }
 
@@ -117,6 +118,7 @@ public class JSPManager
     public static void showIntegrityError(HttpServletRequest request,
             HttpServletResponse response) throws ServletException, IOException
     {
+        response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
         showJSP(request, response, "/error/integrity.jsp");
     }
 
@@ -137,6 +139,7 @@ public class JSPManager
             throws ServletException, IOException
     {
         // FIXME: Need to work out which error message to display?
+        response.setStatus(HttpServletResponse.SC_FORBIDDEN);
         showJSP(request, response, "/error/authorize.jsp");
     }
 
@@ -161,6 +164,7 @@ public class JSPManager
             throws ServletException, IOException
     {
         request.setAttribute("bad.id", badID);
+        response.setStatus(HttpServletResponse.SC_NOT_FOUND);
 
         if (type != -1)
         {

dspace/src/org/dspace/app/webui/util/UIUtil.java

@@ -564,40 +564,88 @@ public class UIUtil
     }    
     
 	/**
-	 * Encode a bitstream name for inclusion in a URL in an HTML document.
-	 * This differs from the usual URL-encoding, since we want pathname
-	 * separators to be passed through verbatim; this is required
-	 * so that relative paths in bitstream names and HTML references
-	 * work correctly.
-	 * <P>
-	 * If the link to a bitstream is generated with the pathname separators
-	 * escaped (e.g. "%2F" instead of "/") then the Web user agent perceives
-	 * it to be one pathname element, and relative URI paths within that
-	 * document containing ".." elements will be handled incorrectly.
-	 * <P>
-	 * @param stringIn
-	 *		  input string to encode
-	 * @param encoding
-	 *		  character encoding, e.g. UTF-8
-	 * @return the encoded string
-	 */
-	 public static String encodeBitstreamName(String stringIn, String encoding)
-	 throws java.io.UnsupportedEncodingException
-	 {
-		int curStart = 0;
-		int nextSlash = stringIn.indexOf("/");
-		String out = "";
-	
-		while (nextSlash != -1)
-		{
-		    out += URLEncoder.encode(stringIn.substring(curStart, nextSlash), encoding) +
-			   "/";
-		    curStart = nextSlash + 1;
-		    nextSlash = stringIn.indexOf("/", curStart);
-		}
-		out += URLEncoder.encode(stringIn.substring(curStart), encoding);
-		return out;
-	 }
+     * Encode a bitstream name for inclusion in a URL in an HTML document. This
+     * differs from the usual URL-encoding, since we want pathname separators to
+     * be passed through verbatim; this is required so that relative paths in
+     * bitstream names and HTML references work correctly.
+     * <P>
+     * If the link to a bitstream is generated with the pathname separators
+     * escaped (e.g. "%2F" instead of "/") then the Web user agent perceives it
+     * to be one pathname element, and relative URI paths within that document
+     * containing ".." elements will be handled incorrectly.
+     * <P>
+     * 
+     * @param stringIn
+     *            input string to encode
+     * @param encoding
+     *            character encoding, e.g. UTF-8
+     * @return the encoded string
+     */
+    public static String encodeBitstreamName(String stringIn, String encoding)
+            throws java.io.UnsupportedEncodingException
+    {
+        // FIXME: This should be moved elsewhere, as it is used outside the UI
+        StringBuffer out = new StringBuffer();
+
+        final String[] pctEncoding = { "%00", "%01", "%02", "%03", "%04",
+                "%05", "%06", "%07", "%08", "%09", "%0a", "%0b", "%0c", "%0d",
+                "%0e", "%0f", "%10", "%11", "%12", "%13", "%14", "%15", "%16",
+                "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d", "%1e", "%1f",
+                "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27", "%28",
+                "%29", "%2a", "%2b", "%2c", "%2d", "%2e", "%2f", "%30", "%31",
+                "%32", "%33", "%34", "%35", "%36", "%37", "%38", "%39", "%3a",
+                "%3b", "%3c", "%3d", "%3e", "%3f", "%40", "%41", "%42", "%43",
+                "%44", "%45", "%46", "%47", "%48", "%49", "%4a", "%4b", "%4c",
+                "%4d", "%4e", "%4f", "%50", "%51", "%52", "%53", "%54", "%55",
+                "%56", "%57", "%58", "%59", "%5a", "%5b", "%5c", "%5d", "%5e",
+                "%5f", "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67",
+                "%68", "%69", "%6a", "%6b", "%6c", "%6d", "%6e", "%6f", "%70",
+                "%71", "%72", "%73", "%74", "%75", "%76", "%77", "%78", "%79",
+                "%7a", "%7b", "%7c", "%7d", "%7e", "%7f", "%80", "%81", "%82",
+                "%83", "%84", "%85", "%86", "%87", "%88", "%89", "%8a", "%8b",
+                "%8c", "%8d", "%8e", "%8f", "%90", "%91", "%92", "%93", "%94",
+                "%95", "%96", "%97", "%98", "%99", "%9a", "%9b", "%9c", "%9d",
+                "%9e", "%9f", "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%a6",
+                "%a7", "%a8", "%a9", "%aa", "%ab", "%ac", "%ad", "%ae", "%af",
+                "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7", "%b8",
+                "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf", "%c0", "%c1",
+                "%c2", "%c3", "%c4", "%c5", "%c6", "%c7", "%c8", "%c9", "%ca",
+                "%cb", "%cc", "%cd", "%ce", "%cf", "%d0", "%d1", "%d2", "%d3",
+                "%d4", "%d5", "%d6", "%d7", "%d8", "%d9", "%da", "%db", "%dc",
+                "%dd", "%de", "%df", "%e0", "%e1", "%e2", "%e3", "%e4", "%e5",
+                "%e6", "%e7", "%e8", "%e9", "%ea", "%eb", "%ec", "%ed", "%ee",
+                "%ef", "%f0", "%f1", "%f2", "%f3", "%f4", "%f5", "%f6", "%f7",
+                "%f8", "%f9", "%fa", "%fb", "%fc", "%fd", "%fe", "%ff" };
+
+        byte[] bytes = stringIn.getBytes(encoding);
+
+        for (int i = 0; i < bytes.length; i++)
+        {
+            // Any unreserved char or "/" goes through unencoded
+            if ((bytes[i] >= 'A' && bytes[i] <= 'Z')
+                    || (bytes[i] >= 'a' && bytes[i] <= 'z')
+                    || (bytes[i] >= '0' && bytes[i] <= '9') || bytes[i] == '-'
+                    || bytes[i] == '.' || bytes[i] == '_' || bytes[i] == '~'
+                    || bytes[i] == '/')
+            {
+                out.append((char) bytes[i]);
+            }
+            else if (bytes[i] >= 0)
+            {
+                // encode other chars (byte code < 128)
+                out.append(pctEncoding[bytes[i]]);
+            }
+            else
+            {
+                // encode other chars (byte code > 127, so it appears as
+                // negative in Java signed byte data type)
+                out.append(pctEncoding[256 + bytes[i]]);
+            }
+        }
+        log.debug("encoded \"" + stringIn + "\" to \"" + out.toString() + "\"");
+
+        return out.toString();
+    }
 
 	/** Version of encodeBitstreamName with one parameter, uses default encoding
 	 * <P>

dspace/src/org/dspace/checker/CheckerCommand.java

@@ -443,20 +443,7 @@ public final class CheckerCommand
     }
 
     /**
-     * Configures log4j to read config info from DSpace log4j.properties file.
-     */
-    public void configureLog()
-    {
-        // Load in log4j config
-        String log4jConf = ConfigurationManager.getProperty("dspace.dir")
-                + File.separator + "config" + File.separator
-                + "log4j.properties";
-
-        PropertyConfigurator.configure(log4jConf);
-    }
-
-    /**
-     * Determine if ony erros are reported
+     * Determine if any errors are reported
      * 
      * @return true if only errors reported
      */