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

@@ -0,0 +1,639 @@
+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
+  docs/index.html
+  docs/configure.html
+- added a note about contact info in "The Wording of E-Mails" in
+  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
+  requests
+
+(Bernadette Schlonsok)
+- SF patch #1490857  XHTML Compliance of 1.4 alpha 1
+- minor changes for XHTML/WAI compliance of controlled vocabularies addon
+- minor changes for XHTML compliance of suggest item feature
+- minor changes for XHTML compliance
+
+(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
+- SF patch #1549867  Make cleanup() commit outstanding work every 100 iterations
+- SF patch #1551876  removeBitstream() fails to update primary bitstream
+
+(Flavio Botelho)
+- SF patch #1529326 Bug in new code at QueryArgs with fixed typo in jsp/search/advanced.jsp
+- SF patch #1529221 Treat wrong emails friendly
+
+(Michael Judd)
+- SF patch #1528040  Fixes minor bug in Harvest.java for Oracle users
+
+(Stuart Lewis)
+- SF patch #1543856 Statistics do not work in 1.4 - patch to fix SF bug #1543853
+- SF patch #1541383 Browse-by-date and browse-by-title not working
+- 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 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
+- SF patch #1544829  fixes SF bug #1544807 Browse-by-Subject/Author paging mechanism broken
+- SF patch #1543969  fixes SF bug #1543966 "Special" groups inside groups bug
+- SF patch #1550161  Fix HttpServletRequest encoding issues in 1.4
+- SF patch #1562284  System-wide RSS Feed
+- Fixed bug #1480496 Cannot turn off "ignore authorization" flag!
+
+(Jonathan Champ)
+- SF patch #1544089 fixes SF bug #1515148 community policies not deleting correctly
+
+1.4 final
+=========
+
+(Scott Yeadon)
+- Fixed typo in 13-14 upgrade docs and checksum checker sql, and removed tasklist sql
+
+(Claudia Juergen)
+- SF patch #1514965 fixes SF bug #1505422. fix typo in SQL for item mapper
+- SF patch #1516988  Deleting owner of mapped items SF bug #1196724
+- SF patch #1517488  Access Bitstreams in Withdrawn Items SF bug #1408373
+- SF patch #1490980  Fix for SF bugs #1456311, #1221954  Communities and Collections without name
+- included some missing i18n tags
+- SF patch #1490891  Submission Step 1 not authorized note and navigation back
+- SF patch #1556316  for SF bugs #1552807, #1333269 and general deletion of Collection
+- SF patch #1554669 Oracle fixes for Browse.java
+- SF patch #1561292 for SF bug #1554064
+
+(Richard Jones)
+- SF bug #1515075. minor build file fix to copy correct config file
+
+1.4 beta 1
+==========
+(Scott Phillips)
+- Rework of DB code to use prepared statements for improved security and performance
+
+(Lieven Droogmans, Ben Bosman)
+- SF Patch #1468197 - Filter out mapped items from browse list, fixes bug #1455674 and addresses a symptom of bug #1456553
+
+(Richard Jones)
+- SF Patch #1458315 - Customisable Browse Index, fixes bug #1456227
+
+(Robert Tansley)
+- UNIQUE constraint applied to schema namespace + short_id (not element).
+  Fixed bug SF #1460515.
+
+(Lester Bowser, Robert Tansley)
+- Fixes for Oracle database_schema.sql
+
+(Scott Yeadon)
+- Fix to QDCCrosswalk so type attribute is not ignored
+- SF Patch #1469235 - default language is not applied, fixes bug #1358144 
+- Show bundle names on item authorization page
+- SF bug #1456540 - incorrect link in list-metadata-fields.jsp
+- SF bug #1466268 - Supervisor Orders on Oracle
+- SF bug #1456801 - Typo in jsp.tools.confirm-delete-collection.info1
+- SF bug #1456586 - typo in Checksum Checker email script
+- SF bug #1456988 - database-schema.sql and database-schema_13_14.sql inconsistencies
+- update-handle-prefix script changed to also update the metadatavalue table
+- SF bug #1456555 - i18n - missing tags
+- SF bug #1456533 - dspace.url inconsistency
+- SF bug #1456537 - Copyright statement year out of date
+- SF bug #1456529 - Subject search in navbar-default.jsp non-XHTML compliant
+- SF bug #1456305 - Bitstream Format Registry - Internal and Submitting
+- SF bug #1456285 - Search index config and advanced search not in sync
+- SF bug #1456278 - Wrong link in jsp/dspace-admin/list-metadata-fields.jsp
+- SF Patch #1455842 - minor mediafilter fixes
+- SF Patch #1461039 - Exceptions in media filter
+
+(Tim Donohue)
+- SF bug #1256920 - Mapped Items not added to Community (patch included in bug comment)
+- SF Patch #1455545 - Help links do not appear in IE, fixes SF bug #1380663
+- SF Patch #1456241 - Minor fix to Submission Progress bar "Jump To"
+
+(Martin Hald)
+- SF Patch #1456372 - Non-DC browse indices, fixes SF bug #1456227 
+- SF Patch #1456306 - Configuring simple item, fixes SF bugs #1455712, #1456566 and #1455691
+- SF Patch #1455107 - MetadataValue Database Index
+- SF Patch #1455605 - Submit Review Page Schema fix
+
+(Phillip Franks)
+- SF Patch #1456173 - updated database_schema.sql for Oracle (partially fixes SF bug #1455290)
+
+(Larry Stone)
+- SF Patch #1456751 - Fix Packager command's output message
+- SF Patch #1456761 - PluginManager config-reading bugs (fix patch #1455842)
+- SF Patch #1455813 - cleanup dspace.cfg for 1.4
+- SF Patch #1455904 - fix crosswalk validation in 1.4alpha1
+- SF Patch #1453425 - fix crosswalk + packager configurations, fixes #1456564
+
+(Larry Stone, Michael Drewitz, Scott Yeadon)
+- Documentation updates
+  SF Patch #1455780 - Improve doc for configuring x.509 authentication in 1.4
+  SF Patch #1456135 - Update search section of business.html
+  SF bug #1456531 - Installation doc updates
+  SF bug #1456557 - Upgrade docs modifications
+  SF Patch #1470711 - Fix documentation about SSL install/config
+  
+(Zuki Ebetsu)
+- Fix malformed Japanese texts in RSS feed
+  SF Patch #1455790, fixes SF bug #1456585
+  
+(Stuart Lewis)
+- Fix problem with make-handle-config throwing NullPointerException
+  SF Patch #1455463, fixes SF bug #1455457
+
+1.4 alpha 1
+===========
+(Robert Tansley)
+- Fix logic in EditItemServlet to enable removal of blank metadata values.
+  Fixes bug #1358197.
+
+(Robert Tansley)
+- Error displayed on 'choose collection' submit screen instead of blank
+  collection list and 'next >' control (which led to error).  Fixes SF bug
+  #1363633.
+
+(Anonymous)
+- ResourcePolicy.setEPerson(null) now works (was previously setting
+  epersongroup_id column to null).  Closes SF bug #1255264.
+
+(Robert Tansley)
+- search.index.* configuration lines must now include the schema
+  (e.g. dc.title.*).  Note search.index.* no longer backwards compatible. Can
+  now also specify unqualified elements (e.g. dc.creator).  Also fixes SF bug
+  #1443649.
+
+(Scott Yeadon)
+- Add support for branded preview image
+  SF Patches: #1330829, #1430437
+
+(Navalkishore Sarda, Scott Yeadon)
+- Add/replace Creative Commons in 'edit item' tool (SF patch #1172755)
+
+(Richard Jones)
+- Customisable item listing columns and browse indices (SF patch #1324631)
+
+(Scott Yeadon)
+- Script for updating handle prefixes (e.g. for moving from development to production)
+- Configurable boolean search operator
+
+(Miguel Ferreira)
+- Controlled vocabulary patch to provide search on classification terms, and
+  addition of terms during submission.
+  SF Patch: #1244559
+
+(Richard Jones) 
+- Add 'visibility' element to input-forms.xml
+  SF Patch #1368160
+
+(Martin Hald)
+- Log4J enhancement to use XML configuration
+  SF Patch #1224389
+  
+(Dorothea Salo)
+- Prevent ClassCastException for withdrawn items
+  Fixes SF Bug #1333678
+  SF Patch #1353368
+  
+(Larry Stone)
+- Fix for extraneous '/' browse links
+  SF Patch #1393365
+  
+(Aneesh Joy)
+- Browse by subject feature; SF Patch #1193600
+
+(Andrea Bollini)
+- QueryArgs class can support any number of fields in advanced search.
+  (Existing advanced-search.jsp not changed)
+  SF Patch #1363809
+
+(Scott Yeadon)
+- Now uses Jakarta Commons FileUpload instead of com.oreilly.servlet.
+  Patch SF #1380118.
+
+(Robert Tansley)
+- Drop unique community name constraint.  Also fixes SF bug #1284055.
+
+(Robert Tansley)
+- Scripts for Windows support
+
+(WeiHua HUANG)
+- Support for SMTP server username/password authentication
+
+(Robert Tansley)
+- Bitstream file sizes now stored in BIGINT column size_bytes.
+  Fixes SF bug #1035366
+- Queries involving booleans now have Oracle/PostgreSQL-neutral SQL syntax;
+  removes some DB-dependent code from business logic layer
+
+(Martin Hald, Larry Stone, Robert Tansley)
+- Support for multiple (flat) metadata schemas
+
+(Robert Tansley)
+- Fix XHTML for front page when no communities present
+
+(Dorothea Salo)
+- SF Patch #1351620 Add "Submit an item" button to Submission Complete page
+
+(Stuart Lewis)
+- SF Patch #1348291 Patch for SF Bug #1348276 (null causes OAI-PMH failure)
+
+(Arnaldo Dantas)
+- SF Patch #1160726 Suggest an Item
+
+(Claudia Jürgen/Scott Yeadon)
+- SF Patch #1228949 & #1340327 - new cmdline scope restrictions for MediaFilter:
+  By maximum number processed
+  By community/collection/item
+
+(Ben Bosman)
+- SF Patch #1160997 RSS Add-on
+
+(Richard Rodgers)
+- Close thumbnail file stream after use - fix for leak that left open files
+
+(Scott Yeadon)
+- Remove lowercase conversion for metadata field matching
+- Fix Oracle compatibility bug in Browse.java
+
+(Gabriela Mircea)
+- SF Bug #1160898 dspace_migrate removes Date.Issued from prev published items
+
+(Richard Rodgers)
+- Performance enhancement - lazy initialization of Item sub-objects
+
+(Larry Stone)
+- SF Patch #1209635 changes to implement Stackable Authentication
+
+(Tim Donohue)
+- SF Patch #1315186 EPerson Group enhancement (allow groups within groups)
+
+(Larry Stone)
+- SF Patch #1254679 Plugin Manager implementation
+- SF Patch #1254704 Convert Media Filters to use Plugin Manager
+
+(Henry Jerez (LANL))
+- SF Patch #1246928 DIDL plug-in for DSpace
+
+(Robert Tansley, LI XiaoYu (Rita))
+- SF Patch #1244813 Expose METS to OAI-PMH harvesters
+- SF Patch #1209318 Configurable Lucene Analyzer, Chinese search
+
+(Tim Donohue)
+- SF Patch #1274250 Fix Malformed METS metadata export
+
+1.3.2 final, 1.3.2 beta 2
+=========================
+(John Rae)
+- (SF Patch #1297575) Oracle compatibility fixes
+
+1.3.2 beta 1
+============
+(Robert Tansley)
+- SF patch #1252068  Configure metadata fields shown on simple item display
+
+(Naveed Hashmi)
+- (SF Patch #1230956) DSpace UI XHTML/WAI compliant
+
+(Robert Tansley)
+- Bug fix: Item exporter now correctly exports metadata in UTF-8
+- Bug fix: Item.addDC() fixed to handle 'null' values passed in (previously threw
+NullPointerException).  Note: the null value is added as a DC field.  Another
+possibility would be to ignore/remove the null value -- would this be better,
+or are null values OK?
+
+1.3.1 final
+===========
+(Robert Tansley)
+- Fixed bug 1252153 - Error on fresh install
+
+
+1.3 final
+=========
+(Scott Yeadon)
+- Updated Xerces, Xalan and oaicat jar files
+
+(Richard Jones)
+- New configuration option, webui.licence_bundle.show -- configures display
+of deposit license in item display page
+
+(Scott Yeadon)
+ - SF Bug #1247508  Error when browsing item with no content/bitstream
+ 
+(Nathan Sarr)
+- One invalid email address no longer aborts whole subscription email process.
+Error is logged and emailing continues.  SF patch #1246158; fixes SF bug
+#1245223
+
+(Robert Tansley)
+- Rearranged format level display tags.  Bizarrely, this fixes
+#1238277 (unsure why!!)
+- Double quotes in metadata values are changed to HTML entities
+before adding to form.  Fixes bug SF #1238276.
+- Minor HTMLfixes to ws-main.jsp
+- Error reported when uploading zero-length files.  This is the only apparent
+way to tell when an invalid filename has been specified in the upload form.
+Fixes bug SF #1242548
+
+(Claudia Jürgen)
+- SF Patch #1226874 "null" in Introductory text of communities and collection
+
+(Jozsef Marton)
+- SF Patch #1233437 fix broken item-mapper & fine tune i18n
+
+(Claudia Jürgen)
+- SF Patch #1226958 XHTML compliance of Messages_en.properties
+
+1.3 beta 1
+==========
+
+(Larry Stone)
+- SF Patch #1216889 typo in invalid-id.jsp
+
+(Jozsef Marton)
+- SF Patch #1214539 i18n'ise the custom JSP tags
+- SF Patch #1196103 Set the content type in the HTTP header
+- SF Patch #1196095 closes SF Bug #1188016 - EPerson editing issue
+
+(Richard Rodgers)
+- SF Patch #1189665 Custom Submission Patch for handling null qualifier and page flow metadata issue
+
+(Naveed Hashmi)
+- SF Patch #1181335 Fixed bug whereby system emails do not have sent dates attached to them
+
+
+1.3 alpha
+=========
+(Dimitrios A. Koutsomitropoulos, Jozsef MARTON, Robert Tansley)
+- Initial i18n support
+
+(John Finlay)
+SF Patch #1110951 - LDAP Authentication Patch
+
+(Larry Stone)
+SF Patch #1175158 - Add POST handler to HTMLServlet
+
+(Jozsef Marton)
+SF Patch #1173564 - add missing ContentType directive to some of the JSPs
+
+(Richard Jones)
+- Added new DSpace log file analysis tool, including command line analysis and
+report generating tools and UI components for report display and navigation
+
+(Richard Jones)
+- "View Licence" link and copyright warning added to item display pages
+
+(Richard Jones)
+- SF patch #1149684 Group and Collection Admin bug fix. Can now change submitter
+and collection admin group names (COLLECTION_XXX_SUBMITTER, COLLECTION_XXX_ADMIN)
+and edit within the collection admin page
+
+(Richard Jones)
+- Addition of Tapir workspace to MyDSpace pages: authoring and supervising item
+listings, a workspace for each item and a workspace item metadata viewer
+
+(David Little)
+- SF patch #1165647, 1165649-52, 1165659, 1165662, 1165664-7, 1165670 - USCD mods to support SRB and Registration
+
+(Scott Yeadon)
+- Updated handle.jar and associated license to 5.4.3
+
+(Richard Jones)
+- Addition of supervision order setting tools for administration area, to allow
+user accounts to observe or collaborate on unfinished submission
+
+(Robert Tansley)
+- OAI-PMH set names now XML-encoded (e.g. &, <, >) (Collection names with such
+characters previously caused bad XML in OAI-PMH ListSets responses)
+
+
+1.2.2
+=====
+(Richard Rodgers)
+Bug fix for bug causing corruption of metadata if edited post-submission
+
+
+1.2.2 beta 2
+============
+
+(Robert Tansley)
+- Fixed bug whereby 'Submit to this Collection' button only appears if admin.
+
+(Larry Stone)
+- SF patch #1143570 Fix various bugs handling slash ("/") in bitstream names
+
+(Scott Phillips & David Little)
+- Patch for SF bug #1145527 Able to delete 'unknown' bitstream format
+
+(Mike Simpson)
+- Remove unneeded transaction isolation level code from browse system for PostgreSQL 8.0
+  compatibility
+
+(Scott Yeadon)
+- SF bug #1123304 ItemImport --replace created new Handles
+
+(Corey Harper)
+- Retain search scope while navigating result sets
+  SF patch #1156356
+
+(Ben Bosman)
+- Internal error no longer occurs when COLLECTION_ADMIN is editing collection template values
+  SF patch #1120716, fixes SF bug #1088692.
+
+(Filbert Minj)
+- Show community and collection strengths
+  SF patch #1151795.
+  
+(Robert Tansley)
+- Updated OAICat.jar, fixed DSpaceOAICatalog.java to suit.  New OAICat fixes
+  SF bug #1123934.
+
+
+1.2.2  beta 1
+=============
+(Jenny Toves, Brian Hughes, Larry Stone, William Reilly, Richard Rodgers)
+- Customisable submission forms
+
+(Barry Gaskin)
+- Fix for Oracle too many cursors problem
+
+(Claudia J<>rgen)
+- Configurable number of index terms in Lucene for full-text indexing
+
+(Keiji Suzuki)
+- Fix for UTF-8 encoded searches in advanced search
+
+(David Stuve)
+- Improved scalability in media filter (manager + JPEG)
+
+(Trevor Swarm)
+- Submit button on collection pages only appears if user has authorisation
+
+
+1.2.1
+=====
+(Jim Downing)
+- Added KNOWN_BUGS file to caveat problems in this release
+
+
+1.2.1-beta4
+===========
+(Jim Downing)
+- More bug fixes for various small NPEs
+
+
+1.2.1-beta3
+===========
+(Jim Downing)
+- Merged patch for community permissions bug and fixed collection admin permissions bug
+- Auto formatted code to DSpace house style
+- Sorted imports in all source
+- Updated references to deprecated methods
+- Cleaned up some potential bugs spotted by findbugs
+
+
+1.2.1-beta1
+===========
+(Scott Yeadon)
+- Added browse and search thumbnail display (currently configurable on a repository, not collection, basis); ability to turn off thumbnails on display-item page
+- Added script to bin directory by Cody Green to assist with migrating items from one DSpace instance to another (removes handle files and updates DC metadata of exported items)
+
+(Jim Downing)
+- Cleaned up several loose resource cleanups to cure resource leakage under heavy loads.
+
+(Austin Kim)
+- Which metadata fields are indexed by lucene is now configurable.
+
+(Dave Stuve)
+- Oracle compatibility added

dspace/KNOWN_BUGS

@@ -0,0 +1,69 @@
+Detailed bug descriptions and current status can be found on the SourceForge
+bug tracker:
+
+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.
+
+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, 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
@@ -34,201 +34,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGE.
 
 
-
-------------------------------------------------------------------------------
-OCLC OAICat framework (oaicat.jar) license:
-
-Copyright (c) 2000-2002 OCLC Online Computer Library Center, Inc. and other 
-contributors. All rights reserved.
-
-OAICat source code available from:
-http://www.oclc.org/research/software/oai/cat.shtm
-
-
-------------------------------------------------------------------------------
-O'Reilly com.oreilly.servlet (cos.jar) license:
-
-Copyright (C) 2001-2002 by Jason Hunter, jhunter_AT_servlets.com.
-All rights reserved. 
-The source code, object code, and documentation in the com.oreilly.servlet
-package is copyright and owned by Jason Hunter. 
-
-USE RIGHTS 
-
-Permission is granted to use the com.oreilly.servlet.* packages in the
-development of any non-commercial project. For this use you are granted a
-non-exclusive, non-transferable limited license at no cost. 
-
-For a commercial project, permission is granted to use the
-com.oreilly.servlet.* packages provided that every person on the
-development team for that project owns a copy of the book Java Servlet
-Programming (O'Reilly) in its most recent edition. The most recent edition
-is currently the 2nd Edition, available in association with Amazon.com at
-http://www.amazon.com/exec/obidos/ASIN/0596000405/jasonhunter. 
-
-Other (sometimes cheaper) license terms are available upon request; please
-write to jhunter_AT_servlets.com for more information. 
-
-REDISTRIBUTION RIGHTS 
-
-Commercial redistribution rights of the com.oreilly.servlet.* packages are
-available by writing jhunter_AT_servlets.com. 
-
-Non-commercial redistribution is permitted provided that: 
-
-1. You redistribute the package in object code form only (as Java .class
-   files or a .jar file containing the .class files) and only as part of a
-   product that uses the classes as part of its primary functionality.
-
-2. The product containing the package is non-commercial in nature.
-
-3. The public interface to the classes in the package, and the public
-   interface to any classes with similar functionality, is hidden from end
-   users when engaged in normal use of the product.
-
-4. The distribution is not part of a software development kit, operating
-   system, other library, or a development tool without written permission
-   from the copyright holder.
-
-5. The distribution includes copyright notice as follows: "The source code,
-   object code, and documentation in the com.oreilly.servlet package is
-   copyright and owned by Jason Hunter." in the documentation and/or other
-   materials provided with the distribution.
-
-6. You reproduce the above copyright notice, this list of conditions, and the
-   following disclaimer in the documentation and/or other materials provided
-   with the distribution.
-
-7. Licensor retains title to and ownership of the Software and all
-   enhancements, modifications, and updates to the Software.
-
-Note that the com.oreilly.servlet package is provided "as is" and the author
-will not be liable for any damages suffered as a result of your use.
-Furthermore, you understand the package comes without any technical support. 
-
-You can always find the latest version of the com.oreilly.servlet package at
-http://www.servlets.com. 
-
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-Thanks,
-Jason Hunter
-jhunter_AT_servlets.com 
-
-
-
-------------------------------------------------------------------------------
-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/>.
- */
-
-
-------------------------------------------------------------------------------
-HP Labs's Jena RDF toolkit (jena.jar):
-
-/*
- *  (c) Copyright Hewlett-Packard Company 2000 - 2002
- *  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 name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/).
- */
-
-
-------------------------------------------------------------------------------
-CNRI Handle System Server software (handle.jar):
-
-/* Handle System Server, Java version 5.2 is made available subject to the 
- * terms and conditions in CNRI's License Agreement. This Agreement may be 
- * located on the Internet using the following handle: 4263537/4058. The 
- * License may also be obtained from a proxy server using the following URL: 
- * http://hdl.handle.net/4263537/4058
- */
+DSpace uses third-party libraries which may be distributed under
+different licenses to the above.  These licenses are located in
+the lib/licenses directory.  You must agree to the terms of these
+licenses, in addition to the above DSpace source code license, in
+order to use this software.

dspace/README

@@ -1,14 +1,22 @@
-DSpace Version 1.1, released 08-May-2003
+DSpace Version 1.4.1, 8-December-2006
 
-Installation instructions are included in the 'dspace-docs' download,
-available from:
+Installation instructions are included in this release package.
 
-http://sourceforge.net/projects/dspace/
+Documentation for the most recent stable release may be viewed online at
+dspace.org:
 
-These documents may be viewed online:
+http://dspace.org/technology/system-docs/
 
-http://www.dspace.org/technology/system-docs/
+Installation instructions for other version may be different, so you
+are encouraged to obtain the corresponding documentation package from
+SourceForge, or to download the latest documentation snapshot from CVS
 
+Please also read the KNOWN_BUGS file.
 
-Copyright (c) 2002, Hewlett-Packard Company and Massachusetts
+Please refer any further problems to the dspace-tech@lists.sourceforge.net 
+mailing list. 
+
+http://sourceforge.net/mail/?group_id=19984
+
+Copyright (c) 2002-2006, Hewlett-Packard Company and Massachusetts
 Institute of Technology.  All rights reserved.

dspace/bin/buildpath.bat

@@ -0,0 +1,46 @@
+@REM
+@REM buildpath.bat
+@REM
+@REM Version: $Revision$
+@REM
+@REM Date: $Date$
+@REM
+@REM Copyright (c) 2005, Hewlett-Packard Company and Massachusetts
+@REM Institute of Technology.  All rights reserved.
+@REM
+@REM Redistribution and use in source and binary forms, with or without
+@REM modification, are permitted provided that the following conditions are
+@REM met:
+@REM
+@REM - Redistributions of source code must retain the above copyright
+@REM notice, this list of conditions and the following disclaimer.
+@REM
+@REM - Redistributions in binary form must reproduce the above copyright
+@REM notice, this list of conditions and the following disclaimer in the
+@REM documentation and/or other materials provided with the distribution.
+@REM
+@REM - Neither the name of the Hewlett-Packard Company nor the name of the
+@REM Massachusetts Institute of Technology nor the names of their
+@REM contributors may be used to endorse or promote products derived from
+@REM this software without specific prior written permission.
+@REM
+@REM THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+@REM ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+@REM LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+@REM A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+@REM HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+@REM INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+@REM BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+@REM OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+@REM ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+@REM TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+@REM USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+@REM DAMAGE.
+@REM
+
+@REM A simple script to facilitate building a CLASSPATH dynamically
+@REM in dsrun.bat
+
+@echo off
+
+set DSPACE_CLASSPATH=%DSPACE_CLASSPATH%;%~s1

dspace/bin/checker

@@ -0,0 +1,50 @@
+#!/bin/sh
+
+###########################################################################
+#
+# filter-media
+#
+# Version: $Revision$
+#
+# Date: $Date$
+#
+# Copyright (c) 2002, 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.
+#
+###########################################################################
+
+# Shell script for running the checksum checker.
+
+# Get the DSPACE/bin directory
+BINDIR=`dirname $0`
+
+$BINDIR/dsrun org.dspace.app.checker.ChecksumChecker $@

dspace/bin/dspace-info.pl

@@ -53,27 +53,15 @@ use strict;
 use File::Find;
 
 
-###############################################
-# CONFIGURE THESE VARIABLES! ##################
-###############################################
+##################################################
+# CONFIGURE THESE VARIABLES TO MATCH YOUR SETUP! #
+##################################################
 
 # where is DSpace installed?
 my $dspace_dir = "/dspace";
 
 #where is the DATA for the database tables stored?
-my $database_dir = "/dspace/database/data";
-
-
-
-# error out if cannot locate above directories
-die "Cannot find dspace directory tree $dspace_dir"     if( ! -d $dspace_dir   );
-die "Cannot find database data directory $database_dir" if( ! -d $database_dir );
-
-
-#############################################
-# Begin statistics ##########################
-#############################################
-
+my $database_dir = "/dspace/database";
 
 # find DSpace directories ###################
 
@@ -82,6 +70,22 @@ my $search_dir     = GetConfigParameter( "search.dir"     );
 my $history_dir    = GetConfigParameter( "history.dir"    );
 my $logs_dir       = GetConfigParameter( "log.dir"        );
 
+# directories in this array are to be checked for ownership by
+# the dspace user
+my @dspace_ownership_dirs = ( $assetstore_dir );
+
+# directories in this array are to be checked for zero-length files
+my @zerolength_dirs = ( $assetstore_dir );
+
+# error out if cannot locate above directories
+die "Cannot find dspace directory tree $dspace_dir - edit dspace-info.pl 'dspace_dir' variable with correct path"     if( ! -d $dspace_dir   );
+die "Cannot find database data directory $database_dir - edit dspace-info.pl 'database_dir' variable with correct path" if( ! -d $database_dir );
+
+
+#############################################
+# Begin statistics ##########################
+#############################################
+
 
 # count DSpace objects ######################
 
@@ -181,6 +185,22 @@ sub NumberReport
     print "\t".FormatText($string).FormatNumber($number)."\n";
 }
 
+print "Collection sizes:\n";
+# sorted, of course
+foreach( sort { (split/\|/,$b)[1] <=> (split/\|/,$a)[1] } @collection_sizes )
+{
+    my ($name, $size) = split /\|/;
+
+    # spruce up the strings a bit
+    $size = FormatSize( $size );
+
+    # pad length of name string to right w/spaces
+    $name = FormatText( $name );  
+    
+    print "\t$name\t$size\n";
+}
+print "\n";
+
 # only show problems if they exist! ######
 
 if( $deleted_bitstreams[0] > 0 )
@@ -228,21 +248,6 @@ if( $#empty_groups >= 0 )
     print "\n";
 }
 
-print "Collection sizes:\n";
-# sorted, of course
-foreach( sort { (split/\|/,$b)[1] <=> (split/\|/,$a)[1] } @collection_sizes )
-{
-    my ($name, $size) = split /\|/;
-
-    # spruce up the strings a bit
-    $size = FormatSize( $size );
-
-    # pad length of name string to right w/spaces
-    $name = FormatText( $name );  
-    
-    print "\t$name\t$size\n";
-}
-print "\n";
 
 if( $#bitstreams_without_policies >= 0 )
 {
@@ -258,11 +263,41 @@ if( $#bitstreams_without_policies >= 0 )
 }
 
 
+# check ownership - check the jsp and asset store directories
+#  for ownership issues - be sure to run this script as the dspace user
+
+
+find( \&CheckOwnership, @dspace_ownership_dirs );
+
+# check for zero-length files
+# (big deal in asset store)
+
+find( \&CheckZeroLength, @zerolength_dirs );
+
+
 ################################################
 # subroutines ##################################
 ################################################
 
 
+sub CheckOwnership
+{
+    my $filename = $File::Find::name;
+
+    if( ! -o $filename ) { print "Warning! DSpace user isn't owner of: $filename\n"; }
+}
+
+sub CheckZeroLength
+{
+    my $filename = $File::Find::name;
+
+    # skip if not a file
+    next if( ! -f $filename );
+
+    if( -z $filename ) { print "Warning! Zero-length file: $filename\n"; }
+}
+
+
 sub CountRows
 {
     my $tablename = shift;
@@ -314,7 +349,7 @@ sub DirectorySize
 sub FindCollectionSizes
 {
     my $arg =
-        "SELECT c1.name, SUM(bs.size) FROM " .
+        "SELECT c1.name, SUM(bs.size_bytes) FROM " .
             "collection c1, collection2item c2i1, item2bundle i2b1, " .
             "bundle2bitstream b2b1, bitstream bs " .
         "WHERE " .
@@ -384,7 +419,7 @@ sub FindDeletedBitstreams
     my $arg = "SELECT COUNT(*) from bitstream where deleted=true";
     my @deleted_count = ExecuteSQL( $arg );
 
-    $arg = "SELECT SUM(size) from bitstream where deleted=true";
+    $arg = "SELECT SUM(size_bytes) from bitstream where deleted=true";
     my @deleted_size = ExecuteSQL( $arg );
 
     return ($deleted_count[0], $deleted_size[0]);

dspace/bin/dspace_migrate

@@ -0,0 +1,132 @@
+#!/bin/bash
+
+############################################################################
+#
+# Version: $Revision$
+#
+# Date: $Date$
+#
+# Author        : Cody Green
+#                 Digital Initiatives Research
+#                 Texas A&M University
+# Email         : codygreen@tamu.edu
+# Description   : Shell script that helps migrate data from a development
+#                 server to a production server.  It will remove the handle
+#                 and any entries in the dublin_core.xml file that will be
+#                 duplicated upon importing the data into DSpace.
+#
+############################################################################
+
+# Make sure user is in bash
+if [ -z "$BASH" ]; then
+        printf "ERROR: please run this script with the BASH shell.\n"
+        exit 192
+fi
+
+# Check if SED is in the path
+which sed > /dev/null
+if [ $? -ne 0 ]; then
+        # Check what OS user has
+        if [ `uname -s` = "SunOS" ]; then
+                # Declare variables
+                declare -rx SED="/usr/bin/sed"
+        fi
+
+        if [ `uname -s` = "Linux" ]; then
+                # Declare variables
+                declare -rx SED="/bin/sed"
+                fi
+
+        # Sanity check for programs
+        if [ ! -e $sed ]; then
+                printf "ERROR: Can not find the program sed.\n
+                please check that the program is installed or
+                in your path"
+                exit 1
+        fi
+else
+        export SED=`which sed`
+fi
+
+# Check parameter count, show usage if incorrect number passed
+if [ $# -eq 0 ]; then
+        printf "Usage: dspace_migrate.sh [DIRECTORY]\n"
+        printf "Example: /dspace/bin/dspace_migrate.sh /home/user/ETDs/ \n\n"
+        printf "This script will remove the handle and any \nentries in the dublin_core.xml file that will \nbe duplicated upon importing the data into DSpace.\n\n"
+        exit 0;
+fi
+
+# Check if users needs help
+if [ $1 = "--help"  -o $1 = "--h" ]; then
+        printf "Usage: dspace_migrate.sh [DIRECTORY]\n"
+        printf "Example: /dspace/bin/dspace_migrate.sh /home/user/ETDs/ \n\n"
+        printf "This script will remove the handle and any \nentries in the dublin_core.xml file that will \nbe duplicated upon importing the data into DSpace.\n\n"
+        exit 0;
+fi
+
+# Check to see if the directory exists
+if [ ! -d $1 ]; then
+        printf "ERROR: $1 is not a valid directory.\n"
+        exit 1;
+fi
+
+printf "Fixing Bad Data in ETDs\n"
+
+# Loop through the directory
+for i in ls $1/*/dublin_core.xml;
+do
+         # Ignore ls in the returned values
+   if [ $i = "ls" ]; then
+      continue
+   fi
+   printf "Checking $i...\n"
+   # Check if file exists
+   if [ ! -s $i ]; then
+      printf "ERROR: $i does not exist of is empty\n"
+      exit 1
+   fi
+   # copy file
+   cp $i $i.orig
+   if [ $? -ne 0 ]; then
+      printf "ERROR: Could not copy $i to $i.orig \n"
+      exit 1
+   fi
+
+   printf "   --removing null and duplicate values for $i\n"
+
+   issued=`grep "element=\"date\" qualifier=\"issued\"" $i|cut -f2 -d \>|cut -f1 -d \<`
+   available=`grep "element=\"date\" qualifier=\"accessioned\"" $i|cut -f2 -d \>|cut -f1 -d \<`
+
+   if [ $issued = $available ]; then
+    $SED "/><\/dcvalue>/d" $i | $SED "/element=\"date\" qualifier=\"accessioned\"/d" | $SED "/element=\"date\" qualifier=\"available\"/d" |$SED "/element=\"date\" qualifier=\"issued\"/d" | $SED "/element=\"identifier\" qualifier=\"uri\"\>http:\/\/hdl/d" | $SED "/element=\"description\" qualifier=\"provenance\"/,/<\/dcvalue>/d" | $SED "/element=\"format\" qualifier=\"extent\"/d" | $SED "/element=\"format\" qualifier=\"mimetype\"/d" | $SED "/bytes, checksum/d" > $i
+   else
+    printf " -- date issued $issued  \n"
+   $SED "/><\/dcvalue>/d" $i | $SED "/element=\"date\" qualifier=\"accessioned\"/d" | $SED "/element=\"date\" qualifier=\"available\"/d" | $SED "/element=\"identifier\" qualifier=\"uri\"\>http:\/\/hdl/d" | $SED "/element=\"description\" qualifier=\"provenance\"/,/<\/dcvalue>/d" | $SED "/element=\"format\" qualifier=\"extent\"/d" | $SED "/element=\"format\" qualifier=\"mimetype\"/d" | $SED "/bytes, checksum/d" > $i
+   fi
+
+   if [ $? -ne 0 ]; then
+      printf "ERROR: Could not fix $i\n"
+      exit 1
+   fi
+
+   # Check to see if filesize is 0
+   printf "   --checking filesize for $i\n"
+   if [ ! -s $i ]; then
+      printf "ERROR: filesize for $i is 0\n"
+      exit 1
+   fi
+
+   # remove copy of file
+   rm -f $i.orig
+   if [ $? -ne 0 ]; then
+      printf "ERROR: Could not remove $i.orig\n"
+      exit 1
+   fi
+
+done
+rm -f $1/*/handle
+if [ $? -ne 0 ]; then
+   printf "ERROR: Could not delete handles\n"
+   exit 1
+fi
+printf "Data Has Been Fixed\n"

dspace/bin/dsrun.bat

@@ -0,0 +1,87 @@
+@REM
+@REM dsrun.bat
+@REM
+@REM Version: $Revision$
+@REM
+@REM Date: $Date$
+@REM
+@REM Copyright (c) 2005, Hewlett-Packard Company and Massachusetts
+@REM Institute of Technology.  All rights reserved.
+@REM
+@REM Redistribution and use in source and binary forms, with or without
+@REM modification, are permitted provided that the following conditions are
+@REM met:
+@REM
+@REM - Redistributions of source code must retain the above copyright
+@REM notice, this list of conditions and the following disclaimer.
+@REM
+@REM - Redistributions in binary form must reproduce the above copyright
+@REM notice, this list of conditions and the following disclaimer in the
+@REM documentation and/or other materials provided with the distribution.
+@REM
+@REM - Neither the name of the Hewlett-Packard Company nor the name of the
+@REM Massachusetts Institute of Technology nor the names of their
+@REM contributors may be used to endorse or promote products derived from
+@REM this software without specific prior written permission.
+@REM
+@REM THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+@REM ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+@REM LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+@REM A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+@REM HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+@REM INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+@REM BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+@REM OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+@REM ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+@REM TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+@REM USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+@REM DAMAGE.
+@REM
+
+@echo off
+
+REM This is a simple shell script for running a command-line DSpace tool.
+REM sets the CLASSPATH appropriately before invoking Java.
+
+REM Remember startup dir
+
+set CURRENT_DIR=%cd%
+
+
+REM Guess DSpace directory: CD to directory script is in; CD to parent
+
+chdir /D "%~p0"
+chdir ..
+
+REM Check we can find dspace.cfg.  Quit with an error if not.
+
+if exist "config\dspace.cfg" goto okExec
+echo Cannot find %cd%\config\dspace.cfg
+goto end
+
+
+:okExec
+
+echo Using DSpace installation in: %cd%
+
+REM Build a CLASSPATH
+
+set DSPACE_CLASSPATH=%CLASSPATH%;config
+for %%f in (lib\*.jar) DO CALL bin\buildpath.bat %%f
+
+
+REM Execute Java
+
+java -Xmx256m -classpath "%DSPACE_CLASSPATH%" %*
+
+
+REM Clean up DSPACE_CLASSPATH variable
+
+set DSPACE_CLASSPATH=
+
+
+:end
+
+REM Back to original dir
+
+chdir /D %CURRENT_DIR%

dspace/bin/filter-media

@@ -0,0 +1,51 @@
+#!/bin/sh
+
+###########################################################################
+#
+# filter-media
+#
+# Version: $Revision$
+#
+# Date: $Date$
+#
+# Copyright (c) 2002, 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.
+#
+###########################################################################
+
+# Shell script for running the media filter.
+
+# Get the DSPACE/bin directory
+BINDIR=`dirname $0`
+
+echo "Applying Media Filters"
+$BINDIR/dsrun org.dspace.app.mediafilter.MediaFilterManager $@

dspace/bin/log-reporter

@@ -287,14 +287,6 @@ else
                 $summary .= "to $enddate";
         }
         
-        if ((!defined $startdate) &&
-            (!defined $enddate))
-        {
-                # give the logfile name just in case, but chop off the path
-                my ($log_filename, $path, $suffix) = fileparse($logfile);                
-                $summary .= "$log_filename";
-        }
-
         # appropriate whitespace
         if (defined $no_subject)
         {

dspace/bin/make-handle-config

@@ -57,6 +57,7 @@ dsname=`$BINDIR/dsrun org.dspace.core.ConfigurationManager -property dspace.name
 handle=`$BINDIR/dsrun org.dspace.core.ConfigurationManager -property handle.prefix`
 handledir=`$BINDIR/dsrun org.dspace.core.ConfigurationManager -property handle.dir`
 tempfile=/tmp/handleconfig$$
+contactemail=`$BINDIR/dsrun org.dspace.core.ConfigurationManager -property mail.admin`
 
 # Write the options to a file we can pipe into the setup tool
 echo "1" >$tempfile   # 1 = non-caching server, 2 = caching server
@@ -65,8 +66,13 @@ echo $dshostname >>$tempfile   # IP address
 echo "" >>$tempfile   # Port to listen to (default=2641)
 echo "" >>$tempfile   # Port for HTTP i/f to listen to (default=8000)
 echo "" >>$tempfile   # Log all accesses?  ("y" or "n", default=n)
+echo "" >>$tempfile   # Rotate logs? (defulat=No)
 echo "" >>$tempfile   # Version/serial no. of site (default=1)
 echo $dsname Handle Server >>$tempfile  # Server description
+echo $dsname >>$tempfile # Server desriptive name
+echo "" >>$tempfile   # Contact name (default=none)
+echo "" >>$tempfile   # Contact telephone (default=none)
+echo $contactemail >>$tempfile   # Contact email
 echo "" >>$tempfile   # Block UDP access?  ("y" or "n", default=n)
 echo "n" >>$tempfile  # Do not encrypt server cert private key
                       # OR do not overwrite old server cert private key

dspace/bin/stat-general

@@ -0,0 +1,86 @@
+#!/usr/bin/env perl
+
+###########################################################################
+#
+# stat-general
+#
+# Author: Richard Jones
+# Created On: 25/02/2005
+#
+# Copyright (c) 2002, 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.
+###########################################################################
+
+###########################################################################
+# This script generates a full report based on the full log period
+#
+# To customise for your own use change the $out_prefix, $out_suffix, 
+# $dsrun and $out_directory variables below.
+# 
+# If you wish to futher configure this script, you will need to edit the
+# command being executed, which is below under $general
+#
+# For more information on using the LogAnalyser, use:
+#
+# [dspace]/bin/dsrun org.dspace.app.statistics.LogAnalyser -help
+###########################################################################
+
+my $second; 
+my $minute; 
+my $hour;
+my $day;
+my $month;
+my $year; 
+my $week_day; 
+my $day_of_year; 
+my $is_dst;
+
+# Get the all the values for current time
+($second, $minute, $hour, $day, $month, $year, $week_day, $day_of_year, $is_dst) = localtime(time);
+
+my $this_year = $year + 1900;
+my $this_month = $month + 1;
+
+# Details used
+######################################################
+$out_prefix = "dspace-log-general-";
+$out_suffix = ".dat";
+$dsrun = "/dspace/bin/dsrun";
+$out_directory = "/dspace/log/";
+
+######################################################
+
+$general = "$dsrun org.dspace.app.statistics.LogAnalyser -out $out_directory$out_prefix$this_year-$this_month-$day$out_suffix";
+
+system($general);
+
+exit(1);

dspace/bin/stat-initial

@@ -0,0 +1,156 @@
+#!/usr/bin/env perl
+
+###########################################################################
+#
+# stat-initial
+#
+# Author: Richard Jones
+# Created On: 25/02/2005
+#
+# Copyright (c) 2002, 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.
+###########################################################################
+
+###########################################################################
+# This script starts from the year and month specified below and works
+# forward until the end of the current month, generating monthly aggregation
+# files for the DStat system.
+#
+# To customise for your own use change the $out_prefix, $out_suffix, 
+# $start_year, $start_month, $dsrun and $out_directory variables below.
+# 
+# If you wish to futher configure this script, you will need to edit the
+# command being executed, which appears near the bottom of the page, and is 
+# commented with "# The command to generate the report"
+#
+# For more information on using the LogAnalyser, use:
+#
+# [dspace]/bin/dsrun org.dspace.app.statistics.LogAnalyser -help
+###########################################################################
+
+use POSIX qw(floor);
+
+my $start;
+my $end;
+my $out;
+my $i;
+my $no_months;
+my $second; 
+my $minute; 
+my $hour;
+my $day;
+my $month;
+my $year; 
+my $week_day; 
+my $day_of_year; 
+my $is_dst;
+my $out_prefix;
+my $out_suffix;
+
+# Details used
+################################################
+
+$out_prefix = "dspace-log-monthly-";
+$out_suffix = ".dat";
+$start_year = "2005";
+$start_month = "1";
+$dsrun = "/dspace/bin/dsrun";
+$out_directory = "/dspace/log/";
+
+################################################
+
+# Get the all the values for current time
+($second, $minute, $hour, $day, $month, $year, $week_day, $day_of_year, $is_dst) = localtime(time);
+
+# set up the variables to use in the loop
+
+# number of years after the current year (will mostly be negative)
+# <current year> = (<perl year> + 1900)
+# <start year offset> = <start year> - <current year>
+$year_offset = $start_year - ($year + 1900);
+
+# total number of months between now and the start date (negated to be positive in general)
+# <months in year offset> = |<start year offset>| * 12
+# <difference in current year months> = (<current perl month> + 1) - <start month>
+# <total number of months> = <months in year offset> + <difference in current year months>
+# we use -1 to make <start year offset> positive since it should always be negative
+$no_months = (-1 * ($year_offset * 12)) + (($month + 1) - $start_month);
+
+# start day of every month
+$start_day = "01";
+
+# for every month ...
+for ($i = 0; $i < $no_months; $i++)
+{
+    # the month of the year (horrid modular maths)
+    $this_month = (($start_month + $i - 1) % 12) + 1;
+
+    # number of years gone through since we started the loop
+    $year_count = floor(($i + $start_month - 1) / 12);
+
+    # the year of the current analysis period
+    $this_year = $year + $year_offset + $year_count + 1900;
+
+    # set the end day for the processing
+    if ($this_month == 1 || $this_month == 3 || $this_month == 5 || $this_month == 7 || $this_month == 8 || $this_month == 10 || $this_month == 12)
+    {
+        $end_day = "31";
+    }
+    elsif ($this_month == 4 || $this_month == 6 || $this_month == 9 || $this_month == 11)
+    {
+        $end_day = "30";
+    }
+    else
+    {
+        if (($year % 4) != 0)
+        {
+            $end_day = "28";
+        }
+        else
+        {
+            $end_day = "29";
+        }
+    }
+
+    # generate the date string
+    $start = $this_year . "-" . $this_month . "-" . $start_day;
+    $end = $this_year . "-" . $this_month . "-" . $end_day;
+
+    $out = $out_directory . $out_prefix . $this_year . "-" . $this_month . $out_suffix;
+
+    # The command to generate the report
+    $execute = "$dsrun org.dspace.app.statistics.LogAnalyser -start $start -end $end -out $out";
+    
+    system($execute);
+}
+
+exit(1);

dspace/bin/stat-monthly

@@ -0,0 +1,125 @@
+#!/usr/bin/env perl
+
+###########################################################################
+#
+# stat-monthly
+#
+# Author: Richard Jones
+# Created On: 25/02/2005
+#
+# Copyright (c) 2002, 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.
+###########################################################################
+
+###########################################################################
+# This script generates a report from the first of the current month to the end
+# of the current month.  This is not great, and will be superceded soon
+#
+# To customise for your own use change the $out_prefix, $out_suffix, 
+# $dsrun and $out_directory variables below.
+# 
+# If you wish to futher configure this script, you will need to edit the
+# command being executed, which appears near the bottom of the page, and is 
+# commented with "# The command to generate the report"
+#
+# For more information on using the LogAnalyser, use:
+#
+# [dspace]/bin/dsrun org.dspace.app.statistics.LogAnalyser -help
+###########################################################################
+
+use POSIX qw(floor);
+
+my $start;
+my $end;
+my $out;
+my $i;
+my $no_months;
+my $second; 
+my $minute; 
+my $hour;
+my $day;
+my $month;
+my $year; 
+my $week_day; 
+my $day_of_year; 
+my $is_dst;
+my $out_prefix;
+my $out_suffix;
+
+# Get the all the values for current time
+($second, $minute, $hour, $day, $month, $year, $week_day, $day_of_year, $is_dst) = localtime(time);
+
+# Details used
+################################################
+
+$out_prefix = "dspace-log-monthly-";
+$out_suffix = ".dat";
+$dsrun = "/dspace/bin/dsrun";
+$out_directory = "/dspace/log/";
+
+################################################
+
+$start_day = "01";
+$this_year = $year + 1900;
+$this_month = $month + 1;
+
+if ($this_month == 1 || $this_month == 3 || $this_month == 5 || $this_month == 7 || $this_month == 8 || $this_month == 10 || $this_month == 12)
+{
+    $end_day = "31";
+}
+elsif ($this_month == 4 || $this_month == 6 || $this_month == 9 || $this_month == 11)
+{
+    $end_day = "30";
+}
+else
+{
+    if (($year % 4) != 0)
+    {
+        $end_day = "28";
+    }
+    else
+    {
+        $end_day = "29";
+    }
+}
+
+$start = $this_year . "-" . $this_month . "-" . $start_day;
+$end = $this_year . "-" . $this_month . "-" . $end_day;
+
+$out = $out_directory . $out_prefix . $this_year . "-" . $this_month . $out_suffix;
+
+# The command to generate the report
+$execute = "$dsrun org.dspace.app.statistics.LogAnalyser -start $start -end $end -out $out";
+
+system($execute);
+
+exit(1);

dspace/bin/stat-report-general

@@ -0,0 +1,93 @@
+#!/usr/bin/env perl
+
+###########################################################################
+#
+# stat-report-general
+#
+# Author: Richard Jones
+# Created On: 25/02/2005
+#
+# Copyright (c) 2002, 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.
+###########################################################################
+
+###########################################################################
+# This script generates a full report based on the full log period
+#
+# To customise for your own use change the $out_prefix, $out_suffix, 
+# $dsrun and $out_directory variables below.
+# 
+# If you wish to futher configure this script, you will need to edit the
+# command being executed, which is below under $general
+#
+# For more information on using the LogAnalyser, use:
+#
+# [dspace]/bin/dsrun org.dspace.app.statistics.LogAnalyser -help
+###########################################################################
+
+my $second; 
+my $minute; 
+my $hour;
+my $day;
+my $month;
+my $year; 
+my $week_day; 
+my $day_of_year; 
+my $is_dst;
+
+# Get the all the values for current time
+($second, $minute, $hour, $day, $month, $year, $week_day, $day_of_year, $is_dst) = localtime(time);
+
+my $this_year = $year + 1900;
+my $this_month = $month + 1;
+
+# Details used
+######################################################
+
+$in_prefix = "dspace-log-general-";
+$in_suffix = ".dat";
+$out_prefix = "report-general-";
+$out_suffix = ".html";
+$dsrun = "/dspace/bin/dsrun";
+$in_directory = "/dspace/log/";
+$out_directory = "/dspace/reports/";
+
+######################################################
+
+$in = $in_directory . $in_prefix . $this_year . "-" . $this_month . "-" . $day . $in_suffix;
+$out = $out_directory . $out_prefix . $this_year . "-" . $this_month . "-" . $day . $out_suffix;
+
+$general = "$dsrun org.dspace.app.statistics.ReportGenerator -format html -in $in -out $out";
+
+system($general);
+
+exit(1);

dspace/bin/stat-report-initial

@@ -0,0 +1,137 @@
+#!/usr/bin/env perl
+
+###########################################################################
+#
+# stat-report-initial
+#
+# Author: Richard Jones
+# Created On: 28/02/2005
+#
+# Copyright (c) 2002, 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.
+###########################################################################
+
+###########################################################################
+# This script starts from the year and month specified below and works
+# forward until the end of the current month, generating monthly reports
+# from the dstat aggregation files.
+#
+# To customise for your own use change the $in_prefix, $in_suffix, $out_prefix, 
+# $out_suffix, $start_year, $start_month, $dsrun and $out_directory variables 
+# below.
+# 
+# If you wish to futher configure this script, you will need to edit the
+# command being executed, which appears near the bottom of the page, and is 
+# commented with "# The command to generate the report"
+#
+# For more information on using the ReportGenerator, use:
+#
+# [dspace]/bin/dsrun org.dspace.app.statistics.ReportGenerator -help
+###########################################################################
+
+use POSIX qw(floor);
+
+my $start;
+my $end;
+my $out;
+my $i;
+my $no_months;
+my $second; 
+my $minute; 
+my $hour;
+my $day;
+my $month;
+my $year; 
+my $week_day; 
+my $day_of_year; 
+my $is_dst;
+my $out_prefix;
+my $out_suffix;
+
+# Details used
+################################################
+
+$in_prefix = "dspace-log-monthly-";
+$in_suffix = ".dat";
+$out_prefix = "report-";
+$out_suffix = ".html";
+$start_year = "2004";
+$start_month = "5";
+$dsrun = "/dspace/bin/dsrun";
+$in_directory = "/dspace/log/";
+$out_directory = "/dspace/reports/";
+
+################################################
+
+# Get the all the values for current time
+($second, $minute, $hour, $day, $month, $year, $week_day, $day_of_year, $is_dst) = localtime(time);
+
+# set up the variables to use in the loop
+
+# number of years after the current year (will mostly be negative)
+# <current year> = (<perl year> + 1900)
+# <start year offset> = <start year> - <current year>
+$year_offset = $start_year - ($year + 1900);
+
+# total number of months between now and the start date (negated to be positive in general)
+# <months in year offset> = |<start year offset>| * 12
+# <difference in current year months> = (<current perl month> + 1) - <start month>
+# <total number of months> = <months in year offset> + <difference in current year months>
+# we use -1 to make <start year offset> positive since it should always be negative
+$no_months = (-1 * ($year_offset * 12)) + (($month + 1) - $start_month);
+
+# start day of every month
+$start_day = "01";
+
+# for every month ...
+for ($i = 0; $i < $no_months; $i++)
+{
+    # the month of the year (horrid modular maths)
+    $this_month = (($start_month + $i - 1) % 12) + 1;
+
+    # number of years gone through since we started the loop
+    $year_count = floor(($i + $start_month - 1) / 12);
+
+    # the year of the current analysis period
+    $this_year = $year + $year_offset + $year_count + 1900;
+
+    # input and output file paths
+    $in = $in_directory . $in_prefix . $this_year . "-" . $this_month . $in_suffix;
+    $out = $out_directory . $out_prefix . $this_year . "-" . $this_month . $out_suffix;
+
+    # The command to generate the report
+    $execute = "$dsrun org.dspace.app.statistics.ReportGenerator -format html -in $in -out $out";
+    
+    system($execute);
+}
+
+exit(1);

dspace/bin/stat-report-monthly

@@ -0,0 +1,105 @@
+#!/usr/bin/env perl
+
+###########################################################################
+#
+# stat-report-monthly
+#
+# Author: Richard Jones
+# Created On: 29/02/2005
+#
+# Copyright (c) 2002, 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.
+###########################################################################
+
+###########################################################################
+# This script generates a report from the aggregation file which has been
+# run for the most recent month
+#
+# To customise for your own use change the $out_prefix, $out_suffix, 
+# $dsrun and $out_directory variables below.
+# 
+# If you wish to futher configure this script, you will need to edit the
+# command being executed, which appears near the bottom of the page, and is 
+# commented with "# The command to generate the report"
+#
+# For more information on using the LogAnalyser, use:
+#
+# [dspace]/bin/dsrun org.dspace.app.statistics.LogAnalyser -help
+###########################################################################
+
+use POSIX qw(floor);
+
+my $start;
+my $end;
+my $out;
+my $i;
+my $no_months;
+my $second; 
+my $minute; 
+my $hour;
+my $day;
+my $month;
+my $year; 
+my $week_day; 
+my $day_of_year; 
+my $is_dst;
+my $out_prefix;
+my $out_suffix;
+
+# Get the all the values for current time
+($second, $minute, $hour, $day, $month, $year, $week_day, $day_of_year, $is_dst) = localtime(time);
+
+# Details used
+################################################
+
+$in_prefix = "dspace-log-monthly-";
+$in_suffix = ".dat";
+$out_prefix = "report-";
+$out_suffix = ".html";
+$dsrun = "/dspace/bin/dsrun";
+$in_directory = "/dspace/log/";
+$out_directory = "/dspace/reports/";
+
+################################################
+
+$this_year = $year + 1900;
+$this_month = $month + 1;
+
+$in = $in_directory . $in_prefix . $this_year . "-" . $this_month . $in_suffix;
+$out = $out_directory . $out_prefix . $this_year . "-" . $this_month . $out_suffix;
+
+# The command to generate the report
+$execute = "$dsrun org.dspace.app.statistics.ReportGenerator -format html -in $in -out $out";
+
+system($execute);
+
+exit(1);

dspace/bin/update-handle-prefix

@@ -0,0 +1,98 @@
+#!/bin/sh
+
+###########################################################################
+#
+# update_handle_prefix
+#
+# Version: $Revision$
+#
+# Date: $Date$
+#
+# Copyright (c) 2002, 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.
+#
+###########################################################################
+
+# Shell script for updating a handle prefix (e.g. when moving from development
+# to production). Must be run as the dspace database user or equivalent.
+#
+# NOTE: Currently only compatible with installs running a PostgreSQL database
+#
+
+# validation and tool checking
+if [ ! "$1" -o ! "$2" ]
+then
+	echo
+	echo "Usage: update_handle_prefix <old handle> <new handle>"
+	echo
+	exit 1
+fi
+
+which awk > /dev/null
+if [ $? -ne 0 ]
+then
+	echo
+	echo "awk not found in your path, please add to your path before running this script"
+	echo
+	exit 1
+fi
+
+which psql > /dev/null
+if [ $? -ne 0 ]
+then
+	echo
+	echo "psql not found in your PATH, please add to your PATH and re-run script"
+	echo
+	exit 1
+fi
+
+# start the update
+echo "If you continue, all handles in your repository with prefix $1 will be updated to have handle prefix $2"
+echo -n "Continue? [y/n]: "
+read choice
+if [ "$choice" = y -o "$choice" = Y ]
+then
+	# get the length of the old prefix for use in the overlay function
+	oldPrefixLen=`echo $1 | awk '{print length($1)}'`
+	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
+	echo "Update cancelled"	
+	echo
+	break
+fi

dspace/build.xml

@@ -41,27 +41,24 @@
   - Date:     $Date$
   -->
 
-<project name="DSpace" default="compile" basedir=".">
+<project name="DSpace" default="compile">
 
   <!-- ============================================================= -->
   <!-- Description                                                   -->
   <!-- ============================================================= -->
 
   <description>
-===================== DSpace platform build file =====================
+====================== DSpace platform build file ======================
 
 Common usage:
 
   Fresh install, including database setup and registry loading:
-    % ant ; ant fresh_install
+    % ant fresh_install
   
-  Upgrade existing installation, leaving code, data and configuration
-    % ant ; ant -Dconfig=/installdir/config/dspace.cfg update
-  
-  The following target require that the system is installed:
-    load_registries
+  Update existing installation, leaving data and configuration intact:
+    % ant -Dconfig=/installdir/config/dspace.cfg update
 
-======================================================================
+========================================================================
   </description>
 
   <!-- ============================================================= -->
@@ -76,12 +73,26 @@ Common usage:
   <!-- ============================================================= -->
     
   <!-- Default configuration to use.  This may be overridden. -->
-  <property name="config" value="${basedir}/config/dspace.cfg" />
+  <property name="config" value="config/dspace.cfg" />
 
   <!-- Give user a chance to override without editing this file 
        (and without typing -D each time s/he compiles it) -->
   <property file="${user.home}/.dspace.properties" />
 
+  <!-- First, set the dspace.dir property so it can be
+       interpolated when loading the config file.
+       This crudely mimics the way ConfigurationManager interpolates properties.
+       Note that it ONLY works for directories that interpolate ${dspace.dir}
+       but that _should_ cover all cases used in this build configuration.
+    -->
+  <loadproperties srcFile="${config}">
+    <filterchain>
+      <linecontainsregexp>
+         <regexp pattern="^\s*dspace\.dir\s+"/>
+      </linecontainsregexp>
+    </filterchain>
+  </loadproperties>
+
   <!-- Load the configuration -->
   <property file="${config}" />
 
@@ -93,8 +104,8 @@ Common usage:
   <!-- We will include the environment CLASSPATH -->
   <path id="build.class.path">
     <pathelement path="${env.CLASSPATH}"/>
-    <pathelement path="${basedir}/build/classes"/>
-    <fileset dir="${basedir}/lib">
+    <pathelement path="build/classes"/>
+    <fileset dir="lib">
       <include name="**/*.jar"/>
     </fileset>
   </path>
@@ -106,101 +117,163 @@ Common usage:
 
   <target name="compile"
           description="Compile the source code">
-    <mkdir dir="${basedir}/build/classes"/>
-    <javac srcdir="${basedir}/src"
-           destdir="${basedir}/build/classes"
-           debug="on">
+    <mkdir dir="build/classes"/>
+    <javac srcdir="src"
+           destdir="build/classes"
+           debug="on"
+    	       source="1.4"
+  	       target="1.4">
       <include name="**/*.java"/>
       <classpath refid="build.class.path"/>
     </javac>
   </target>
-  
-  
+
+
   <!-- ============================================================= -->
-  <!-- Update the code, without clobbering existing data             -->
+  <!-- Build the .war files                                          -->
+  <!-- ============================================================= -->
+
+  <target name="build_wars"
+          depends="compile"
+          description="Build the .war files">  
+    <!-- Build DSpace UI .war -->
+    <copy file="etc/dspace-web.xml"
+          tofile="build/dspace-web.xml"
+          preservelastmodified="true"/>
+    <replace file="build/dspace-web.xml"
+             token="@@dspace.dir@@"
+             value="${dspace.dir}" />
+    <!-- Make sure jsp/local exists -->
+    <mkdir dir="jsp/local" />
+    <!-- Copy original JSPs, then copy localised versions on top -->
+    <mkdir dir="build/jsp" />
+    <copy todir="build/jsp" preservelastmodified="true">
+      <fileset dir="jsp">
+        <exclude name="local/**" />
+      </fileset>
+    </copy>
+    <copy todir="build/jsp" preservelastmodified="true" overwrite="true">
+      <fileset dir="jsp/local" />
+    </copy>
+  	<!-- Copy Messages.properties files -->
+  	<copy todir="build/classes"
+  		  preservelastmodified="true">
+      <fileset dir="config/language-packs">
+  		<include name="Messages*.properties"/>
+      </fileset>
+    </copy>
+  	<!-- Build DSpace Web UI .war -->
+    <war destfile="build/dspace.war"
+         webxml="build/dspace-web.xml">
+       <fileset dir="build/jsp" />
+       <lib dir="lib">
+         <exclude name="servlet.jar" />
+       </lib>
+       <classes dir="build/classes" />
+    </war>
+    <!-- Build DSpace OAI-PMH .war -->
+    <copy file="etc/oai-web.xml"
+          tofile="build/oai-web.xml"
+          preservelastmodified="true"/>
+    <replace file="build/oai-web.xml"
+             token="@@dspace.dir@@"
+             value="${dspace.dir}" />
+    <war destfile="build/dspace-oai.war"
+         webxml="build/oai-web.xml">
+       <lib dir="lib">
+         <exclude name="servlet.jar" />
+       </lib>
+       <classes dir="build/classes" />
+    </war>
+  </target>
+  
+    
+  <!-- ============================================================= -->
+  <!-- Update an installation (except database)                      -->
   <!-- ============================================================= -->
 
   <target name="update"
-          description="Update installed code (install without clobbering data)">
+          depends="install_code,build_wars"
+          description="Update installed code (without clobbering data/config)">
+    <copy todir="${dspace.dir}/config" preservelastmodified="true">
+      <fileset dir="config/language-packs"/>
+    </copy>    
+          
+    <echo>
+====================================================================
+Copied language packs into ${dspace.dir}/config    
+    
+====================================================================
+ Updated Web application (.war) files are in the 'build' directory.
+
+ * Stop your Web servlet container (Tomcat, Jetty, Resin etc.)
+ 
+ * If you're using Tomcat, you need delete the directories
+   corresponding to the old .war files.  For example, if dspace.war
+   is installed in CATALINA_HOME/webapps/dspace.war, you should
+   delete the CATALINA_HOME/webapps/dspace directory.  Otherwise,
+   Tomcat will continue to use the old code in that directory.
+
+ * Copy the new dspace.war and dspace-oai.war from the 'build'
+   directory over the old ones
+
+ * Start up your Web servlet container again.
+====================================================================
+    </echo>
+  </target>
+
+
+  <!-- ============================================================= -->
+  <!-- Install or update DSpace code                                 -->
+  <!-- ============================================================= -->
+
+  <target name="install_code"
+          depends="compile">
     <mkdir dir="${dspace.dir}/config" />
     <mkdir dir="${assetstore.dir}" />
     <mkdir dir="${handle.dir}" />
     <mkdir dir="${history.dir}" />
     <mkdir dir="${search.dir}" />
     <mkdir dir="${log.dir}" />
+    <mkdir dir="${upload.temp.dir}" />
     <mkdir dir="${dspace.dir}/bin"/>
     <mkdir dir="${dspace.dir}/lib"/>
-    <mkdir dir="${dspace.dir}/jsp/local"/>
-    <mkdir dir="${dspace.dir}/jsp/WEB-INF"/>
-    <mkdir dir="${dspace.dir}/oai/WEB-INF"/>
-    <!-- Delete symlinks, otherwise ln -s commands below would create
-         extra symlinks, e.g. "WEB-INF/lib/lib".  Plus, we need to use
-         shell "rm" command, since ANT's delete task doesn't
-         understand symlinks. -->
-    <exec executable="rm">
-      <arg value="-f" />
-      <arg value="${dspace.dir}/jsp/WEB-INF/classes" />
-      <arg value="${dspace.dir}/jsp/WEB-INF/lib" />
-      <arg value="${dspace.dir}/oai/WEB-INF/classes" />
-      <arg value="${dspace.dir}/oai/WEB-INF/lib" />
-    </exec>
-    <!-- Symlink the Web UI and OAI webapps "classes" and "lib" directory
-      -  to dspace.dir/config and dspace.dir/lib respectively -->
-    <exec executable="ln">
-      <arg value="-s" />
-      <arg value="${dspace.dir}/config" />
-      <arg value="${dspace.dir}/jsp/WEB-INF/classes" />
-    </exec>
-    <exec executable="ln">
-      <arg value="-s" />
-      <arg value="${dspace.dir}/lib" />
-      <arg value="${dspace.dir}/jsp/WEB-INF/lib" />
-    </exec>
-    <exec executable="ln">
-      <arg value="-s" />
-      <arg value="${dspace.dir}/config" />
-      <arg value="${dspace.dir}/oai/WEB-INF/classes" />
-    </exec>
-    <exec executable="ln">
-      <arg value="-s" />
-      <arg value="${dspace.dir}/lib" />
-      <arg value="${dspace.dir}/oai/WEB-INF/lib" />
-    </exec>
-    <copy todir="${dspace.dir}/bin">
+    <mkdir dir="${report.dir}"/>
+    <copy todir="${dspace.dir}/bin" preservelastmodified="true">
       <fileset dir="bin"/>
     </copy>
-    <exec executable="chmod">
-      <arg value="-R" />
-      <arg value="u+x" />
-      <arg value="${dspace.dir}/bin" />
-    </exec>
-    <copy todir="${dspace.dir}/lib">
-      <fileset dir="lib"/>
-    </copy>
-    <copy todir="${dspace.dir}/jsp">
-      <fileset dir="jsp"/>
+    <chmod dir="${dspace.dir}/bin" perm="u+x" includes="**/*" />
+    <copy todir="${dspace.dir}/lib" preservelastmodified="true">
+      <fileset dir="lib" />
     </copy>
     <jar jarfile="${dspace.dir}/lib/dspace.jar"
-         basedir="${basedir}/build/classes" />
+         basedir="build/classes" />
   </target>
   
   
   <!-- ============================================================= -->
-  <!-- Do a fresh install of the code and configuration files        -->
+  <!-- Fresh install of config files                                 -->
   <!-- ============================================================= -->
   
-  <!-- Installs code, then config, and symlinks WEB-INF/classes to config.
-       The "log4j.build.properties" file is copied to ${dspace.dir}/config
-       so there's a simple log4j.properties file present for the initial
-       run of "install-configs". -->
-  <target name="install_code"
-          depends="update"
-          description="Do a fresh install of the system, not touching database">
-    <copy todir="${dspace.dir}/config">
-      <fileset dir="${basedir}/config"/>
+  <!-- Writes the configuration files to ${dspace.dir}/config.  It does *not*
+       run the install-configs script.  The "log4j.build.properties" file is
+       copied to ${dspace.dir}/config so there's a simple log4j.properties
+       file present for the initial run of "install-configs". -->
+  <target name="init_configs">
+    <copy todir="${dspace.dir}/config" preservelastmodified="true">
+      <fileset dir="config">
+    	<exclude name="language-packs/**"/>
+      </fileset>
     </copy>
-    <copy file="${basedir}/etc/log4j.build.properties"
-          tofile="${dspace.dir}/config/log4j.properties"/>
+    <copy todir="${dspace.dir}/config" preservelastmodified="true">
+      <fileset dir="config/language-packs"/>
+    </copy>    
+    <copy file="etc/log4j.build.properties"
+          tofile="${dspace.dir}/config/log4j.properties"
+          preservelastmodified="true"/>
+  	<copy file="${config}"
+  			tofile="${dspace.dir}/config/dspace.cfg"
+  			preservelastmodified="true" />
   </target>
 
 
@@ -212,14 +285,15 @@ Common usage:
     -  file in etc/ and the DSpace configuration file using system
     -  properties -->
   <target name="setup_database"
+          depends="compile"
           description="Create database tables">
     <java classname="org.dspace.storage.rdbms.InitializeDatabase"
           classpathref="build.class.path"
           fork="yes"
           failonerror="yes">
-      <sysproperty key="log4j.configuration" value="file:${basedir}/etc/log4j.build.properties"/>
+      <sysproperty key="log4j.configuration" value="file:etc/log4j.build.properties"/>
       <sysproperty key="dspace.configuration" value="${config}"/>
-      <arg value="${basedir}/etc/database_schema.sql"/>
+      <arg value="etc/database_schema.sql"/>
     </java>
   </target>
 
@@ -232,14 +306,15 @@ Common usage:
     -  file in etc/ and the DSpace configuration file using system
     -  properties -->
   <target name="clean_database"
+          depends="compile"
           description="Removes DSpace database tables, destroying data">
     <java classname="org.dspace.storage.rdbms.InitializeDatabase"
           classpathref="build.class.path"
           fork="yes"
           failonerror="yes">
-      <sysproperty key="log4j.configuration" value="file:${basedir}/etc/log4j.build.properties"/>
+      <sysproperty key="log4j.configuration" value="file:etc/log4j.build.properties"/>
       <sysproperty key="dspace.configuration" value="${config}"/>
-      <arg value="${basedir}/etc/clean-database.sql"/>
+      <arg value="etc/clean-database.sql"/>
     </java>
   </target>
 
@@ -250,12 +325,13 @@ Common usage:
 
   <!-- Loads bitstream format and Dublin Core type registries -->
   <target name="load_registries"
+          depends="compile"
           description="Load initial contents of registries">
     <java classname="org.dspace.administer.RegistryLoader"
           classpathref="build.class.path"
           fork="yes"
           failonerror="yes">
-      <sysproperty key="log4j.configuration" value="file:${basedir}/etc/log4j.build.properties"/>
+      <sysproperty key="log4j.configuration" value="file:etc/log4j.build.properties"/>
       <sysproperty key="dspace.configuration" value="${config}"/>
       <arg value="-bitstream"/>
       <arg value="${dspace.dir}/config/registries/bitstream-formats.xml"/>
@@ -264,7 +340,7 @@ Common usage:
           classpathref="build.class.path"
           fork="yes"
           failonerror="yes">
-      <sysproperty key="log4j.configuration" value="file:${basedir}/etc/log4j.build.properties"/>
+      <sysproperty key="log4j.configuration" value="file:etc/log4j.build.properties"/>
       <sysproperty key="dspace.configuration" value="${config}"/>
       <arg value="-dc"/>
       <arg value="${dspace.dir}/config/registries/dublin-core-types.xml"/>
@@ -277,8 +353,55 @@ Common usage:
   <!-- ============================================================= -->
   
   <target name="fresh_install"
-          depends="install_code,setup_database,load_registries"
+          depends="install_code,build_wars,init_configs,setup_database,load_registries"
           description="Do a fresh install of the system, overwriting any data">
+    <java classname="org.dspace.core.ConfigurationManager"
+          classpathref="build.class.path"
+          fork="yes"
+          failonerror="yes">
+      <sysproperty key="log4j.configuration" value="file:etc/log4j.build.properties"/>
+      <sysproperty key="dspace.configuration" value="${config}"/>
+      <arg value="-installTemplates"/>
+    </java>    
+    <java classname="org.dspace.browse.InitializeBrowse"
+          classpathref="build.class.path"
+          fork="yes"
+          failonerror="yes">
+      <sysproperty key="log4j.configuration" value="file:etc/log4j.build.properties"/>
+      <sysproperty key="dspace.configuration" value="${config}"/>
+    </java>
+    <java classname="org.dspace.search.DSIndexer"
+          classpathref="build.class.path"
+          fork="yes"
+          failonerror="yes">
+      <sysproperty key="log4j.configuration" value="file:etc/log4j.build.properties"/>
+      <sysproperty key="dspace.configuration" value="${config}"/>
+    </java>
+    <echo>
+====================================================================
+ The DSpace code has been installed, and the database initialized.
+ 
+ To complete installation, you should do the following:
+ 
+ * Install the DSpace UI (dspace.war) and OAI-PMH (dspace-oai.war)
+   Web applications from the 'build' directory in the appropriate
+   place for your servlet container.  e.g. '/opt/tomcat/webapps'
+
+ * Make an initial administrator account (an e-person) in DSpace:
+ 
+   ${dspace.dir}/bin/create-administrator
+   
+ * Start up your servlet container (Tomcat etc.)
+
+ You should then be able to access your DSpace's 'home page':
+ 
+   ${dspace.url}
+ 
+ You should also be able to access the administrator UI:
+ 
+   ${dspace.url}/dspace-admin
+====================================================================
+    </echo>
   </target>
 
 
@@ -288,7 +411,7 @@ Common usage:
 
   <target name="clean"
           description="Remove compiled files - does not affect installation">
-    <delete dir="${basedir}/build" />
+    <delete dir="build" />
   </target>
 
 
@@ -298,21 +421,24 @@ Common usage:
 	
   <target name="public_api"
           description="Create the DSpace public API documentation with javadoc">
-    <mkdir dir="${basedir}/build/public-api" />
-    <javadoc sourcepath="${basedir}/src"
-             destdir="${basedir}/build/public-api"
+    <mkdir dir="build/public-api" />
+    <javadoc sourcepath="src"
+             destdir="build/public-api"
              author="true"
              version="true"
              access="public"
              doctitle="DSpace Public API"
              windowtitle="DSpace Public API"
              bottom="Copyright &#169; 2002 MIT and Hewlett-Packard. All Rights Reserved."
-             overview="${basedir}/src/overview.html"
+             overview="src/overview.html"
              classpathref="build.class.path">
       <package name="org.dspace.administer"/>
       <package name="org.dspace.authorize"/>
       <package name="org.dspace.browse"/>
+      <package name="org.dspace.checker"/>
       <package name="org.dspace.content"/>
+      <package name="org.dspace.content.packager"/>
+      <package name="org.dspace.content.crosswalk"/>
       <package name="org.dspace.core"/>
       <package name="org.dspace.eperson"/>
       <package name="org.dspace.handle"/>
@@ -324,4 +450,26 @@ Common usage:
     </javadoc>
   </target>
 
+
+  <!-- ============================================================= -->
+  <!-- Create javadoc for everything                                 -->
+  <!-- ============================================================= -->
+
+  <target name="javadoc"
+          description="Create the DSpace public API documentation with javadoc">
+    <mkdir dir="build/javadoc" />
+    <javadoc destdir="build/javadoc"
+             author="true"
+             version="true"
+             doctitle="DSpace Source Javadoc"
+             windowtitle="DSpace Source Javadoc"
+             bottom="Copyright &#169; 2002 MIT and Hewlett-Packard. All Rights Reserved."
+             overview="src/overview.html"
+             classpathref="build.class.path">
+      <packageset dir="src">
+        <include name="**" />
+      </packageset>
+    </javadoc>
+  </target>
+
 </project>

dspace/config/controlled-vocabularies/LICENCES

@@ -0,0 +1,14 @@
+nsi.xml
+=======
+
+Norsk inndeling av vitenskapsdisipliner was created in 2003 for The Norwegian 
+Association of Higher Education Institutions.
+
+--------------------------------------------------------------------------------
+
+srsc.xml
+========
+
+Thanks to the Swedish Royal Librarys Department for National Co-ordination and
+Development, BIBSAM, and the participating members in the SVEP project for
+the permission to use the Swedish Research Subject Categories.

dspace/config/controlled-vocabularies/nsi.xml

@@ -0,0 +1,563 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The Norwegian Science Index
+-->
+
+<node id="VDP" label="VDP">
+	<isComposedBy>
+		<node id="000" label="Humaniora: 000">
+			<isComposedBy>
+				<node id="010" label="Språkvitenskapelige fag: 010">
+					<isComposedBy>
+						<node id="011" label="Allmenn språkvitenskap og fonetikk: 011" />
+						<node id="012" label="Anvendt språkvitenskap: 012" />
+						<node id="013" label="Tegnspråk: 013" />
+						<node id="018" label="Nordiske språk: 018" />
+						<node id="019" label="Norrøn filologi: 019" />
+						<node id="020" label="Engelsk språk: 020" />
+						<node id="021" label="Tysk språk: 021" />
+						<node id="022" label="Nederlandsk språk: 022" />
+						<node id="023" label="Andre germanske språk: 023" />
+						<node id="024" label="Fransk språk: 024" />
+						<node id="025" label="Italiensk språk: 025" />
+						<node id="026" label="Spansk språk: 026" />
+						<node id="027" label="Andre romanske språk: 027" />
+						<node id="028" label="Russisk språk: 028" />
+						<node id="029" label="Andre slaviske språk: 029" />
+						<node id="030" label="Finsk-ugriske språk: 030" />
+						<node id="031" label="Samisk språk: 031" />
+						<node id="032" label="Klassisk filologi: 032" />
+						<node id="033" label="Indoeuropeiske språk: 033" />
+						<node id="034" label="Østasiatiske språk: 034" />
+						<node id="035" label="Semittiske språk: 035" />
+						<node id="036" label="Afrikanske språk: 036" />
+						<node id="037" label="Stillehavsspråk: 037" />
+						<node id="038" label="Tyrkiske språk: 038" />
+						<node id="039" label="Andre språkvitenskapelige fag: 039" />
+					</isComposedBy>
+				</node>
+				<node id="040" label="Litteraturvitenskapelige fag: 040">
+					<isComposedBy>
+						<node id="041" label="Allmenn litteraturvitenskap: 041" />
+						<node id="042" label="Nordisk litteratur: 042" />
+						<node id="043" label="Engelsk litteratur: 043" />
+						<node id="044" label="Tysk litteratur: 044" />
+						<node id="045" label="Annen germansk litteratur: 045" />
+						<node id="046" label="Fransk litteratur: 046" />
+						<node id="047" label="Italiensk litteratur: 047" />
+						<node id="048" label="Spansk litteratur: 048" />
+						<node id="049" label="Annen romansk litteratur: 049" />
+						<node id="050" label="Russisk litteratur: 050" />
+						<node id="051" label="Annen slavisk litteratur: 051" />
+						<node id="052" label="Finsk litteratur: 052" />
+						<node id="053" label="Samisk litteratur: 053" />
+						<node id="054" label="Klassisk litteratur: 054" />
+						<node id="055" label="Indoeuropeisk litteratur: 055" />
+						<node id="056" label="Østasiatisk litteratur: 056" />
+						<node id="057" label="Semittisk litteratur: 057" />
+						<node id="058" label="Afrikansk litteratur: 058" />
+						<node id="059" label="Andre litteraturvitenskapelige fag: 059" />
+					</isComposedBy>
+				</node>
+				<node id="060" label="Kulturvitenskap: 060">
+					<isComposedBy>
+						<node id="061" label="Nordisk kulturvitenskap: 061" />
+						<node id="062" label="Germansk kulturvitenskap: 062" />
+						<node id="063" label="Romansk kulturvitenskap: 063" />
+						<node id="064" label="Slavisk kulturvitenskap: 064" />
+						<node id="065" label="Klassisk kulturvitenskap: 065" />
+						<node id="066" label="Indoeuropeisk kulturvitenskap: 066" />
+						<node id="067" label="Østasiatisk kulturvitenskap: 067" />
+						<node id="068" label="Angloamerikansk kulturvitenskap: 068" />
+						<node id="069" label="Annen kulturvitenskap: 069" />
+					</isComposedBy>
+				</node>
+				<node id="070" label="Historie: 070">
+					<isComposedBy>
+						<node id="071" label="Politisk historie: 071" />
+						<node id="072" label="Sosialhistorie: 072" />
+						<node id="073" label="Kvinnehistorie: 073" />
+						<node id="074" label="Økonomisk historie: 074" />
+						<node id="075" label="Kulturhistorie: 075" />
+						<node id="080" label="Oldtidens historie: 080" />
+						<node id="081" label="Middelalderhistorie: 081" />
+						<node id="082" label="Nyere tids historie (før 1800): 082" />
+						<node id="083" label="Moderne historie (etter 1800): 083" />
+						<node id="084" label="Samtidshistorie (etter 1945): 084" />
+						<node id="085" label="Ikke-europeisk/-vestlig historie: 085" />
+						<node id="089" label="Annen historie: 089" />
+					</isComposedBy>
+				</node>
+				<node id="090" label="Arkeologi: 090">
+					<isComposedBy>
+						<node id="091" label="Nordisk arkeologi: 091" />
+						<node id="092" label="Klassisk arkeologi: 092" />
+						<node id="099" label="Annen arkeologi: 099" />
+					</isComposedBy>
+				</node>
+				<node id="100" label="Folkloristikk, etnologi: 100">
+					<isComposedBy>
+						<node id="101" label="Folkloristikk: 101" />
+						<node id="102" label="Etnologi: 102" />
+					</isComposedBy>
+				</node>
+				<node id="110" label="Musikkvitenskap: 110">
+					<isComposedBy>
+						<node id="111" label="Musikkhistorie: 111" />
+						<node id="112" label="Musikkteori: 112" />
+						<node id="113" label="Musikkterapi: 113" />
+						<node id="114" label="Musikkpedagogikk: 114" />
+						<node id="119" label="Annen musikkvitenskap: 119" />
+					</isComposedBy>
+				</node>
+				<node id="120" label="Kunsthistorie: 120">
+					<isComposedBy>
+						<node id="121" label="Skulptur: 121" />
+						<node id="122" label="Maleri, tegning, grafikk: 122" />
+						<node id="123" label="Folkekunst, kunsthåndverk: 123" />
+						<node id="124" label="Konservering og restaurering: 124" />
+						<node id="125" label="Antikkens kunsthistorie: 125" />
+						<node id="126" label="Middelalderkunsthistorie: 126" />
+						<node id="127" label="Fra renessanse‑ t.o.m. barokk: 127" />
+						<node id="128" label="Nyere tids kunsthistorie: 128" />
+						<node id="129" label="Moderne kunsthistorie: 129" />
+						<node id="130" label="Ikke‑europeisk kunsthistorie: 130" />
+						<node id="139" label="Annen kunsthistorie: 139" />
+					</isComposedBy>
+				</node>
+				<node id="140" label="Arkitektur og design: 140">
+					<isComposedBy>
+						<node id="141" label="Arkitektur- og designhistorie: 141" />
+						<node id="142" label="Arkitektur- og designteori: 142" />
+						<node id="143" label="Prosjekterings‑ og formgivningsmetodikk: 143" />
+						<node id="147" label="Landskapsarkitektur: 147" />
+					</isComposedBy>
+				</node>
+				<node id="150" label="Teologi og religionsvitenskap: 150">
+					<isComposedBy>
+						<node id="151" label="Teologi: 151" />
+						<node id="152" label="Kristendomskunnskap: 152" />
+						<node id="153" label="Religionsvitenskap, religionshistorie: 153" />
+					</isComposedBy>
+				</node>
+				<node id="160" label="Filosofiske fag: 160">
+					<isComposedBy>
+						<node id="161" label="Filosofi: 161" />
+						<node id="162" label="Idéhistorie: 162" />
+						<node id="163" label="Logikk: 163" />
+						<node id="164" label="Etikk: 164" />
+						<node id="169" label="Andre filosofiske fag: 169" />
+					</isComposedBy>
+				</node>
+				<node id="170" label="Film- og teatervitenskap: 170">
+					<isComposedBy>
+						<node id="171" label="Filmvitenskap: 171" />
+						<node id="172" label="Teatervitenskap: 172" />
+					</isComposedBy>
+				</node>
+			</isComposedBy>
+		</node>
+		
+		<node id="200" label="Samfunnsvitenskap: 200">
+			<isComposedBy>
+				<node id="210" label="Økonomi: 210">
+					<isComposedBy>
+						<node id="212" label="Samfunnsøkonomi: 212" />
+						<node id="213" label="Bedriftsøkonomi: 213" />
+						<node id="214" label="Økonometri: 214" />
+					</isComposedBy>
+				</node>
+				<node id="230" label="Urbanisme og fysisk planlegging: 230">
+					<isComposedBy>
+						<node id="231" label="Planleggingshistorie, -teori og -metodikk: 231" />
+						<node id="234" label="Bebyggelses‑ og reguleringsplanlegging: 234" />
+						<node id="236" label="Landskapsplanlegging: 236" />
+						<node id="237" label="Urbanisme: 237" />
+						<node id="238" label="Romlig, territoriell planlegging: 238" />
+					</isComposedBy>
+				</node>
+				<node id="240" label="Statsvitenskap og organisasjonsteori: 240">
+					<isComposedBy>
+						<node id="241" label="Sammenlignende politikk: 241" />
+						<node id="242" label="Offentlig og privat administrasjon: 242" />
+						<node id="243" label="Internasjonal politikk: 243" />
+					</isComposedBy>
+				</node>
+				<node id="260" label="Psykologi: 260">
+					<isComposedBy>
+						<node id="261" label="Biologisk psykologi: 261" />
+						<node id="262" label="Klinisk psykologi: 262" />
+						<node id="263" label="Sosial- og arbeidspsykologi: 263" />
+						<node id="264" label="Personlighetspsykologi: 264" />
+						<node id="265" label="Utviklingspsykologi: 265" />
+						<node id="267" label="Kognitiv psykologi: 267" />
+						<node id="268" label="Organisasjonspsykologi: 268" />
+						<node id="279" label="Andre psykologiske fag: 279" />
+					</isComposedBy>
+				</node>
+				<node id="280" label="Pedagogiske fag: 280">
+					<isComposedBy>
+						<node id="281" label="Allmennpedagogikk: 281" />
+						<node id="282" label="Spesialpedagogikk: 282" />
+						<node id="283" label="Fagdidaktikk: 283" />
+						<node id="289" label="Andre pedagogiske fag: 289" />
+					</isComposedBy>
+				</node>
+				<node id="320" label="Biblioteks- og informasjonsvitenskap: 320">
+					<isComposedBy>
+						<node id="321" label="Informasjons- og kommunikasjonssystemer: 321" />
+						<node id="322" label="Informasjonspolitikk: 322" />
+						<node id="323" label="Kunnskapsgjenfinning og organisering: 323" />
+						<node id="324" label="Bibliometri: 324" />
+						<node id="325" label="Dokumentasjonsvitenskap: 325" />
+						<node id="326" label="Arkivistikk: 326" />
+					</isComposedBy>
+				</node>
+				<node id="330" label="Samfunnsvitenskapelige idrettsfag: 330">
+					<isComposedBy>
+						<node id="331" label="Integreringsfag: 331" />
+						<node id="332" label="Aktivitetslære: 332" />
+						<node id="333" label="Idrettspedagogikk og -psykologi: 333" />
+						<node id="339" label="Andre idrettsfag: 339" />
+					</isComposedBy>
+				</node>
+				<node id="340" label="Rettsvitenskap: 340">
+					<isComposedBy>
+						<node id="341" label="Allmenn rettsvitenskap: 341" />
+						<node id="342" label="Privatrett: 342" />
+						<node id="343" label="Offentlig rett: 343" />
+						<node id="344" label="Folkerett: 344" />
+						<node id="346" label="Rettsinformatikk: 346" />
+						<node id="347" label="Miljørett: 347" />
+						<node id="348" label="Fiskerirett: 348" />
+						<node id="349" label="Andre rettsvitenskapelige fag: 349" />
+					</isComposedBy>
+				</node>
+				<node id="220" label="Sosiologi: 220" />
+				<node id="250" label="Sosialantropologi: 250" />
+				<node id="290" label="Samfunnsgeografi: 290" />
+				<node id="300" label="Demografi: 300" />
+				<node id="310" label="Medievitenskap og journalistikk: 310" />
+				<node id="350" label="Kriminologi: 350" />
+				<node id="360" label="Sosialt arbeid: 360" />
+				<node id="370" label="Kvinne- og kjønnsstudier: 370" />
+			</isComposedBy>
+		</node>
+		
+		<node id="400" label="Matematikk og Naturvitenskap: 400">
+			<isComposedBy>
+				<node id="410" label="Matematikk: 410">
+					<isComposedBy>
+						<node id="411" label="Analyse: 411" />
+						<node id="412" label="Statistikk: 412" />
+						<node id="413" label="Anvendt matematikk: 413" />
+						<node id="414" label="Algebra/algebraisk analyse: 414" />
+						<node id="415" label="Topologi/geometri: 415" />
+						<node id="416" label="Logikk: 416" />
+						<node id="417" label="Forsikringsmatematikk og risikoanalyse: 417" />
+					</isComposedBy>
+				</node>
+				<node id="420" label="Informasjons- og kommunikasjonsvitenskap: 420">
+					<isComposedBy>
+						<node id="421" label="Teoretisk databehandling, programmeringsspråk og -teori: 421" />
+						<node id="422" label="Algoritmer og beregnbarhetsteori: 422" />
+						<node id="423" label="Kommunikasjon og distribuerte systemer: 423" />
+						<node id="424" label="Sikkerhet og sårbarhet: 424" />
+						<node id="425" label="Kunnskapsbaserte systemer: 425" />
+						<node id="426" label="Systemutvikling og – arbeid: 426" />
+						<node id="427" label="Matematisk modellering og numeriske metoder: 427" />
+						<node id="428" label="Databaser og multimediasystemer: 428" />
+						<node id="429" label="Simulering, visualisering, signalbehandling, bildeanalyse: 429" />
+					</isComposedBy>
+				</node>
+				<node id="430" label="Fysikk: 430" >
+					<isComposedBy>
+						<node id="431" label="Kjerne- og elementærpartikkelfysikk: 431" />
+						<node id="433" label="Atomfysikk, molekylfysikk: 433" />
+						<node id="434" label="Elektromagnetisme, akustikk, optikk: 434" />
+						<node id="435" label="Elektronikk: 435" />
+						<node id="436" label="Kondenserte fasers fysikk: 436" />
+						<node id="437" label="Rom- og plasmafysikk: 437" />
+						<node id="438" label="Astrofysikk, astronomi: 438" />
+					</isComposedBy>
+				</node>
+				<node id="440" label="Kjemi: 440">
+					<isComposedBy>
+						<node id="441" label="Organisk kjemi: 441" />
+						<node id="442" label="Uorganisk kjemi: 442" />
+						<node id="443" label="Fysikalsk kjemi: 443" />
+						<node id="444" label="Teoretisk kjemi, kvantekjemi: 444" />
+						<node id="445" label="Analytisk kjemi: 445" />
+						<node id="446" label="Miljøkjemi, naturmiljøkjemi: 446" />
+						<node id="447" label="Kjernekjemi: 447" />
+						<node id="448" label="Legemiddelkjemi: 448" />
+					</isComposedBy>
+				</node>
+				<node id="450" label="Geofag: 450">
+					<isComposedBy>
+						<node id="451" label="Faste jords fysikk: 451" />
+						<node id="452" label="Oseanografi: 452" />
+						<node id="453" label="Meteorologi: 453" />
+						<node id="454" label="Hydrologi: 454" />
+						<node id="455" label="Naturgeografi: 455" />
+						<node id="456" label="Sedimentologi: 456" />
+						<node id="461" label="Stratigrafi og paleontologi: 461" />
+						<node id="462" label="Mineralogi, petrologi, geokjemi: 462" />
+						<node id="463" label="Tektonikk: 463" />
+						<node id="464" label="Petroleumsgeologi og -geofysikk: 464" />
+						<node id="465" label="Kvartærgeologi, glasiologi: 465" />
+						<node id="466" label="Marin geologi: 466" />
+						<node id="467" label="Hydrogeologi: 467" />
+						<node id="468" label="Geometrikk: 468" />
+						<node id="469" label="Andre geofag: 469" />
+					</isComposedBy>
+				</node>
+				<node id="470" label="Basale biofag: 470">
+					<isComposedBy>
+						<node id="471" label="Cellebiologi: 471" />
+						<node id="472" label="Generell mikrobiologi: 472" />
+						<node id="473" label="Molekylærbiologi: 473" />
+						<node id="474" label="Genetikk og genomikk: 474" />
+						<node id="475" label="Bioinformatikk: 475" />
+						<node id="476" label="Biokjemi: 476" />
+						<node id="477" label="Biofysikk: 477" />
+						<node id="478" label="Generell immunologi: 478" />
+					</isComposedBy>
+				</node>
+				<node id="480" label="Zoologiske og botaniske fag: 480">
+					<isComposedBy>
+						<node id="481" label="Zoologisk anatomi: 481" />
+						<node id="482" label="Embryologi: 482" />
+						<node id="483" label="Zoofysiologi og komparativ fysiologi: 483" />
+						<node id="484" label="Parasittologi: 484" />
+						<node id="485" label="Etologi: 485" />
+						<node id="486" label="Zoogeografi: 486" />
+						<node id="487" label="Systematisk zoologi: 487" />
+						<node id="488" label="Økologi: 488" />
+						<node id="489" label="Økotoksikologi: 489" />
+						<node id="491" label="Planteanatomi: 491" />
+						<node id="492" label="Plantefysiologi: 492" />
+						<node id="493" label="Systematisk botanikk: 493" />
+						<node id="495" label="Vegetasjonshistorie: 495" />
+						<node id="496" label="Plantegeografi: 496" />
+						<node id="497" label="Marinbiologi: 497" />
+						<node id="498" label="Limnologi: 498" />
+					</isComposedBy>
+				</node>
+			</isComposedBy>
+		</node>
+		<node id="500" label="Teknologi: 500">
+			<isComposedBy>
+				<node id="510" label="Berg‑ og petroleumsfag: 510">
+					<isComposedBy>
+						<node id="511" label="Bergteknologi: 511" />
+						<node id="512" label="Petroleumsteknologi: 512" />
+						<node id="513" label="Geoteknikk: 513" />
+						<node id="519" label="Andre berg‑ og petroleumsfagg: 519" />
+					</isComposedBy>
+				</node>
+				<node id="520" label="Materialteknologi: 520">
+					<isComposedBy>
+						<node id="521" label="Metallurgi: 521" />
+						<node id="522" label="Funksjonelle materialer: 522" />
+						<node id="523" label="Plast- og  komposittmaterialer: 523" />
+						<node id="525" label="Bygningsmaterialer: 525" />
+						<node id="529" label="Annen materialteknologi: 529" />
+					</isComposedBy>
+				</node>
+				<node id="530" label="Bygningsfag: 530">
+					<isComposedBy>
+						<node id="531" label="Arkitektur og bygningsteknologi: 531" />
+						<node id="532" label="Bygg-, anleggs-  og transportteknologi: 532" />
+						<node id="533" label="Konstruksjonsteknologi: 533" />
+						<node id="534" label="Kart og oppmåling: 534" />
+						<node id="535" label="Fysisk planlegging: 535" />
+						<node id="537" label="Geoteknologi: 537" />
+						<node id="538" label="Hydroteknologi: 538" />
+					</isComposedBy>
+				</node>
+				<node id="540" label="Elektrotekniske fag: 540">
+					<isComposedBy>
+						<node id="541" label="Elektronikk: 541" />
+						<node id="542" label="Elkraft: 542" />
+						<node id="549" label="Andre elektrotekniske fag: 549" />
+					</isComposedBy>
+				</node>
+				<node id="550" label="Informasjons- og kommunikasjonsteknologi: 550">
+					<isComposedBy>
+						<node id="551" label="Datateknologi: 551" />
+						<node id="552" label="Telekommunikasjon: 552" />
+						<node id="553" label="Teknisk kybernetikk: 553" />
+						<node id="555" label="Geografiske informasjonssystemer: 555" />
+						<node id="559" label="Annen informasjonsteknologi: 559" />
+					</isComposedBy>
+				</node>
+				<node id="560" label="Kjemisk teknologi: 560">
+					<isComposedBy>
+						<node id="561" label="Elektrokjemi: 561" />
+						<node id="562" label="Kjemisk prosessteknologi: 562" />
+						<node id="563" label="Kjemiteknikk: 563" />
+						<node id="568" label="Farmasøytisk formulering og teknologi: 568" />
+						<node id="569" label="Annen kjemisk teknologi: 569" />
+					</isComposedBy>
+				</node>
+				<node id="570" label="Maskinfag: 570">
+					<isComposedBy>
+						<node id="571" label="Maskinkonstruksjon og materialteknologi: 571" />
+						<node id="572" label="Produksjon og driftsteknologi: 572" />
+						<node id="573" label="Maskinteknisk energi- og miljøteknologi: 573" />
+						<node id="574" label="Mekaniske og strømningstekniske fag: 574" />
+						<node id="579" label="Andre maskinfag: 579" />
+					</isComposedBy>
+				</node>
+				<node id="580" label="Marin teknologi: 580" >
+					<isComposedBy>
+						<node id="581" label="Offshoreteknologi: 581" />
+						<node id="582" label="Skipsteknologi: 582" />
+						<node id="589" label="Annen marin teknologi: 589" />
+					</isComposedBy>
+				</node>
+				<node id="590" label="Bioteknologi: 590" />
+				<node id="600" label="Næringsmiddelteknologi: 600" />
+				<node id="610" label="Miljøteknologi: 610" />
+				<node id="620" label="Medisinsk teknologi: 620" />
+				<node id="630" label="Nanoteknologi: 630" />
+				<node id="640" label="Industri- og produktdesign: 640" />
+			</isComposedBy>
+		</node>
+		<node id="700" label="Medisinske Fag: 700">
+			<isComposedBy>
+				<node id="710" label="Basale medisinske, odontologiske og veterinærmedisinske fag: 710">
+					<isComposedBy>
+						<node id="711" label="Medisinsk molekylærbiologi: 711" />
+						<node id="714" label="Medisinsk genetikk: 714" />
+						<node id="715" label="Medisinsk mikrobiologi: 715" />
+						<node id="716" label="Medisinsk immunologi: 716" />
+						<node id="717" label="Anatomi, fysisk antropologi: 717" />
+						<node id="718" label="Human og veterinærmedisinsk fysiologi: 718" />
+						<node id="719" label="Generell patologi, patologisk anatomi: 719" />
+						<node id="720" label="Rettsmedisin, rettsodontologi: 720" />
+						<node id="721" label="Patofysiologi: 721" />
+						<node id="725" label="Klinisk kjemi: 725" />
+						<node id="726" label="Medisinsk biokjemi: 726" />
+						<node id="728" label="Farmakologi: 728" />
+						<node id="730" label="Toksikologi: 730" />
+						<node id="736" label="Biofarmasi: 736" />
+						<node id="738" label="Farmakognosi: 738" />
+						<node id="739" label="Klinisk farmakologi: 739" />
+					</isComposedBy>
+				</node>
+				<node id="750" label="Klinisk medisinske fag: 750" >
+					<isComposedBy>
+						<node id="751" label="Allmennmedisin: 751" />
+						<node id="752" label="Nevrologi: 752" />
+						<node id="753" label="Dermatologi og venerologi: 753" />
+						<node id="754" label="Oftalmologi: 754" />
+						<node id="755" label="Otorhinolaryngologi: 755" />
+						<node id="756" label="Gynekologi og obstetrikk: 756" />
+						<node id="757" label="Psykiatri, barnepsykiatri: 757" />
+						<node id="758" label="Rettspsykiatri: 758" />
+						<node id="759" label="Reumatologi: 759" />
+						<node id="760" label="Pediatri: 760" />
+						<node id="761" label="Tropemedisin: 761" />
+						<node id="762" label="Onkologi: 762" />
+						<node id="763" label="Radiologi og bildediagnostikk: 763" />
+						<node id="764" label="Fysikalsk medisin og rehabilitering: 764" />
+						<node id="765" label="Anestesiologi: 765" />
+						<node id="770" label="Generell indremedisin: 770" />
+						<node id="771" label="Kardiologi: 771" />
+						<node id="772" label="Nefrologi, urologi: 772" />
+						<node id="773" label="Gasteroenterologi: 773" />
+						<node id="774" label="Endokrinologi: 774" />
+						<node id="775" label="Hematologi: 775" />
+						<node id="776" label="Infeksjonsmedisin: 776" />
+						<node id="777" label="Lungesykdommer: 777" />
+						<node id="778" label="Geriatri: 778" />
+						<node id="780" label="Generell kirurgi: 780" />
+						<node id="781" label="Gasteroenterologisk kirurgi: 781" />
+						<node id="782" label="Kar- og thoraxkirurgi: 782" />
+						<node id="783" label="Traumatologi: 783" />
+						<node id="784" label="Ortopedisk kirurgi: 784" />
+						<node id="785" label="Plastisk kirurgi: 785" />
+						<node id="786" label="Nevrokirurgi: 786" />
+						<node id="787" label="Kjevekirurgi: 787" />
+						<node id="788" label="Endokrin kirurgi: 788" />
+						<node id="799" label="Andre klinisk medisinske fag: 799" />
+					</isComposedBy>
+				</node>
+				<node id="800" label="Helsefag: 800">
+					<isComposedBy>
+						<node id="801" label="Samfunnsmedisin, sosialmedisin: 801" />
+						<node id="802" label="Samfunnsodontologi: 802" />
+						<node id="803" label="Epidemiologi medisinsk og odontologisk statistikk: 803" />
+						<node id="804" label="Forebyggende medisin: 804" />
+						<node id="805" label="Medisinsk/odontologisk etikk, atferdsfag, historie: 805" />
+						<node id="806" label="Helsetjeneste- og helseadministrasjonsforskning: 806" />
+						<node id="807" label="Fysioterapi: 807" />
+						<node id="808" label="Sykepleievitenskap: 808" />
+						<node id="809" label="Yrkesmedisin: 809" />
+						<node id="810" label="Bedriftsmedisin: 810" />
+						<node id="811" label="Ernæring: 811" />
+						<node id="812" label="Samfunnsfarmasi: 812" />
+						<node id="813" label="Næringsmiddelhygiene: 813" />
+						<node id="829" label="Andre helsefag: 829" />
+					</isComposedBy>
+				</node>
+				<node id="830" label="Klinisk odontologiske fag: 830" >
+					<isComposedBy>
+						<node id="831" label="Konserverende tannpleie: 831" />
+						<node id="832" label="Protetikk og bitt funksjon: 832" />
+						<node id="833" label="Kjeveortopedi: 833" />
+						<node id="834" label="Barnetannpleie og kariesprofylakse: 834" />
+						<node id="835" label="Oral kirurgi: 835" />
+						<node id="835" label="Oral medisin: 835" />
+						<node id="836" label="Oral radiologi: 836" />
+						<node id="837" label="Periodonti: 837" />
+						<node id="849" label="Andre kliniske odontologiske fag: 849" />
+					</isComposedBy>
+				</node>
+				<node id="850" label="Idrettsmedisinske fag: 850" >
+					<isComposedBy>
+						<node id="851" label="Treningslære: 851" />
+						<node id="852" label="Bevegelseslære: 852" />
+						<node id="853" label="Doping/idrettsfarmakologi: 853" />
+					</isComposedBy>
+				</node>
+			</isComposedBy>
+		</node>
+		<node id="900" label="Landbruks- og Fiskerifag: 900">
+			<isComposedBy>
+				<node id="910" label="Landbruksfag: 910" >
+					<isComposedBy>
+						<node id="911" label="Planteforedling, hagebruk, plantevern, plantepatologi: 911" />
+						<node id="912" label="Husdyravl, oppdrett, forplantning: 912" />
+						<node id="913" label="Jordfag: 913" />
+						<node id="914" label="Naturressursforvaltning: 914" />
+						<node id="915" label="Skogbruk: 915" />
+						<node id="916" label="Landbruksteknologi: 916" />
+						<node id="918" label="Fôring: 918" />
+						<node id="919" label="Andre landbruksfag: 919" />
+					</isComposedBy>
+				</node>
+				<node id="920" label="Fiskerifag: 920" >
+					<isComposedBy>
+						<node id="921" label="Ressursbiologi: 921" />
+						<node id="922" label="Akvakultur: 922" />
+						<node id="923" label="Fiskehelse: 923" />
+						<node id="924" label="Fiskeriteknologi: 924" />
+						<node id="925" label="Fangst: 925" />
+						<node id="929" label="Andre fiskerifag: 929" />
+					</isComposedBy>
+				</node>
+				<node id="950" label="Klinisk veterinærmedisinske fag: 950" >
+					<isComposedBy>
+						<node id="951" label="Reproduksjon: 951" />
+						<node id="952" label="Obstetrikk: 952" />
+						<node id="953" label="Kirurgi: 953" />
+						<node id="954" label="Indremedisin: 954" />
+					</isComposedBy>
+				</node>
+			</isComposedBy>
+		</node>
+	</isComposedBy>
+</node>

dspace/config/crosswalks/QDC.properties

@@ -0,0 +1,80 @@
+#
+# Preliminary mapping of DSpace default metadata elements to
+# the QDC XML schema in
+#  http://dublincore.org/schemas/xmls/qdc/2003/04/02/qualifieddc.xsd
+# (See http://dublincore.org/schemas/xmls/qdc/2003/04/02/dc.xsd
+#  and http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcterms.xsd )
+#
+# See org.dspace.content.crosswwalk.QDCCrosswalk for documentation.
+#
+# Author: Larry Stone
+# Revision: $Revision$
+# Date:     $Date$
+#
+dc.contributor                           = <dc:contributor />
+# No mapping found for these and other commented-out elements:
+# dc.contributor.advisor
+# dc.contributor.author
+# dc.contributor.editor
+# dc.contributor.illustrator
+# dc.contributor.other
+dc.coverage.spatial                      = <dcterms:spatial />
+dc.coverage.temporal                     = <dcterms:temporal />
+dc.creator                               = <dc:creator />
+dc.date                                  = <dc:date />
+dc.date.accessioned                      = <dcterms:dateAccepted />
+dc.date.available                        = <dcterms:available />
+dc.date.copyright                        = <dcterms:dateCopyrighted />
+dc.date.created                          = <dcterms:created />
+dc.date.issued                           = <dcterms:issued />
+dc.date.submitted                        = <dateSubmitted />
+dc.identifier                            = <dc:identifier />
+dc.identifier.citation                   = <dcterms:bibliographicCitation />
+# dc.identifier.govdoc
+# dc.identifier.isbn
+# dc.identifier.issn
+# dc.identifier.sici
+# dc.identifier.ismn
+# dc.identifier.other
+dc.identifier.uri                        = <dc:identifier type="dcterms:URI" />
+dc.description                           = <dc:description />
+dc.description.abstract                  = <dcterms:abstract />
+# dc.description.provenance
+# dc.description.sponsorship
+# dc.description.statementofresponsibility
+dc.description.tableofcontents           = <dcterms:tableOfContents />
+dc.description.uri                       = <dc:description  type="dcterms:URI" />
+dc.format                                = <dc:format />
+dc.format.extent                         = <dcterms:extent />
+dc.format.medium                         = <dcterms:medium />
+# dc.format.mimetype
+dc.language                              = <dc:language />
+dc.language.iso                          = <dc:language type="dcterms:ISO639-2" />
+dc.publisher                             = <dc:publisher />
+dc.relation                              = <dc:relation />
+dc.relation.isformatof                   = <dcterms:isFormatOf />
+dc.relation.ispartof                     = <dcterms:isPartOf />
+# dc.relation.ispartofseries
+dc.relation.haspart                      = <dcterms:hasPart />
+dc.relation.isversionof                  = <dcterms:isVersionOf />
+dc.relation.hasversion                   = <dcterms:hasVersion />
+# dc.relation.isbasedon
+dc.relation.isreferencedby               = <dcterms:isReferencedBy />
+dc.relation.requires                     = <dcterms:requires />
+dc.relation.replaces                     = <dcterms:replaces />
+dc.relation.isreplacedby                 = <dcterms:isReplacedBy />
+dc.relation.uri                          = <dc:relation type="dcterms:URI" />
+dc.rights                                = <dc:relation />
+dc.rights.uri                            = <dc:rights type="dcterms:URI" />
+dc.source                                = <dc:source />
+dc.source.uri                            = <dc:source type="dcterms:URI" />
+dc.subject                               = <dc:subject />
+# dc.subject.classification
+dc.subject.ddc                           = <dc:subject type="dcterms:DDC" />
+dc.subject.lcc                           = <dc:subject type="dcterms:LCC" />
+dc.subject.lcsh                          = <dc:subject type="dcterms:LCSH" />
+dc.subject.mesh                          = <dc:subject type="dcterms:MESH" />
+# dc.subject.other
+dc.title                                 = <dc:title />
+dc.title.alternative                     = <dcterms:alternative />
+dc.type                                  = <dc:type />

dspace/config/crosswalks/mods-submission.xsl

@@ -0,0 +1,364 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:dim="http://www.dspace.org/xmlns/dspace/dim"
+                xmlns:mods="http://www.loc.gov/mods/v3"
+                version="1.0">
+<!--
+                **************************************************
+                MODS-2-DIM  ("DSpace Intermediate Metadata" ~ Dublin Core variant)
+                For a DSpace INGEST Plug-In Crosswalk
+                William Reilly wreilly@mit.edu
+                INCOMPLETE
+                but as Work-In-Progress, should satisfy current project with CSAIL.
+                See: http://cwspace.mit.edu/docs/WorkActivity/Metadata/Crosswalks/QDC-MODS/CSAILQDC-MODSxwalkv1p0.pdf
+                Last modified: November 14, 2005
+http://cwspace.mit.edu/docs/WorkActivity/Metadata/Crosswalks/MODS-2-DIM/CSAILMODS.xml
+http://cwspace.mit.edu/docs/WorkActivity/Metadata/Crosswalks/MODS-2-DIM/MODS-2-DIM.xslt
+http://cwspace.mit.edu/docs/WorkActivity/Metadata/Crosswalks/MODS-2-DIM/CSAIL-DIMfromMODS.xml
+
+ Author:   William Reilly
+ Revision: $Revision$
+ Date:     $Date$
+
+
+     **************************************************
+-->
+
+        <!-- This XSLT file (temporarily, in development)
+[wreilly ~/Documents/CWSpace/WorkActivityLOCAL/Metadata/Crosswalks/MODS-2-DIM ]$MODS-2-DIM.xslt
+
+$ scp MODS-2-DIM.xslt athena.dialup.mit.edu:~/Private/
+
+        See also mods.properties in same directory.
+        e.g. dc.contributor = <mods:name><mods:namePart>%s</mods:namePart></mods:name> | mods:namePart/text()
+-->
+
+        <!-- Source XML:
+                CSAIL example
+                http://cwspace.mit.edu/docs/WorkActivity/Metadata/Crosswalks/QDC-MODS/CSAILQDC-MODSxwalkv1p0.pdf
+
+        Important to See Also: "DCLib (DSpace) to MODS mapping == Dublin Core with Qualifiers==DSpace application"              http://cwspace.mit.edu/docs/WorkActivity/Metadata/Crosswalks/MODSmapping2MB.html
+
+        See Also: e.g.  MODS Sample: "Article in a serial"
+                http://www.loc.gov/standards/mods/v3/modsjournal.xml
+        -->
+                
+        <!-- Target XML:
+                http://wiki.dspace.org/DspaceIntermediateMetadata
+                
+                e.g. <dim:dim xmlns:dim="http://www.dspace.org/xmlns/dspace/dim">
+                <dim:field mdschema="dc" element="title" lang="en_US">CSAIL Title - The Urban Question as a Scale Question</dim:field>
+                <dim:field mdschema="dc" element="contributor" qualifier="author" lang="en_US">Brenner, Neil</dim:field>
+                ...
+        -->
+
+
+        <!-- Dublin Core schema links:
+                        http://dublincore.org/schemas/xmls/qdc/2003/04/02/qualifieddc.xsd
+                        http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcterms.xsd  -->
+
+        <xsl:output indent="yes" method="xml"/>
+        <!-- Unnecessary attribute:
+                xsl:exclude-result-prefixes=""/> -->
+
+
+
+<!-- WR_ Unnecessary, apparently.
+        <xsl:template match="@* | node()">
+                <xsl:copy>
+                        <xsl:apply-templates select="@* | node()"/>
+                </xsl:copy>
+        </xsl:template>
+-->
+        
+<!-- WR_ Unnecessary, apparently.
+        <xsl:template match="/">
+                <xsl:apply-templates/>
+        </xsl:template>
+-->
+
+        <xsl:template match="text()">
+                <!--
+                                Do nothing.
+
+                                Override, effectively, the "Built-In" rule which will
+                                process all text inside elements otherwise not matched by any xsl:template.
+
+                                Note: With this in place, be sure to then provide templates or "value-of"
+                                statements to actually _get_ the (desired) text out to the result document!
+                -->
+        </xsl:template>
+
+
+<!-- **** MODS  mods  [ROOT ELEMENT] ====> DC n/a **** -->
+        <xsl:template match="*[local-name()='mods']">
+                <!-- fwiw, these match approaches work:
+                        <xsl:template match="mods:mods">...
+                        <xsl:template match="*[name()='mods:mods']">...
+                        <xsl:template match="*[local-name()='mods']">...
+                        ...Note that only the latter will work on XML data that does _not_ have
+                        namespace prefixes (e.g. <mods><titleInfo>... vs. <mods:mods><mods:titleInfo>...)
+                -->
+                <xsl:element name="dim:dim">
+
+        <xsl:comment>IMPORTANT NOTE:
+                ****************************************************************************************************
+                THIS "Dspace Intermediate Metadata" ('DIM') IS **NOT** TO BE USED FOR INTERCHANGE WITH OTHER SYSTEMS.
+                ****************************************************************************************************
+                It does NOT pretend to be a standard, interoperable representation of Dublin Core.
+
+                It is expressly used for transformation to and from source metadata XML vocabularies into and out of the DSpace object model.
+
+                See http://wiki.dspace.org/DspaceIntermediateMetadata
+
+                For more on Dublin Core standard schemata, see:
+                        http://dublincore.org/schemas/xmls/qdc/2003/04/02/qualifieddc.xsd
+                        http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcterms.xsd
+
+        </xsl:comment>
+
+
+<!-- WR_ NAMESPACE NOTE
+        Don't "code into" this XSLT the creation of the attribute with the name 'xmlns:dim', to hold the DSpace URI for that namespace.
+        NO: <dim:field mdschema="dc" element="title" lang="en_US" xmlns:dim="http://www.dspace.org/xmlns/dspace/dim">
+        Why not?
+        Because it's an error (or warning, at least), and because the XML/XSLT tools (parsers, processors) will take care of it for you. ("Ta-da!")
+        [fwiw, I tried this on 4 processors: Sablotron, libxslt, Saxon, and Xalan-J (using convenience of TestXSLT http://www.entropy.ch/software/macosx/ ).]
+        -->
+<!-- WR_ Do Not Use (see above note)
+                <xsl:attribute name="xmlns:dim">http://www.dspace.org/xmlns/dspace/dim</xsl:attribute>
+        -->
+                        <xsl:apply-templates/>
+                </xsl:element>
+        </xsl:template>
+
+<!-- **** MODS   titleInfo/title ====> DC title **** -->
+        <xsl:template match="*[local-name()='titleInfo']/*[local-name()='title']">
+                <xsl:element name="dim:field">
+                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                        <xsl:attribute name="element">title</xsl:attribute>
+                        <xsl:attribute name="lang">en_US</xsl:attribute>
+                        <xsl:value-of select="normalize-space(.)"/>
+                </xsl:element>
+        </xsl:template>
+
+
+<!-- **** MODS   titleInfo/subTitle ====> DC title ______ (?) **** -->
+        <!-- TODO No indication re: 'subTitle' from this page:
+                http://cwspace.mit.edu/docs/WorkActivity/Metadata/Crosswalks/MODSmapping2MB.html
+                -->
+        <!-- (Not anticipated from CSAIL.) -->
+<!--
+        <xsl:template match="*[local-name()='titleInfo']/*[local-name()='subTitle']">
+                <xsl:element name="dim:field">
+                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                        <xsl:attribute name="element">title</xsl:attribute>
+                        <xsl:attribute name="qualifier">SUB-TITLE (TODO ?)</xsl:attribute>
+                        <xsl:attribute name="lang">en_US</xsl:attribute>
+                        <xsl:value-of select="normalize-space(.)"/>
+                </xsl:element>
+        </xsl:template>
+-->
+
+<!-- **** MODS   titleInfo/@type="alternative" ====> DC title.alternative **** -->
+        <xsl:template match="*[local-name()='titleInfo'][@type='alternative']">
+                <!-- TODO Three other attribute values:
+                        http://www.loc.gov/standards/mods/mods-outline.html#titleInfo
+                        -->
+                <xsl:element name="dim:field">
+                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                        <xsl:attribute name="element">title</xsl:attribute>
+                        <xsl:attribute name="qualifier">alternative</xsl:attribute>
+                        <xsl:attribute name="lang">en_US</xsl:attribute>
+                        <xsl:value-of select="normalize-space(.)"/>
+                </xsl:element>
+        </xsl:template>
+
+
+
+<!-- **** MODS  name ====> DC  contributor.{role/roleTerm} **** -->
+        <xsl:template match="*[local-name()='name']">
+                <xsl:element name="dim:field">
+                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                        <xsl:attribute name="element">contributor</xsl:attribute>
+                        <!-- Important assumption: That the string value used
+                                in the MODS role/roleTerm is indeed a DC Qualifier.
+                                e.g. contributor.illustrator
+                                (Using this assumption, rather than coding in
+                                a more controlled vocabulary via xsl:choose etc.)
+                                -->
+                        <xsl:attribute name="qualifier"><xsl:value-of select="*[local-name()='role']/*[local-name()='roleTerm']"/></xsl:attribute>
+                        <xsl:attribute name="lang">en_US</xsl:attribute>
+<!-- TODO: Logic (xsl:choose) re: format of names in source XML (e.g. Smith, John; or Fname and Lname in separate elements, etc.) -->
+<!-- Used for CSAIL == simply:
+                        <namePart>Lname, Fname</namePart>
+-->
+                        <xsl:value-of select="*[local-name()='namePart']"/>
+
+<!-- Not Used for CSAIL
+                        <namePart type="family">Lname</namePart> <namePart type="given">Fname</namePart>
+-->
+<!--    (Therefore, not used here)
+                        <xsl:value-of select="*[local-name()='namePart'][@type='given']"/><xsl:text> </xsl:text><xsl:value-of select="*[local-name()='namePart'][@type='family']"/>
+-->
+        </xsl:element>
+</xsl:template>
+ 
+
+<!-- **** MODS   originInfo/dateIssued ====> DC  date.created **** -->
+        <xsl:template match="*[local-name()='originInfo']/*[local-name()='dateIssued']">
+                <xsl:element name="dim:field">
+                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                        <xsl:attribute name="element">date</xsl:attribute>
+                        <xsl:attribute name="qualifier">created</xsl:attribute>
+                        <xsl:attribute name="lang">en_US</xsl:attribute>
+                        <xsl:value-of select="."/>
+                </xsl:element>
+        </xsl:template>
+
+
+<!-- **** MODS   physicalDescription/extent ====> DC  format.extent **** -->
+        <xsl:template match="*[local-name()='physicalDescription']/*[local-name()='extent']">
+                <xsl:element name="dim:field">
+                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                        <xsl:attribute name="element">format</xsl:attribute>                    <xsl:attribute name="qualifier">extent</xsl:attribute>
+                        <xsl:attribute name="lang">en_US</xsl:attribute>
+                        <xsl:value-of select="."/>
+                </xsl:element>
+        </xsl:template>
+
+<!-- **** MODS   abstract  ====> DC  description.abstract **** -->
+        <xsl:template match="*[local-name()='abstract']">
+                <xsl:element name="dim:field">
+                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                        <xsl:attribute name="element">description</xsl:attribute>                       <xsl:attribute name="qualifier">abstract</xsl:attribute>
+                        <xsl:attribute name="lang">en_US</xsl:attribute>
+                        <xsl:value-of select="normalize-space(.)"/>
+                </xsl:element>
+        </xsl:template>
+
+
+<!-- **** MODS   subject/topic ====> DC  subject **** -->
+        <xsl:template match="*[local-name()='subject']/*[local-name()='topic']">
+                <xsl:element name="dim:field">
+                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                        <xsl:attribute name="element">subject</xsl:attribute>                   <xsl:attribute name="lang">en_US</xsl:attribute>
+                        <xsl:value-of select="normalize-space(.)"/>
+                </xsl:element>
+        </xsl:template>
+
+
+<!-- **** MODS   subject/geographic ====> DC  coverage.spatial **** -->
+        <!-- (Not anticipated for CSAIL.) -->
+        <xsl:template match="*[local-name()='subject']/*[local-name()='geographic']">
+                <xsl:element name="dim:field">
+                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                        <xsl:attribute name="element">coverage</xsl:attribute>                                                  <xsl:attribute name="qualifier">spatial</xsl:attribute>
+                        <xsl:attribute name="lang">en_US</xsl:attribute>
+                        <xsl:value-of select="normalize-space(.)"/>
+                </xsl:element>
+        </xsl:template>
+
+<!-- **** MODS   subject/temporal ====> DC  coverage.temporal **** -->
+        <!-- (Not anticipated for CSAIL.) -->
+        <xsl:template match="*[local-name()='subject']/*[local-name()='temporal']">
+                <xsl:element name="dim:field">
+                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                        <xsl:attribute name="element">coverage</xsl:attribute>                                                  <xsl:attribute name="qualifier">temporal</xsl:attribute>
+                        <xsl:attribute name="lang">en_US</xsl:attribute>
+                        <xsl:value-of select="normalize-space(.)"/>
+                </xsl:element>
+        </xsl:template>
+
+
+<!-- **** MODS   relatedItem...    **** -->
+        <!-- NOTE -
+                HAS *TWO* INTERPRETATIONS IN DC:
+                1) DC  identifier.citation
+                MODS [@type='host'] {/part/text}       ====> DC  identifier.citation
+                2) DC  relation.___
+                MODS [@type='____'] {/titleInfo/title} ====> DC  relation.{ series | host | other...}
+        -->
+        <xsl:template match="*[local-name()='relatedItem']">
+                <xsl:choose>
+                        <!-- 1)  DC  identifier.citation  -->
+                        <xsl:when test="./@type='host'  and   *[local-name()='part']/*[local-name()='text']">
+                                <xsl:element name="dim:field">
+                                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                                        <xsl:attribute name="element">identifier</xsl:attribute>
+                                        <xsl:attribute name="qualifier">citation</xsl:attribute>
+                                        <xsl:attribute name="lang">en_US</xsl:attribute>
+                                        <xsl:value-of select="normalize-space(*[local-name()='part']/*[local-name()='text'])"/>
+                                </xsl:element>
+                                <!-- Note: CSAIL Assumption (and for now, generally):
+                                        The bibliographic citation is _not_ parsed further,
+                                        and one single 'text' element will contain it.
+                                        e.g. <text>Journal of Physics, v. 53, no. 9, pp. 34-55, Aug. 15, 2004</text>
+                                        -->
+                        </xsl:when>
+                        <!-- 2)  DC  relation._____  -->
+                        <xsl:otherwise>
+                                <xsl:element name="dim:field">
+                                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                                        <xsl:attribute name="element">relation</xsl:attribute>
+                                        <xsl:choose>
+                                                <xsl:when test="./@type='series'">
+                                                        <xsl:attribute name="qualifier">ispartofseries</xsl:attribute>
+                                                </xsl:when>
+                                                <xsl:when test="./@type='host'">
+                                                        <xsl:attribute name="qualifier">ispartof</xsl:attribute>
+                                                </xsl:when>
+                                                <!-- 10 more... TODO
+http://cwspace.mit.edu/docs/WorkActivity/Metadata/Crosswalks/MODSmapping2MB.html
+                                                http://www.loc.gov/standards/mods/mods-outline.html#relatedItem
+                                                        -->
+                                        </xsl:choose>
+                                        <xsl:attribute name="lang">en_US</xsl:attribute>
+                                        <xsl:value-of select="normalize-space(*[local-name()='titleInfo']/*[local-name()='title'])"/>
+                                </xsl:element>
+                        </xsl:otherwise>
+                </xsl:choose>
+
+        </xsl:template>
+
+
+
+<!-- **** MODS   identifier/@type  ====> DC identifier.other  **** -->
+        <xsl:template match="*[local-name()='identifier']"> <!-- [@type='series']"> -->
+                <xsl:element name="dim:field">
+                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                        <xsl:attribute name="element">identifier</xsl:attribute>
+                        <xsl:choose>
+                                <xsl:when test="./@type='local'">
+                                        <xsl:attribute name="qualifier">other</xsl:attribute>
+                                </xsl:when>
+                                <xsl:when test="./@type='uri'">
+                                        <xsl:attribute name="qualifier">uri</xsl:attribute>
+                                </xsl:when>
+                                <!-- 6 (?) more... TODO
+                                        http://cwspace.mit.edu/docs/WorkActivity/Metadata/Crosswalks/MODSmapping2MB.html
+                                        http://www.loc.gov/standards/mods/mods-outline.html#identifier
+                                        
+                                        (but see also MODS relatedItem[@type="host"]/part/text == identifier.citation)
+                                -->
+                        </xsl:choose>
+                        <xsl:attribute name="lang">en_US</xsl:attribute>
+                        <xsl:value-of select="normalize-space(.)"/>
+                </xsl:element>
+        </xsl:template>
+
+
+<!-- **** MODS   originInfo/publisher  ====> DC  publisher  **** -->
+        <xsl:template match="*[local-name()='originInfo']/*[local-name()='publisher']">
+                <xsl:element name="dim:field">
+                        <xsl:attribute name="mdschema">dc</xsl:attribute>
+                        <xsl:attribute name="element">publisher</xsl:attribute>                 <xsl:attribute name="lang">en_US</xsl:attribute>
+                        <xsl:value-of select="normalize-space(.)"/>
+                </xsl:element>
+        </xsl:template>
+
+
+
+
+</xsl:stylesheet>

dspace/config/crosswalks/mods.properties

@@ -0,0 +1,73 @@
+# Default MODS crosswalk configuration file.  See class
+#  org.dspace.content.crosswalk.ModsCrosswalk for details.
+#
+# Revision: $Revision$
+#
+# Date:     $Date$
+#
+dc.contributor = <mods:name><mods:namePart>%s</mods:namePart></mods:name> | mods:namePart/text()
+dc.contributor.advisor = <mods:name><mods:role><mods:roleTerm type="text">advisor</mods:roleTerm></mods:role><mods:namePart>%s</mods:namePart></mods:name> | mods:namePart/text()
+dc.contributor.author = <mods:name><mods:role><mods:roleTerm type="text">author</mods:roleTerm></mods:role><mods:namePart>%s</mods:namePart></mods:name> | mods:namePart/text()
+dc.contributor.editor = <mods:name><mods:role><mods:roleTerm type="text">editor</mods:roleTerm></mods:role><mods:namePart>%s</mods:namePart></mods:name> | mods:namePart/text()
+dc.contributor.illustrator = <mods:name><mods:role><mods:roleTerm type="text">illustrator</mods:roleTerm></mods:role><mods:namePart>%s</mods:namePart></mods:name> | mods:namePart/text()
+dc.contributor.other = <mods:name><mods:role><mods:roleTerm type="text">other</mods:roleTerm></mods:role><mods:namePart>%s</mods:namePart></mods:name> | mods:namePart/text()
+dc.coverage.spatial = <mods:subject><mods:geographic>%s</mods:geographic></mods:subject> | mods:geographic/text()
+dc.coverage.temporal = <mods:subject><mods:temporal>%s</mods:temporal></mods:subject> | mods:temporal/text()
+dc.creator = <mods:name><mods:namePart>%s</mods:namePart></mods:name> | mods:namePart/text()
+dc.date = <mods:originInfo><mods:dateOther encoding="iso8601">%s</mods:dateOther></mods:originInfo> | mods:dateOther/text()
+dc.date.accessioned = <mods:extension><mods:dateAccessioned encoding="iso8601">%s</mods:dateAccessioned></mods:extension> | mods:dateAccessioned/text()
+dc.date.available = <mods:extension><mods:dateAvailable encoding="iso8601">%s</mods:dateAvailable></mods:extension> | mods:dateAvailable/text()
+dc.date.copyright = <mods:originInfo><mods:copyrightDate encoding="iso8601">%s</mods:copyrightDate></mods:originInfo> | mods:copyrightDate/text()
+dc.date.created = <mods:originInfo><mods:dateCreated encoding="iso8601">%s</mods:dateCreated></mods:originInfo> | mods:dateCreated/text()
+dc.date.issued = <mods:originInfo><mods:dateIssued encoding="iso8601">%s</mods:dateIssued></mods:originInfo> | mods:dateIssued/text()
+dc.date.submitted = <mods:extension><mods:dateSubmitted encoding="iso8601">%s</mods:dateSubmitted></mods:extension> | mods:dateSubmitted/text()
+dc.description = <mods:note>%s</mods:note> | text()
+dc.description.abstract = <mods:abstract>%s</mods:abstract> | text()
+dc.description.provenance = <mods:note type="provenance">%s</mods:note> | text()
+dc.description.sponsorship = <mods:note type="sponsorship">%s</mods:note> | text()
+dc.description.statementofresponsibility = <mods:note type="statement of responsibility">%s</mods:note> | text()
+dc.description.tableofcontents = <mods:tableOfContents>%s</mods:tableOfContents> | text()
+dc.description.uri = <mods:note xlink:simpleLink="%s">%s</mods:note> | @xlink:simpleLink|text()
+dc.format = <mods:physicalDescription><mods:form>%s</mods:form></mods:physicalDescription> | mods:form/text()
+dc.format.extent = <mods:physicalDescription><mods:extent>%s</mods:extent></mods:physicalDescription> | mods:extent/text()
+dc.format.medium = <mods:physicalDescription><mods:form>%s</mods:form></mods:physicalDescription> | mods:form/text()
+dc.format.mimetype = <mods:physicalDescription><mods:internetMediaType>%s</mods:internetMediaType></mods:physicalDescription> | mods:internetMediaType/text()
+dc.identifier = <mods:identifier>%s</mods:identifier> | text()
+dc.identifier.citation = <mods:relatedItem type="host"><mods:part><mods:text>%s</mods:text></mods:part></mods:relatedItem> | mods:part/mods:text/text()
+dc.identifier.govdoc = <mods:identifier type="govdoc">%s</mods:identifier> | text()
+dc.identifier.isbn = <mods:identifier type="isbn">%s</mods:identifier> | text()
+dc.identifier.ismn = <mods:identifier type="ismn">%s</mods:identifier> | text()
+dc.identifier.issn = <mods:identifier type="issn">%s</mods:identifier> | text()
+dc.identifier.other = <mods:identifier type="local">%s</mods:identifier> | text()
+dc.identifier.sici = <mods:identifier type="sici">%s</mods:identifier> | text()
+dc.identifier.uri = <mods:identifier type="uri">%s</mods:identifier> | text()
+dc.language = <mods:language><mods:languageTerm>%s</mods:languageTerm></mods:language> | mods:languageTerm/text()
+dc.language.iso = <mods:language><mods:languageTerm authority="rfc3066">%s</mods:languageTerm></mods:language> | mods:languageTerm/text()
+dc.publisher = <mods:originInfo><mods:publisher>%s</mods:publisher></mods:originInfo> | mods:publisher/text()
+dc.relation = <mods:relatedItem><mods:titleInfo><mods:title>%s</mods:title></mods:titleInfo></mods:relatedItem> | mods:titleInfo/mods:title/text()
+dc.relation.haspart = <mods:relatedItem type="constituent">%s</mods:relatedItem> | text()
+dc.relation.hasversion = <mods:relatedItem type="otherVersion">%s</mods:relatedItem> | text()
+dc.relation.isbasedon = <mods:relatedItem type="original">%s</mods:relatedItem> | text()
+dc.relation.isformatof = <mods:relatedItem type="otherFormat">%s</mods:relatedItem> | text()
+dc.relation.ispartof = <mods:relatedItem type="host">%s</mods:relatedItem> | text()
+dc.relation.ispartofseries = <mods:relatedItem type="series">%s</mods:relatedItem> | text()
+dc.relation.isreferencedby = <mods:relatedItem type="isReferencedBy">%s</mods:relatedItem> | text()
+dc.relation.isreplacedby = <mods:relatedItem type="succeeding">%s</mods:relatedItem> | text()
+dc.relation.isversionof = <mods:relatedItem type="otherVersion">%s</mods:relatedItem> | text()
+dc.relation.replaces = <mods:relatedItem type="preceding">%s</mods:relatedItem> | text()
+dc.relation.requires = <mods:note type="requires">%s</mods:note> | text()
+dc.relation.uri = <mods:relatedItem><mods:location><mods:url>%s</mods:url></mods:location></mods:relatedItem> | mods:location/mods:url/text()
+dc.rights = <mods:accessCondition type="useAndReproducation">%s</mods:accessCondition> | text()
+dc.rights.uri = <mods:accessCondition xlink:simpleLink="%s">%s</mods:accessCondition> | @xlink:simpleLink|text()
+dc.source = <mods:relatedItem type="original">%s</mods:relatedItem> | text()
+dc.source.uri = <mods:relatedItem type="original" xlink:simpleLink="%s">%s</mods:relatedItem> | @xlink:simpleLink|text()
+dc.subject = <mods:subject><mods:topic>%s</mods:topic></mods:subject> | mods:topic/text()
+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"><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/crosswalks/sample-crosswalk-DIM2DC.xsl

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:dspace="http://www.dspace.org/xmlns/dspace/dim"
+                xmlns:dc="http://purl.org/dc/elements/1.1/"
+                xmlns:dcterms="http://purl.org/dc/terms/"
+                version="1.0">
+<!--
+        Incomplete proof-of-concept Example of
+        XSLT crosswalk from DIM (DSpace Intermediate Metadata) to
+        Qualified Dublin Core.
+         by William Reilly, aug. 05; mutilated by Larry Stone.
+
+        This is only fit for a simple smoke test of the XSLT-based
+        crosswalk plugin, do not use it for anthing more serious.
+
+ Revision: $Revision$
+ Date:     $Date$
+
+ -->
+
+        <xsl:template match="@* | node()">
+        <!--  XXX don't copy everything by default.
+                <xsl:copy>
+                        <xsl:apply-templates select="@* | node()"/>
+                </xsl:copy>
+         -->
+        </xsl:template>
+
+        <!-- http://wiki.dspace.org/DspaceIntermediateMetadata -->
+        
+                <xsl:template match="dspace:dim">
+                <!-- http://dublincore.org/schemas/xmls/qdc/2003/04/02/qualifieddc.xsd -->
+                <xsl:element name="dcterms:qualifieddc">
+                        <xsl:apply-templates/>
+                </xsl:element>
+        </xsl:template>
+        
+        <xsl:template match="dspace:field[@element ='title']">
+                <!--  http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcterms.xsd  -->
+                <xsl:element name="dc:title">
+                        <xsl:value-of select="text()"/>
+                </xsl:element>
+        </xsl:template>
+        
+        <xsl:template match="dspace:field[@element ='contributor' and @qualifier='author']">
+                <xsl:element name="dc:author">
+                        <xsl:value-of select="text()"/>
+                </xsl:element>
+        </xsl:template>
+        
+        <xsl:template match="dspace:field[@element ='contributor' and @qualifier='illustrator']">
+                <xsl:element name="dc:author">
+                        <xsl:value-of select="text()"/>
+                </xsl:element>
+        </xsl:template>
+</xsl:stylesheet>

dspace/config/dc2mods.cfg

@@ -0,0 +1,71 @@
+# DC Lib -> MODS mapping
+
+# Very simple, might not work
+
+
+contributor.advisor = <mods:name><mods:role><mods:roleTerm type="text">advisor</mods:roleTerm></mods:role><mods:namePart>%s</mods:namePart></mods:name>
+contributor.author = <mods:name><mods:role><mods:roleTerm type="text">author</mods:roleTerm></mods:role><mods:namePart>%s</mods:namePart></mods:name>
+contributor.editor = <mods:name><mods:role><mods:roleTerm type="text">editor</mods:roleTerm></mods:role><mods:namePart>%s</mods:namePart></mods:name>
+contributor.illustrator = <mods:name><mods:role><mods:roleTerm type="text">illustrator</mods:roleTerm></mods:role><mods:namePart>%s</mods:namePart></mods:name>
+contributor.other =  <mods:name><mods:role><mods:roleTerm type="text">other</mods:roleTerm></mods:role><mods:namePart>%s</mods:namePart></mods:name>
+contributor = <mods:name><mods:namePart>%s</mods:namePart></mods:name>
+coverage.spatial = <mods:subject><mods:geographic>%s</mods:geographic></mods:subject>
+coverage.temporal = <mods:subject><mods:temporal>%s</mods:temporal></mods:subject>
+creator = <mods:name><mods:namePart>%s</mods:namePart></mods:name>
+date.accessioned = <mods:extension><mods:dateAccessioned encoding="iso8601">%s</mods:dateAccessioned></mods:extension>
+date.available = <mods:extension><mods:dateAvailable encoding="iso8601">%s</mods:dateAvailable></mods:extension>
+date.copyright = <mods:originInfo><mods:copyrightDate encoding="iso8601">%s</mods:copyrightDate></mods:originInfo>
+date.created = <mods:originInfo><mods:dateCreated encoding="iso8601">%s</mods:dateCreated></mods:originInfo>
+date.issued = <mods:originInfo><mods:dateIssued encoding="iso8601">%s</mods:dateIssued></mods:originInfo>
+date.submitted = <mods:extension><mods:dateSubmitted encoding="iso8601">%s</mods:dateSubmitted></mods:extension>
+date = <mods:originInfo><mods:dateOther encoding="iso8601">%s</mods:dateOther><mods:originInfo>
+description.abstract = <mods:abstract>%s</mods:abstract>
+description.provenance = <mods:note type="provenance">%s</mods:note>
+description.sponsorship = <mods:note type="sponsorship">%s</mods:note>
+description.statementofresponsibility = <mods:note type="statement of responsibility">%s</mods:note>
+description.tableofcontents = <mods:tableOfContents>%s</mods:tableOfContents>
+description.uri = <mods:note xlink:simpleLink="%s">%s</mods:note>
+description = <mods:note>%s</mods:note>
+format.extent = <mods:physicalDescription><mods:extent>%s</mods:extent></mods:physicalDescription>
+format.medium = <mods:physicalDescription><mods:form>%s</mods:form></mods:physicalDescription>
+format.mimetype = <mods:physicalDescription><mods:internetMediaType>%s</mods:internetMediaType></mods:physicalDescription>
+format = <mods:physicalDescription><mods:form>%s</mods:form></mods:physicalDescription>
+identifier.citation = <mods:relatedItem type="host"><mods:part><mods:text>%s</mods:text></mods:part></mods:relatedItem>
+identifier.govdoc = <mods:identifier type="govdoc">%s</mods:identifier>
+identifier.isbn = <mods:identifier type="isbn">%s</mods:identifier>
+identifier.ismn = <mods:identifier type="ismn">%s</mods:identifier>
+identifier.issn = <mods:identifier type="issn">%s</mods:identifier>
+identifier.other = <mods:identifier type="local">%s</mods:identifier>
+identifier.sici = <mods:identifier type="sici">%s</mods:identifier>
+identifier.uri = <mods:identifier type="uri">%s</mods:identifier>
+identifier = <mods:identifier>%s</mods:identifier>
+language.iso = <mods:language><mods:languageTerm authority="rfc3066">%s</mods:languageTerm></mods:language>
+language = <mods:language><mods:languageTerm>%s</mods:languageTerm></mods:language>
+publisher = <mods:originInfo><mods:publisher>%s</mods:publisher></mods:originInfo>
+relation.haspart = <mods:relatedItem type="constituent">%s</mods:relatedItem>
+relation.hasversion = <mods:relatedItem type="otherVersion">%s</mods:relatedItem>
+relation.isbasedon = <mods:relatedItem type="original">%s</mods:relatedItem>
+relation.isformatof = <mods:relatedItem type="otherFormat">%s</mods:relatedItem>
+relation.ispartof = <mods:relatedItem type="host">%s</mods:relatedItem>
+relation.ispartofseries = <mods:relatedItem type="series">%s</mods:relatedItem>
+relation.isreferencedby = <mods:relatedItem type="isReferencedBy">%s</mods:relatedItem>
+relation.isreplacedby = <mods:relatedItem type="succeeding">%s</mods:relatedItem>
+relation.isversionof = <mods:relatedItem type="otherVersion">%s</mods:relatedItem>
+relation.replaces = <mods:relatedItem type="preceding">%s</mods:relatedItem>
+relation.requires = <mods:note type="requires">%s</mods:note>
+relation.uri = <mods:relatedItem><mods:location><mods:url>%s</mods:url></mods:location></mods:relatedItem>
+relation = <mods:relatedItem><mods:title>%s</mods:title></mods:relatedItem>
+rights.uri = <mods:accessCondition xlink:simpleLink="%s">%s</mods:accessCondition>
+rights = <mods:accessCondition type="useAndReproducation">%s</mods:accessCondition>
+source.uri = <mods:relatedItem type="original" xlink:simpleLink="%s">%s</mods:relatedItem>
+source = <mods:relatedItem type="original">%s</mods:relatedItem>
+subject.classification = <mods:classification>%s</mods:classification>
+subject.ddc = <mods:classification authority="ddc">%s</mods:classification>
+subject.lcc = <mods:classification authority="lcc">%s</mods:classification>
+subject.lcsh = <mods:subject authority="lcsh">%s</mods:subject>
+subject.mesh = <mods:subject authority="mesh">%s</mods:subject>
+subject.other = <mods:subject authority="local">%s</mods:subject>
+subject = <mods:subject><mods:topic>%s</mods:topic></mods:subject>
+title.alternative = <mods:titleInfo type="alternative">%s</mods:titleInfo>
+title = <mods:titleInfo>%s</mods:titleInfo>
+type = <mods:genre>%s</mods:genre>

dspace/config/default.license

@@ -1,19 +1,18 @@
-NOTE: This is the default license that MIT requires all submitters to grant.
-It is provided for informational purposes only.
+NOTE: PLACE YOUR OWN LICENSE HERE
+This sample license is provided for informational purposes only.
 
 NON-EXCLUSIVE DISTRIBUTION LICENSE
 
 By signing and submitting this license, you (the author(s) or copyright
-owner) grants to Massachusetts Institute of Technology (MIT) the
-non-exclusive right to reproduce, translate (as defined below), and/or
-distribute your submission (including the abstract) worldwide in print and
-electronic format and in any medium, including but not limited to audio or
-video.
+owner) grants to DSpace University (DSU) the non-exclusive right to reproduce,
+translate (as defined below), and/or distribute your submission (including
+the abstract) worldwide in print and electronic format and in any medium,
+including but not limited to audio or video.
 
-You agree that MIT may, without changing the content, translate the
+You agree that DSU may, without changing the content, translate the
 submission to any medium or format for the purpose of preservation.
 
-You also agree that MIT may keep more than one copy of this submission for
+You also agree that DSU may keep more than one copy of this submission for
 purposes of security, back-up and preservation.
 
 You represent that the submission is your original work, and that you have
@@ -23,15 +22,15 @@ anyone's copyright.
 
 If the submission contains material for which you do not hold copyright,
 you represent that you have obtained the unrestricted permission of the
-copyright owner to grant MIT the rights required by this license, and that
+copyright owner to grant DSU the rights required by this license, and that
 such third-party owned material is clearly identified and acknowledged
 within the text or content of the submission.
 
 IF THE SUBMISSION IS BASED UPON WORK THAT HAS BEEN SPONSORED OR SUPPORTED
-BY AN AGENCY OR ORGANIZATION OTHER THAN MIT, YOU REPRESENT THAT YOU HAVE
+BY AN AGENCY OR ORGANIZATION OTHER THAN DSU, YOU REPRESENT THAT YOU HAVE
 FULFILLED ANY RIGHT OF REVIEW OR OTHER OBLIGATIONS REQUIRED BY SUCH
 CONTRACT OR AGREEMENT.
 
-MIT will clearly identify your name(s) as the author(s) or owner(s) of the
+DSU will clearly identify your name(s) as the author(s) or owner(s) of the
 submission, and will not make any alteration, other than as allowed by this
 license, to your submission.

dspace/config/dspace.cfg

@@ -11,10 +11,10 @@
 # DSpace installation directory
 dspace.dir = /dspace
 
-# DSpace base URL
-dspace.url = https://dspace.myu.edu
+# DSpace base URL.  Include port number etc., but NOT trailing slash
+dspace.url = http://dspace.myu.edu:8080/dspace
 
-# DSpace host name - should match base URL
+# DSpace host name - should match base URL.  Do not include port number
 dspace.hostname = dspace.myu.edu
 
 # Name of the site
@@ -26,15 +26,19 @@ dspace.name = DSpace at My University
 # Comment out any lines corresponding to files you don't need, so they
 # don't get copied
 
-config.template.apache13.conf = /dspace/config/httpd.conf
-config.template.log4j.properties = /dspace/config/log4j.properties
-config.template.log4j-handle-plugin.properties = /dspace/config/log4j-handle-plugin.properties
-config.template.oaicat.properties = /dspace/config/oaicat.properties
-config.template.oai-web.xml = /dspace/oai/WEB-INF/web.xml
+# Example Apache HTTPD configuration
+# config.template.apache13.conf = ${dspace.dir}/config/httpd.conf
+config.template.log4j.properties = ${dspace.dir}/config/log4j.properties
+config.template.log4j-handle-plugin.properties = ${dspace.dir}/config/log4j-handle-plugin.properties
+config.template.oaicat.properties = ${dspace.dir}/config/oaicat.properties
 
 
 ##### Database settings #####
 
+# Database name ("oracle", or "postgres")
+db.name = postgres
+#db.name = oracle
+
 # URL for connecting to database
 db.url = jdbc:postgresql://localhost:5432/dspace
 
@@ -45,12 +49,29 @@ db.driver = org.postgresql.Driver
 db.username = dspace
 db.password = dspace
 
+# Connection pool parameters
+
+# Maximum number of DB connections in pool
+db.maxconnections = 30
+
+# Maximum time to wait before giving up if all connections in pool are busy (milliseconds)
+db.maxwait = 5000
+
+# Maximum number of idle connections in pool (-1 = unlimited)
+db.maxidle = -1
+
+# Determine if prepared statement should be cached. (default is true)
+db.statementpool = true
 
 ##### Email settings ######
 
 # SMTP mail server
 mail.server=smtp.myu.edu
 
+# SMTP mail server authentication username and password (if required)
+# mail.server.username = myusername
+# mail.server.password = mypassword
+
 # From address for mail
 mail.from.address = dspace-noreply@myu.edu
 
@@ -67,7 +88,7 @@ mail.admin = dspace-help@myu.edu
 ##### File Storage ######
 
 # Asset (bitstream) store number 0 (zero)
-assetstore.dir = /dspace/assetstore
+assetstore.dir = ${dspace.dir}/assetstore
 
 # Specify extra asset stores like this, counting from 1 upwards:
 # assetstore.dir.1 = /second/assetstore
@@ -77,47 +98,275 @@ assetstore.dir = /dspace/assetstore
 # The default is 0 (zero) which corresponds to the 'assetstore.dir' above
 # assetstore.incoming = 1
 
-# Directory for history serializations
-history.dir = /dspace/history
 
-# Where to put search index files
-search.dir = /dspace/search
+##### SRB File Storage #####
+
+# The same 'assetstore.incoming' property is used to support the use of SRB 
+# (Storage Resource Broker - see http://www.sdsc.edu/srb/) as an _optional_ 
+# replacement of or supplement to conventional file storage. DSpace will work
+# with or without SRB and full backward compatibility is maintained.
+#
+# The 'assetstore.incoming' property is an integer that references where _new_
+# bitstreams will be stored.  The default (say the starting reference) is zero.
+# The value will be used to identify the storage where all new bitstreams will
+# be stored until this number is changed.  This number is stored in the 
+# Bitstream table (store_number column) in the DSpace database, so older 
+# bitstreams that may have been stored when 'asset.incoming' had a different 
+# value can be found.
+#
+# In the simple case in which DSpace uses local (or mounted) storage the
+# number can refer to different directories (or partitions).  This gives DSpace
+# some level of scalability.  The number links to another set of properties
+# 'assetstore.dir', 'assetstore.dir.1' (remember zero is default), 
+# 'assetstore.dir.2', etc., where the values are directories.
+#
+# To support the use of SRB DSpace uses this same scheme but broadened to 
+# support:
+# - using SRB instead of the local filesystem
+# - using the local filesystem (native DSpace)
+# - using a mix of SRB and local filesystem
+#
+# In this broadened use the 'asset.incoming' integer will refer one of the 
+# following storage locations
+# - a local filesystem directory (native DSpace)
+# - a set of SRB account parameters (host, port, zone, domain, username, 
+#	password, home directory, and resource)
+#
+# Should the be any conflict, like '2' refering to a local directory and 
+# to a set of SRB parameters, the program will select the local directory.
+#
+# If SRB is chosen from the first install of DSpace, it is suggested that
+# 'assetstore.dir' (no integer appended) be retained to reference a local
+# directory (as above under File Storage) because build.xml uses this value 
+# to do a mkdir. In this case, 'assetstore.incoming' can be set to 1 (i.e.
+# uncomment the line in File Storage above) and the 'assetstore.dir' will not 
+# be used.
+#
+# Here is an example set of SRB parameters:
+# Assetstore 1 - SRB
+#srb.host.1 = mysrbmcathost.myu.edu
+#srb.port.1 = 5544
+#srb.mcatzone.1 = mysrbzone
+#srb.mdasdomainname.1 = mysrbdomain
+#srb.defaultstorageresource.1 = mydefaultsrbresource
+#srb.username.1 = mysrbuser
+#srb.password.1 = mysrbpassword
+#srb.homedirectory.1 = /mysrbzone/home/mysrbuser.mysrbdomain
+#srb.parentdir.1 = mysrbdspaceassetstore
+#
+# Assetstore n, n+1, ...
+# Follow same pattern as for assetstores above (local or SRB)
+
+
+# Directory for history serializations
+history.dir = ${dspace.dir}/history
 
 # Where to put the logs
-log.dir = /dspace/log
+log.dir = ${dspace.dir}/log
 
 # Where to temporarily store uploaded files
-upload.temp.dir = /tmp
+upload.temp.dir = ${dspace.dir}/upload
 
-# Maximum size of uploaded files in bytes, must be positive
+# Maximum size of uploaded files in bytes, negative setting will result in no limit being set
 # 512Mb
 upload.max = 536870912
 
 
+##### Search settings #####
+
+# Where to put search index files
+search.dir = ${dspace.dir}/search
+
+# Higher values of search.max-clauses will enable prefix searches to work on
+# large repositories
+# search.max-clauses = 2048
+
+# Which Lucene Analyzer implementation to use.  If this is omitted or
+# commented out, the standard DSpace analyzer (designed for English)
+# is used by default.
+# search.analyzer = org.dspace.search.DSAnalyzer
+
+# Chinese analyzer
+# search.analyzer = org.apache.lucene.analysis.cn.ChineseAnalyzer
+
+# Boolean search operator to use, current supported values are OR and AND
+# If this config item is missing or commented out, OR is used
+# AND requires all search terms to be present
+# OR requires one or more search terms to be present
+search.operator = OR
+
+
+###### Statistical Report Configuration Settings ######
+
+# should the stats be publicly available?  should be set to false if you only
+# want administrators to access the stats, or you do not intend to generate
+# any
+report.public = false
+
+# directory where live reports are stored
+report.dir = ${dspace.dir}/reports/
+
+
 ##### Handle settings ######
 
 # CNRI Handle prefix
 handle.prefix = 123456789
 
 # Directory for installing Handle server files
-handle.dir = /dspace/handle-server
+handle.dir = ${dspace.dir}/handle-server
+
+
+#### Stackable Authentication Methods #####
+# Stack of authentication methods
+#  (See org.dspace.eperson.AuthenticationManager)
+plugin.sequence.org.dspace.eperson.AuthenticationMethod = \
+        org.dspace.eperson.PasswordAuthentication
+
+#### Example of configuring X.509 authentication
+#### (to use it, add org.dspace.eperson.X509Authentication to auth stack above)
+
+## method 1, using keystore
+#authentication.x509.keystore.path = /tomcat/conf/keystore
+#authentication.x509.keystore.password = changeit
+
+## method 2, using CA certificate
+#authentication.x509.ca.cert = ${dspace.dir}/config/MyClientCA.pem
+
+## Create e-persons for unknown names in valid certificates?
+#authentication.x509.autoregister = true
 
 
 ##### Web UI Settings ######
 
-# The site authenticator - must implement org.dspace.app.webui.SiteAuthenticator
-webui.site.authenticator = org.dspace.app.webui.SimpleAuthenticator
-
-# Certificate authority
-webui.cert.ca = /dspace/etc/certificate-ca.pem
-
-# If a user presents a valid Web certificate, but does not have an e-person
-# record, should they automatically be given a new e-person record?
-webui.cert.autoregister = true
+## webui.ldap.autoregister ##
+#
+# This will turn LDAP autoregistration on or off.  With this
+# on, a new EPerson object will be created for any user who
+# successfully authenticates against the LDAP server when they
+# first login.  With this setting off, the user
+# must first register to get an EPerson object by
+# entering their ldap username and password and filling out
+# the forms.
+webui.ldap.autoregister = true
 
 # Should the submit UI block submissions marked as theses?
 webui.submit.blocktheses = false
 
+# whether to display thumbnails on browse and search results pages (1.2+)
+webui.browse.thumbnail.show = false
+
+# max dimensions of the browse/search thumbs. Must be <= thumbnail.maxwidth
+# and thumbnail.maxheight. Only need to be set if required to be smaller than
+# dimension of thumbnails generated by mediafilter (1.2+)
+#webui.browse.thumbnail.maxheight = 80
+#webui.browse.thumbnail.maxwidth = 80
+
+# whether to display the thumb against each bitstream (1.2+)
+webui.item.thumbnail.show = true
+
+# where should clicking on a thumbnail from browse/search take the user
+# Only values currently supported are "item" and "bitstream"
+#webui.browse.thumbnail.linkbehaviour = item
+
+#### Settings for Item Preview ####
+webui.preview.enabled = false
+# max dimensions of the preview image
+webui.preview.maxwidth = 600
+webui.preview.maxheight = 600
+# the brand text
+webui.preview.brand = My Institution Name
+# an abbreviated form of the above text, this will be used
+# when the preview image cannot fit the normal text
+webui.preview.brand.abbrev = MyOrg
+# the height of the brand
+webui.preview.brand.height = 20
+# font settings for the brand text
+webui.preview.brand.font = SansSerif
+webui.preview.brand.fontpoint = 12
+#webui.preview.dc = rights
+
+# whether to display collection and community strengths
+webui.strengths.show = false
+
+# whether to display the contents of the licence bundle (often just the deposit
+# licence in standard DSpace installation
+webui.licence_bundle.show = false
+
+# Customise the DC metadata fields to show in the default simple item view.
+# 
+# The form is <schema prefix>.<element>[.<qualifier>|.*][(date)|(link)], ...
+#
+# For example:
+#    dc.title               = Dublin Core element 'title' (unqualified)
+#    dc.title.alternative   = DC element 'title', qualifier 'alternative'
+#    dc.title.*             = All fields with Dublin Core element 'title' 
+#                             (any or no qualifier)
+#    dc.identifier.uri(link) = DC identifier.uri, render as a link
+#    dc.date.issued(date)   = DC date.issued, render as a date
+#
+# If an item has no value for a particular field, it won't be displayed.
+# The name of the field for display will be drawn from the current UI
+# dictionary, using the key:
+#
+# "metadata.<field>"
+#
+# e.g.   "metadata.dc.title"
+#        "metadata.dc.contributor.*" 
+#        "metadata.dc.date.issued"
+#
+#webui.itemdisplay.default = dc.title, dc.title.alternative, dc.contributor.*, \
+#                            dc.subject, dc.date.issued(date), dc.publisher, \
+#                            dc.identifier.citation, dc.relation.ispartofseries, \
+#                            dc.description.abstract, dc.description, \
+#                            dc.identifier.govdoc, dc.identifier.uri(link), \
+#                            dc.identifier.isbn, dc.identifier.issn, \
+#                            dc.identifier.ismn, dc.identifier
+
+# Specify which collections use which views by Handle.
+#
+# webui.itemdisplay.<style>.collections = <collection handle>, ...
+#
+# FIXME: This should be more database-driven
+#
+# webui.itemdisplay.thesis.collections = 123456789/24, 123456789/35
+
+# Customise the DC fields to use in the item listing page.  Elements will be
+# displayed left to right in the order that they are specified here.
+#
+# The form is <schema prefix>.<element>[.<qualifier>|.*][(date)], ...
+#
+# Although not a requirement, it would make sense to include among the listed
+# fields at least the date and title fields as specified by the
+# webui.browse.index.* configuration options below.
+#
+# webui.itemlist.columns = dc.date.issued(date), dc.title, dc.contributor.*
+
+# Set the bindings for the DC browse fields.  These determine which metadata
+# elements are used for browse by date, author, title and subject.  In addition, 
+# these settings will be used to determine the behaviour of the fields on the
+# listing page: dates will be formatted as required, and titles will be links
+# to item metadata pages.  At least the date and title fields ought to be
+# specified in the webui.itemlist.columns parameters.
+#
+# The form is <schema prefix>.<element>[.<qualifier>|.*], ...
+#
+# NOTE: if you make changes to this configuration to an existing DSpace
+# installation you must re-index the system using: 
+#
+# % [dspace]/bin/index-all
+#
+# webui.browse.index.date = dc.date.issued
+# webui.browse.index.author = dc.contributor.*
+# 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 #####
 
@@ -128,5 +377,320 @@ webui.submit.blocktheses = false
 
 ##### Ingest settings #####
 
-# Default language for content of submissions
+# Default language for metadata values
 default.language = en_US
+
+
+##### Media Filter settings #####
+# maximum width and height of generated thumbnails
+thumbnail.maxwidth  80
+thumbnail.maxheight 80
+
+
+##### Fulltext Indexing settings #####
+# Maximum number of terms indexed for a single field in Lucene.
+# Default is 10,000 words - often not enough for full-text indexing.
+# If you change this, you'll need to re-index for the change
+# to take effect on previously added items.
+# -1 = unlimited (Integer.MAX_VALUE)
+search.maxfieldlength = 10000
+
+
+##### Fields to Index for Search #####
+
+# DC metadata elements.qualifiers to be indexed for search
+# format: - search.index.[number] = [search field]:element.qualifier
+#         - * used as wildcard
+
+###      changing these will change your search results,     ###
+###  but will NOT automatically change your search displays  ###
+
+search.index.1 = author:dc.contributor.*
+search.index.2 = author:dc.creator.*
+search.index.3 = title:dc.title.*
+search.index.4 = keyword:dc.subject.*
+search.index.5 = abstract:dc.description.abstract
+search.index.6 = author:dc.description.statementofresponsibility
+search.index.7 = series:dc.relation.ispartofseries
+search.index.8 = abstract:dc.description.tableofcontents
+search.index.9 = mime:dc.format.mimetype
+search.index.10 = sponsor:dc.description.sponsorship
+search.index.11 = identifier:dc.identifier.*
+search.index.12 = language:dc.language.iso
+
+
+#### Creative Commons settings ######
+# are Creative Commons licenses used in submission?
+webui.submit.enable-cc = false
+
+
+#### OAI-PMH settings #####
+# Max response size for DIDL. This is the maximum size in bytes of the files you
+# wish to enclose Base64 encoded in your responses, remember that the base64
+# encoding process uses a lot of memory. We recommend at most 200000 for answers
+# of 30 records each on a 1 Gigabyte machine. Ultimately this will change to a
+# streaming model and remove this restriction. Also please remember to allocate
+# plenty of memory, at least 512 MB to your Tomcat.
+#
+# Optional: DSpace uses 100 records as the limit for the oai responses. You can
+# alter this by changing $DSPACE_SOURCE_DIR/src/org/dspace/app/oai/DSpaceOAICatalog.java to modify the
+# declaration:
+# private final int MAX_RECORDS = 100 to private final int MAX_RECORDS = 30
+# oai.didl.maxresponse = 0
+
+#### Proxy Settings ######
+# uncomment and specify both properties if proxy server required
+# proxy server for external http requests - use regular hostname without port number
+#http.proxy.host =
+
+# port number of proxy server
+#http.proxy.port = 
+
+
+#### LDAP Authentication Configuration Settings ####
+#
+# If LDAP is enabled, 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. 
+#
+# For providing 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 DSpace documentation for more
+# information about how to do this.
+# 
+# It may be necessary to obtain the values of these settings from the
+# LDAP server administrators as LDAP configuration will vary from server
+# to server.
+
+# This setting will enable or disable LDAP authentication in DSpace.
+# With the setting off, users will be required to register and login with
+# their email address.  With this setting on, users will be able to login
+# and register with their LDAP user ids and passwords.
+ldap.enable = false
+
+# This is the url to the institution's ldap server. The /o=myu.edu
+# may or may not be required depending on the LDAP server setup.
+# A server may also require the ldaps:// protocol.
+#ldap.provider_url = ldap://ldap.myu.edu/o=myu.edu
+
+# This is the unique identifier field in the LDAP directory
+# where the username is stored. 
+#ldap.id_field = uid
+
+# This is the object context used when authenticating the
+# user.  It is appended to the ldap.id_field and username. 
+# For example uid=username,ou=people,o=myu.edu.  This must match 
+# the LDAP server configuration.
+#ldap.object_context = ou=people,o=myu.edu
+
+# This is the search context used when looking up a user's
+# LDAP object to retrieve their data for autoregistering. 
+# With ldap.autoregister turned on, when a user authenticates
+# without an EPerson object, a search on the LDAP directory to
+# get their name and email address is initiated so that DSpace 
+# can create a EPerson object for them.  So after we have authenticated against
+# uid=username,ou=people,o=byu.edu we now search in ou=people
+# for filtering on [uid=username].  Often the
+# ldap.search_context is the same as the ldap.object_context
+# parameter.  But again this depends on each individual LDAP server
+# configuration.
+#ldap.search_context = ou=people
+
+# This is the LDAP object field where the user's email address
+# is stored.  "mail" is the default and the most common for
+# LDAP servers.  If the mail field is not found the username
+# will be used as the email address when creating the eperson
+# object.
+#ldap.email_field = mail
+
+# This is the LDAP object field where the user's last name is
+# stored.  "sn" is the default and is the most common for LDAP
+# servers.  If the field is not found the field will be left
+# blank in the new eperson object.
+#ldap.surname_field = sn
+
+# This is the LDAP object field where the user's given names
+# are stored.  This may not be used or set in all LDAP instances.
+# If the field is not found the field will be left blank in the 
+# new eperson object.
+#ldap.givenname_field = givenName
+
+# This is the field where the user's phone number is stored in
+# the LDAP directory.  If the field is not found the field
+# will be left blank in the new eperson object.
+#ldap.phone_field = telephoneNumber
+
+#### Media Filter plugins (through PluginManager) ####
+
+plugin.sequence.org.dspace.app.mediafilter.MediaFilter = \
+    org.dspace.app.mediafilter.PDFFilter, org.dspace.app.mediafilter.HTMLFilter, \
+    org.dspace.app.mediafilter.WordFilter, org.dspace.app.mediafilter.JPEGFilter
+# to enable branded preview: remove last line above, and uncomment 2 lines below
+#   org.dspace.app.mediafilter.WordFilter, org.dspace.app.mediafilter.JPEGFilter, \
+#   org.dspace.app.mediafilter.BrandedPreviewJPEGFilter
+        
+filter.org.dspace.app.mediafilter.PDFFilter.inputFormats = Adobe PDF
+filter.org.dspace.app.mediafilter.HTMLFilter.inputFormats = HTML, Text
+filter.org.dspace.app.mediafilter.WordFilter.inputFormats = Microsoft Word
+filter.org.dspace.app.mediafilter.JPEGFilter.inputFormats = GIF, JPEG, image/png
+filter.org.dspace.app.mediafilter.BrandedPreviewJPEGFilter.inputFormats = GIF, JPEG, image/png
+        
+#### Syndication Feed Settings ######
+# enable syndication feeds - links display on community and collection home pages 
+webui.feed.enable = false
+# number of DSpace items per feed (the most recent submissions)
+webui.feed.items = 4
+# maximum number of feeds in memory cache
+# value of 0 will disable caching
+webui.feed.cache.size = 100
+# number of hours to keep cached feeds before checking currency
+# value of 0 will force a check with each request
+webui.feed.cache.age = 48
+# which syndication formats to offer
+# use one or more (comma-separated) values from list:
+# rss_0.90, rss_0.91, rss_0.92, rss_0.93, rss_0.94, rss_1.0, rss_2.0
+webui.feed.formats = rss_1.0,rss_2.0
+# URLs returned by the feed will point at the global handle server (e.g. http://hdl.handle.net/123456789/1)
+# Set to true to use local server URLs (i.e. http://myserver.myorg/handle/123456789/1)
+webui.feed.localresolve = false
+
+# Customize each single-value field displayed in the
+# feed information for each item.  Each of
+# the below fields takes a *single* metadata field
+#
+# The form is <schema prefix>.<element>[.<qualifier>|.*]
+webui.feed.item.title = dc.title
+webui.feed.item.date = dc.date.issued
+
+# Customise the metadata fields to show in the feed for each item's description.
+# Elements will be displayed in the order that they are specified here.
+#
+# The form is <schema prefix>.<element>[.<qualifier>|.*][(date)], ...
+#
+# Similar to the item display UI, the name of the field for display 
+# in the feed will be drawn from the current UI dictionary, 
+# using the key:
+# "metadata.<field>"
+#
+# e.g.   "metadata.dc.title"
+#        "metadata.dc.contributor.author" 
+#        "metadata.dc.date.issued"
+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
+# Warning: this feature is not compatible with WAI (it requires javascript to function)
+#
+# 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
+
+# check history retention
+checker.retention.default=10y
+checker.retention.CHECKSUM_MATCH=8w
+
+#### Crosswalk and Packager Plugin Settings ####
+
+# Configure table-driven MODS dissemination crosswalk
+#  (add lower-case name for OAI-PMH)
+crosswalk.mods.properties.MODS = crosswalks/mods.properties
+crosswalk.mods.properties.mods = crosswalks/mods.properties
+
+# Configure XSLT-driven submission crosswalk for MODS
+crosswalk.submission.MODS.stylesheet= crosswalks/mods-submission.xsl
+
+# Configure the QDCCrosswalk dissemination plugin for Qualified DC
+#  (add lower-case name for OAI-PMH)
+crosswalk.qdc.namespace.QDC.dc = http://purl.org/dc/elements/1.1/
+crosswalk.qdc.namespace.QDC.dcterms = http://purl.org/dc/terms/
+crosswalk.qdc.schemaLocation.QDC  = \
+  http://purl.org/dc/terms/ http://dublincore.org/schemas/xmls/qdc/2006/01/06/dcterms.xsd \
+  http://purl.org/dc/elements/1.1/ http://dublincore.org/schemas/xmls/qdc/2006/01/06/dc.xsd
+crosswalk.qdc.properties.QDC = crosswalks/QDC.properties
+
+crosswalk.qdc.namespace.qdc.dc = http://purl.org/dc/elements/1.1/
+crosswalk.qdc.namespace.qdc.dcterms = http://purl.org/dc/terms/
+crosswalk.qdc.schemaLocation.qdc  = \
+  http://purl.org/dc/terms/ http://dublincore.org/schemas/xmls/qdc/2006/01/06/dcterms.xsd \
+  http://purl.org/dc/elements/1.1/ http://dublincore.org/schemas/xmls/qdc/2006/01/06/dc.xsd
+crosswalk.qdc.properties.qdc = crosswalks/QDC.properties
+
+# METS ingester configuration:
+# map of metadata type declared in mdWrap to a crosswalk plugin name:
+mets.submission.crosswalk.DC = QDC
+
+# Option to save METS manifest in the item: (default is false)
+mets.submission.preserveManifest = false
+
+# Crosswalk Plugins:
+plugin.named.org.dspace.content.crosswalk.IngestionCrosswalk = \
+  org.dspace.content.crosswalk.PREMISCrosswalk = PREMIS \
+  org.dspace.content.crosswalk.NullIngestionCrosswalk = NIL
+
+plugin.selfnamed.org.dspace.content.crosswalk.IngestionCrosswalk = \
+  org.dspace.content.crosswalk.XSLTIngestionCrosswalk
+
+plugin.named.org.dspace.content.crosswalk.DisseminationCrosswalk = \
+  org.dspace.content.crosswalk.SimpleDCDisseminationCrosswalk = DC \
+  org.dspace.content.crosswalk.SimpleDCDisseminationCrosswalk = dc \
+  org.dspace.content.crosswalk.PREMISCrosswalk = PREMIS \
+  org.dspace.content.crosswalk.METSDisseminationCrosswalk = METS \
+  org.dspace.content.crosswalk.METSDisseminationCrosswalk = mets
+
+plugin.selfnamed.org.dspace.content.crosswalk.DisseminationCrosswalk = \
+  org.dspace.content.crosswalk.MODSDisseminationCrosswalk , \
+  org.dspace.content.crosswalk.XSLTDisseminationCrosswalk, \
+  org.dspace.content.crosswalk.QDCCrosswalk
+
+# Packager Plugins:
+
+plugin.named.org.dspace.content.packager.PackageDisseminator = \
+  org.dspace.content.packager.DSpaceMETSDisseminator = METS
+
+plugin.named.org.dspace.content.packager.PackageIngester = \
+  org.dspace.content.packager.PDFPackager  = Adobe PDF, PDF, \
+  org.dspace.content.packager.DSpaceMETSIngester = METS

dspace/config/dstat.cfg

@@ -0,0 +1,79 @@
+# DSpace information
+
+# the log directory to be analysed
+dspace.log=/u01/dspace-home/stats/testlogs
+
+# actions to place in the general summary
+general.summary=archive_item
+general.summary=view_bitstream
+general.summary=view_item
+general.summary=view_collection
+general.summary=view_community
+general.summary=login
+general.summary=search
+general.summary=reject_licence
+general.summary=oai_request
+
+# words to exclude from the search words report
+exclude.word=the
+exclude.word=of
+exclude.word=what
+exclude.word=and
+exclude.word=in
+exclude.word=on
+exclude.word=to
+exclude.word=as
+exclude.word=for
+exclude.word=were
+exclude.word=be
+exclude.word=his
+exclude.word=all
+exclude.word=or
+
+# search types that DSpace supports which should be excluded from the search
+# words report
+exclude.type=title:
+exclude.type=author:
+exclude.type=keyword:
+exclude.type=indentifier:
+exclude.type=abstract:
+exclude.type=series:
+
+# characters to exclude from the search words report.  These need to be
+# pre-escaped for interpretation by a regular expression engine
+exclude.character=)
+exclude.character="
+exclude.character=(
+exclude.character='
+exclude.character=,
+exclude.character=*
+exclude.character=+
+exclude.character=-
+exclude.character=.
+exclude.character=?
+exclude.character=/
+
+# The item types in the archive that you need number breakdowns on
+item.type=Thesis or Dissertation
+item.type=Preprint
+item.type=Research Paper
+
+# floor values (don't display things that have been activated fewer times
+# than this) for the reports
+item.floor=20
+search.floor=5
+
+# limit the number of lookups of titles and authors to the first X.  Lookup
+# invokes the java environment so has quite an impact on performance.
+item.lookup=10
+
+# do we want to show email addresses, and if not, how do we represent the user
+# data.  We have 3 options: on, alias, off.  Alias distinguishes between
+# individual users without disclosing email addresses.  Note: later we may
+# support an "id" option, which replaces the address with the db id of the
+# eperson account.
+user.email=alias
+
+# the name and url of the service being reported on
+host.name=Edinburgh Research Archive
+host.url=http://www.era.lib.ed.ac.uk/

dspace/config/dstat.map

@@ -0,0 +1,102 @@
+# Log file action to human readable action map file
+
+# FIXME: these are the same action but are spelled differently.  Why?
+reject_license=Licence Rejections
+reject_licence=Licence Rejections
+
+archive_item=Items Archived
+view_bitstream=Bitstream Views
+view_item=Item Views
+view_collection=Collection Views
+view_community=Community Views
+login=User Logins
+search=Searches Performed
+oai_request=OAI Requests
+items_by_author=Browse Items by Author
+browse_author=Browse by Author
+browse_title=Browse by Title
+browse_date=Browse by Date
+update_item=Item Updated
+view_community_list=Community List Views
+update_workspace_item=Workspace Item Views
+update_bitstream=Bitstream Updates
+add_bundle=Bundles Added
+update_workflow_item=Workflow Item Updates
+update_group=EPerson Group Updates
+create_bitstream=Bitstreams Created
+view_mydspace=User Home Page Views
+update_bundle=Bundle Updates
+add_bitstream=Bitstreams Added
+create_bundle=Bundles Created
+update_collection=Collection Updates
+database_error=Database Errors
+view_editcommunities=Community Edits
+invalid_id=Invalid ID Requests
+create_item=Items Created
+view_workflow=Workflow Views
+delete_workspace_item=Workspace Items Deleted
+create_group=EPerson Groups Created
+create_workspace_item=Workspace Items Created
+select_collection=Collection to Submit to Selected
+start_workflow=Workflow Starts
+accept_license=Licences Accepted
+claim_task=Tasks Claimed
+add_item=Items Added
+install_item=Items Installed
+advance_workflow=Workflow Advanced One Stage
+update_eperson=EPerson Record Updated
+delete_bitstream=Bitstreams Deleted
+remove_bitstream=Bitstreams Removed
+remove_bundle=Bundles Removed
+delete_bundle=Bundles Deleted
+sendtoken_register=Registration Tokens Sent
+failed_login=User Login Failures
+update_community=Community Updates
+remove_logo=Logos Removed
+create_eperson=EPerson Accounts Created
+usedtoken_register=Registration Token Used
+oai_error=OAI Error
+set_logo=Logos Uploaded
+logout=User Logouts
+delete_item=Items Deleted
+create_collection=Collections Created
+add_collection=Collections Added
+view_own_submissions=User's Own Submissions Viewed
+unclaim_workflow=Workflow Task Returned to Pool
+edit_workflow_item=Workflow Items Edited
+create_template_item=Item Templates Created
+confirm_removal=Confirmations of Workspace Item Removal
+remove_submission=Submissions Removed
+delete_group=EPerson Groups Deleted
+authorize_error=Authorisation Errors
+return_to_workspace=Workflow Items Rejected to Workspace
+abort_workflow=Workflow Aborted
+subscribe=Subscribe for E-Mail Notification of Collection
+delete_collection=Collections Deleted
+remove_collection=Collections Removed
+view_profile=User Profile Views
+remove_item=Items Removed
+unknown_email=E-Mail Address Unrecognised
+integrity_error=System Integrity Error
+create_community=Communities Created
+upload_error=File Upload Errors
+get_reject_reason=Reason for Workspace Item Rejection Completed
+usedtoken_forgotpw=Forgotten Password Reset
+already_registered=Attempted Re-register of Registered User
+unsubscribe=Unsubscribe from E-Mail Updates
+reject_workflow=Reject Workspace Item from Workflow
+admin_only=Administrator Only Notifications
+error_emailing=Sending E-Mail Error
+sendtoken_forgotpw=Notifications of Forgotten Password
+ERROR=System Error
+search_exception=Lucene Search Exception
+notifyOfArchive=Notification of Archived Item Sent
+delete_community=Communities Deleted
+bad_email=Bad E-Mail Addresses Supplied
+bad_dc=Bad Dublin Core Field Error
+add_subcommunity=Sub Community Added
+remove_subcommunity=Sub Community Removed
+show_feedback_form=Feedback Form Displayed
+create_dc_type=New Dublin Core Type Created
+remove_template_item=Item Template Removed
+withdraw_item=Item Withdrawn

dspace/config/emails/suggest

@@ -0,0 +1,26 @@
+# E-mail sent with the information filled out in a suggest form.
+#
+# Parameters: {0} recipient name
+#             {1} sender name
+#             {2} repository name
+#             {3} item title
+#             {4} item handle URI
+#             {5} item local URL - may be used in lieu of {4} if not using handle server
+#             {6} collection name
+#             {7} sender message 
+# See org.dspace.core.Email for information on the format of this file.
+#
+Subject: An item of interest from DSpace
+
+Hello {0}:
+
+{1} requested we send you this email regarding an item available in {2}.
+
+Title: {3}
+Location: {5}
+In Collection: {6}
+Personal Message: {7}
+
+The DSpace digital repository system captures, stores, indexes, preserves, and distributes digital material.
+For more information, visit www.dspace.org
+

dspace/config/input-forms.xml

@@ -0,0 +1,402 @@
+<?xml version="1.0"?>
+<!DOCTYPE input-forms >
+
+
+<input-forms>
+
+ <!-- The form-map maps collection handles to forms. DSpace does not       -->
+ <!-- require that a collection's name be unique, even within a community .-->
+ <!-- DSpace does however insure that each collection's handle is unique.  -->
+ <!-- Form-map provides the means to associate a unique collection name    -->
+ <!-- with a form. The form-map also provides the special handle "default" -->
+ <!-- (which is never a collection), here mapped to "traditional". Any     -->
+ <!-- collection which does not appear in this map will be associated with -->
+ <!-- the mapping for handle "default".                                    -->
+
+ <form-map>
+   <name-map collection-handle="default" form-name="traditional" />
+ </form-map>
+
+
+ <!-- The form-definitions map lays out the detailed definition of all the -->
+ <!-- submission forms.Each separate form set has a unique name as an      -->
+ <!-- attribute. This name matches one of the names in the form-map. One   -->
+ <!-- named form set has the name "traditional"; as this name suggests,    -->
+ <!-- it is the old style and is also the default, which gets used when    -->
+ <!-- the specified collection has no correspondingly named form set.      -->
+ <!--                                                                      -->
+ <!-- Each form set contains an ordered set of pages; each page defines    -->
+ <!-- one submission metadata entry screen. Each page has an ordered list  -->
+ <!-- of field definitions, Each field definition corresponds to one       -->
+ <!-- metatdata entry (a so-called row), which has a DC element name, a    -->
+ <!-- displayed label, a text string prompt which is called a hint , and   -->
+ <!-- an input-type. Each field also may hold optional elements: DC        -->
+ <!-- qualifier name, a repeatable flag, and a text string whose presence  -->
+ <!-- serves as a 'this field is required' flag.                           -->
+
+ <form-definitions>
+
+   <form name="traditional">
+     <page number="1">
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>contributor</dc-element>
+         <dc-qualifier>author</dc-qualifier>
+         <repeatable>true</repeatable>
+         <label>Authors</label>
+                 <input-type>name</input-type>
+         <hint>Enter the names of the authors of this item below.</hint>
+         <required></required>
+       </field>
+
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>title</dc-element>
+         <dc-qualifier></dc-qualifier>
+         <repeatable>false</repeatable>
+         <label>Title</label>
+         <input-type>onebox</input-type>
+         <hint>Enter the main title of the item.</hint>
+         <required>You must enter a main title for this item.</required>
+       </field>
+
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>title</dc-element>
+         <dc-qualifier>alternative</dc-qualifier>
+         <repeatable>true</repeatable>
+         <label>Other Titles</label>
+         <input-type>onebox</input-type>
+         <hint>If the item has any alternative titles, please enter them below.</hint>
+         <required></required>
+       </field>
+
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>date</dc-element>
+         <dc-qualifier>issued</dc-qualifier>
+         <repeatable>false</repeatable>
+         <label>Date of Issue</label>
+         <input-type>date</input-type>
+         <hint>Please give the date of previous publication or public distribution
+                        below.  You can leave out the day and/or month if they aren't
+                        applicable.</hint>
+         <required>You must enter at least the year.</required>
+       </field>
+
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>publisher</dc-element>
+         <dc-qualifier></dc-qualifier>
+         <repeatable>false</repeatable>
+         <label>Publisher</label>
+         <input-type>onebox</input-type>
+         <hint>Enter the name of the publisher of the previously issued instance of this item.</hint>
+         <required></required>
+       </field>
+
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>identifier</dc-element>
+         <dc-qualifier>citation</dc-qualifier>
+         <repeatable>false</repeatable>
+         <label>Citation</label>
+         <input-type>onebox</input-type>
+         <hint>Enter the standard citation for the previously issued instance of this item.</hint>
+         <required></required>
+       </field>
+
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>relation</dc-element>
+         <dc-qualifier>ispartofseries</dc-qualifier>
+         <repeatable>true</repeatable>
+         <label>Series/Report No.</label>
+         <input-type>twobox</input-type>
+         <hint>Enter the series and number assigned to this item by your community.</hint>
+         <required></required>
+       </field>
+
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>identifier</dc-element>
+         <dc-qualifier></dc-qualifier>
+         <!-- An input-type of qualdrop_value MUST be marked as repeatable -->
+         <repeatable>true</repeatable>
+         <label>Identifiers</label>
+         <input-type value-pairs-name="common_identifiers">qualdrop_value</input-type>
+         <hint>If the item has any identification numbers or codes associated with
+it, please enter the types and the actual numbers or codes below.</hint>
+         <required></required>
+       </field>
+
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>type</dc-element>
+         <dc-qualifier></dc-qualifier>
+         <repeatable>true</repeatable>
+         <label>Type</label>
+         <input-type value-pairs-name="common_types">dropdown</input-type>
+         <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>
+
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>language</dc-element>
+         <dc-qualifier>iso</dc-qualifier>
+         <repeatable>false</repeatable>
+         <label>Language</label>
+         <input-type value-pairs-name="common_iso_languages">dropdown</input-type>
+         <hint>Select the language of the main content of the item.  If the language does not appear in the list below, please select 'Other'.  If the content does not really have a language (for example, if it is a dataset or an image) please select 'N/A'.</hint>
+         <required></required>
+       </field>
+     </page>
+
+     <page number="2">
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>subject</dc-element>
+         <dc-qualifier></dc-qualifier>
+         <!-- An input-type of twobox MUST be marked as repeatable -->
+         <repeatable>true</repeatable>
+         <label>Subject Keywords</label>
+         <input-type>twobox</input-type>
+         <hint> Enter appropriate subject keywords or phrases below. </hint>
+         <required></required>
+         <vocabulary>srsc</vocabulary>
+       </field>
+
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>description</dc-element>
+         <dc-qualifier>abstract</dc-qualifier>
+         <repeatable>false</repeatable>
+         <label>Abstract</label>
+         <input-type>textarea</input-type>
+         <hint> Enter the abstract of the item below. </hint>
+         <required></required>
+       </field>
+
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>description</dc-element>
+         <dc-qualifier>sponsorship</dc-qualifier>
+         <repeatable>false</repeatable>
+         <label>Sponsors</label>
+         <input-type>textarea</input-type>
+         <hint> Enter the names of any sponsors and/or funding codes in the box below. </hint>
+         <required></required>
+       </field>
+
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>description</dc-element>
+         <dc-qualifier></dc-qualifier>
+         <repeatable>false</repeatable>
+         <label>Description</label>
+         <input-type>textarea</input-type>
+         <hint> Enter any other description or comments in this box. </hint>
+         <required></required>
+       </field>
+     </page>
+   </form>
+
+   <form name="one">
+     <page number="1">
+       <field>
+		 <dc-schema>dc</dc-schema>
+         <dc-element>contributor</dc-element>
+         <dc-qualifier>author</dc-qualifier>
+         <repeatable>true</repeatable>
+         <label>One: Authors</label>
+                 <input-type>name</input-type>
+         <hint>Enter the names of the authors of this item below.</hint>
+         <required></required>
+       </field>
+      </page>
+    </form>
+ </form-definitions>
+
+
+ <!-- form-value-pairs populate dropdown and qualdrop-value lists.          -->
+ <!-- The form-value-pairs element holds child elements named 'value-pairs' -->
+ <!-- A 'value-pairs' element has a value-pairs-name and a dc-term          -->
+ <!-- attribute. The dc-term attribute specifies which to which Dublin Core -->
+ <!-- Term this set of value-pairs applies.                                 -->
+ <!--     Current dc-terms are: identifier-pairs, type-pairs, and           -->
+ <!--     language_iso-pairs. The name attribute matches a name             -->
+ <!--     in the form-map, above.                                           -->
+ <!-- A value-pair contains one 'pair' for each value displayed in the list -->
+ <!-- Each pair contains a 'displayed-value' element and a 'stored-value'   -->
+ <!-- element. A UI list displays the displayed-values, but the program     -->
+ <!-- stores the associated stored-values in the database.                  -->
+
+ <form-value-pairs>
+   <value-pairs value-pairs-name="common_identifiers" dc-term="identifier">
+     <pair>
+       <displayed-value>ISSN</displayed-value>
+       <stored-value>issn</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Other</displayed-value>
+       <stored-value>other</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>ISMN</displayed-value>
+       <stored-value>ismn</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Gov't Doc #</displayed-value>
+       <stored-value>govdoc</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>URI</displayed-value>
+       <stored-value>uri</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>ISBN</displayed-value>
+       <stored-value>isbn</stored-value>
+     </pair>
+   </value-pairs>
+
+   <value-pairs value-pairs-name="common_types" dc-term="type">
+     <pair>
+       <displayed-value>Animation</displayed-value>
+       <stored-value>Animation</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Article</displayed-value>
+       <stored-value>Article</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Book</displayed-value>
+       <stored-value>Book</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Book chapter</displayed-value>
+       <stored-value>Book chapter</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Dataset</displayed-value>
+       <stored-value>Dataset</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Learning Object</displayed-value>
+       <stored-value>Learning Object</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Image</displayed-value>
+       <stored-value>Image</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Image, 3-D</displayed-value>
+       <stored-value>Image, 3-D</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Map</displayed-value>
+       <stored-value>Map</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Musical Score</displayed-value>
+       <stored-value>Musical Score</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Plan or blueprint</displayed-value>
+       <stored-value>Plan or blueprint</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Preprint</displayed-value>
+       <stored-value>Preprint</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Presentation</displayed-value>
+       <stored-value>Presentation</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Recording, acoustical</displayed-value>
+       <stored-value>Recording, acoustical</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Recording, musical</displayed-value>
+       <stored-value>Recording, musical</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Recording, oral</displayed-value>
+       <stored-value>Recording, oral</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Software</displayed-value>
+       <stored-value>Software</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Technical Report</displayed-value>
+       <stored-value>Technical Report</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Thesis</displayed-value>
+       <stored-value>Thesis</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Video</displayed-value>
+       <stored-value>Video</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Working Paper</displayed-value>
+       <stored-value>Working Paper</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Other</displayed-value>
+       <stored-value>Other</stored-value>
+     </pair>
+   </value-pairs>
+
+   <!-- default language order: (from dspace 1.2.1)
+        "en_US", "en", "es", "de", "fr", "it", "ja", "zh", "other", ""
+     -->
+   <value-pairs value-pairs-name="common_iso_languages" dc-term="language_iso">
+     <pair>
+       <displayed-value>N/A</displayed-value>
+       <stored-value></stored-value>
+     </pair>
+     <pair>
+       <displayed-value>English (United States)</displayed-value>
+       <stored-value>en_US</stored-value>
+      </pair>
+     <pair>
+       <displayed-value>English</displayed-value>
+       <stored-value>en</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Spanish</displayed-value>
+       <stored-value>es</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>German</displayed-value>
+       <stored-value>de</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>French</displayed-value>
+       <stored-value>fr</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Italian</displayed-value>
+       <stored-value>it</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Japanese</displayed-value>
+       <stored-value>ja</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Chinese</displayed-value>
+       <stored-value>zh</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>(Other)</displayed-value>
+       <stored-value>other</stored-value>
+     </pair>
+   </value-pairs>
+
+    </form-value-pairs>
+
+</input-forms>

dspace/config/news-side.html

@@ -0,0 +1,3 @@
+<h2>This&nbsp;is&nbsp;a&nbsp;default installation of DSpace!</h2>
+<p>It can be extensively configured by installing modified JSPs,
+    and altering the site configuration.</p>

dspace/config/news-top.html

@@ -0,0 +1,3 @@
+<h3>DSpace is Live</h3>
+<p>Welcome to our digital repository of My University research!</p>
+<p>More exciting news to appear here.</p>

dspace/config/registries/bitstream-formats.xml

@@ -94,6 +94,15 @@
     <extension>html</extension>
   </bitstream-type>
 
+  <bitstream-type>
+    <mimetype>text/css</mimetype>
+    <short_description>CSS</short_description>
+    <description>Cascading Style Sheets</description>
+    <support_level>1</support_level>
+    <internal>false</internal>
+    <extension>css</extension>
+  </bitstream-type>
+
   <bitstream-type>
     <mimetype>application/msword</mimetype>
     <short_description>Microsoft Word</short_description>

dspace/config/registries/dublin-core-types.xml

@@ -9,11 +9,12 @@
   -
   - Initial contents for Dublin Core type registry.  Once the registry has
   - been loaded, this file becomes obsolete; the current version of the
-  - registry must be read from the database.  Use org.dspace.administer.DCType.
-  -
+  - registry must be read from the database.
+  - Use org.dspace.content.MetadataSchema, org.dspace.content.MetadataField, org.dspace.content.MetadataValue instead.
   - Omit <qualifier> tags for unqualified elements
   - 
   - <dc-type>
+  -   <schema></schema>
   -   <element></element>
   -   <qualifier></qualifier>
   -   <scope_note></scope_note>
@@ -36,6 +37,15 @@
     <date.created>$Date$</date.created>
     <description>
       $Log$
+      Revision 1.5  2006/10/18 15:38:34  cjuergen
+      (Claudia Juergen)
+      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
+
+      Revision 1.4  2005/11/16 21:40:52  rtansley
+      (Martin Hald, Larry Stone, Robert Tansley)
+      - Support for multiple (flat) metadata schemas
+      NOTE: Still some items to do
+
       Revision 1.3  2002/11/01 13:28:47  rtansley
       Added new bitstream formats.
       Added comments indicating which formats and DC types are needed by the system
@@ -74,12 +84,14 @@
   </dspace-header>
 
   <dc-type>
+	<schema>dc</schema>
     <element>contributor</element>
     <!-- unqualified -->
     <scope_note>A person, organization, or service responsible for the content of the resource.  Catch-all for unspecified contributors.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>contributor</element>
     <qualifier>advisor</qualifier>
     <scope_note>Use primarily for thesis advisor.</scope_note>
@@ -87,48 +99,56 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>contributor</element>
     <qualifier>author</qualifier>
     <scope_note></scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>contributor</element>
     <qualifier>editor</qualifier>
     <scope_note></scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>contributor</element>
     <qualifier>illustrator</qualifier>
     <scope_note></scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>contributor</element>
     <qualifier>other</qualifier>
     <scope_note></scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>coverage</element>
     <qualifier>spatial</qualifier>
     <scope_note>Spatial characteristics of content.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>coverage</element>
     <qualifier>temporal</qualifier>
     <scope_note>Temporal characteristics of content.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>creator</element>
     <!-- unqualified -->
     <scope_note>Do not use; only for harvested metadata.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>date</element>
     <!-- unqualified -->
     <scope_note>Use qualified form if possible.</scope_note>
@@ -136,6 +156,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>date</element>
     <qualifier>accessioned</qualifier>
     <scope_note>Date DSpace takes possession of item.</scope_note>
@@ -143,18 +164,21 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>date</element>
     <qualifier>available</qualifier>
     <scope_note>Date or date range item became available to the public.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>date</element>
     <qualifier>copyright</qualifier>
     <scope_note>Date of copyright.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>date</element>
     <qualifier>created</qualifier>
     <scope_note>Date of creation or manufacture of intellectual content if different from date.issued.</scope_note>
@@ -162,18 +186,21 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>date</element>
     <qualifier>issued</qualifier>
     <scope_note>Date of publication or distribution.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>date</element>
     <qualifier>submitted</qualifier>
     <scope_note>Recommend for theses/dissertations.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>identifier</element>
     <!-- unqualified -->
     <scope_note>Catch-all for unambiguous identifiers not defined by
@@ -183,6 +210,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>identifier</element>
     <qualifier>citation</qualifier>
     <scope_note>Human-readable, standard bibliographic citation 
@@ -191,6 +219,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>identifier</element>
     <qualifier>govdoc</qualifier>
     <scope_note>A government document number</scope_note>
@@ -198,6 +227,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>identifier</element>
     <qualifier>isbn</qualifier>
     <scope_note>International Standard Book Number</scope_note>
@@ -205,12 +235,14 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>identifier</element>
     <qualifier>issn</qualifier>
     <scope_note>International Standard Serial Number</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>identifier</element>
     <qualifier>sici</qualifier>
     <scope_note>Serial Item and Contribution Identifier</scope_note>
@@ -218,6 +250,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>identifier</element>
     <qualifier>ismn</qualifier>
     <scope_note>International Standard Music Number</scope_note>
@@ -225,6 +258,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>identifier</element>
     <qualifier>other</qualifier>
     <scope_note>A known identifier type common to a local collection.</scope_note>
@@ -232,6 +266,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>identifier</element>
     <qualifier>uri</qualifier>
     <scope_note>Uniform Resource Identifier</scope_note>
@@ -239,6 +274,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>description</element>
     <!-- unqualified -->
     <scope_note>Catch-all for any description not defined by qualifiers.</scope_note>
@@ -246,6 +282,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>description</element>
     <qualifier>abstract</qualifier>
     <scope_note>Abstract or summary.</scope_note>
@@ -253,6 +290,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>description</element>
     <qualifier>provenance</qualifier>
     <scope_note>The history of custody of the item since its creation, including any changes successive custodians made to it.</scope_note>
@@ -260,6 +298,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>description</element>
     <qualifier>sponsorship</qualifier>
     <scope_note>Information about sponsoring agencies, individuals, or
@@ -267,18 +306,21 @@
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>description</element>
     <qualifier>statementofresponsibility</qualifier>
     <scope_note>To preserve statement of responsibility from MARC records.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>description</element>
     <qualifier>tableofcontents</qualifier>
     <scope_note>A table of contents for a given item.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>description</element>
     <qualifier>uri</qualifier>
     <scope_note>Uniform Resource Identifier pointing to description of
@@ -287,6 +329,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>format</element>
     <!-- unqualified -->
     <scope_note>Catch-all for any format information not defined by qualifiers.</scope_note>
@@ -294,12 +337,14 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>format</element>
     <qualifier>extent</qualifier>
     <scope_note>Size or duration.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>format</element>
     <qualifier>medium</qualifier>
     <scope_note>Physical medium.</scope_note>
@@ -307,12 +352,14 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>format</element>
     <qualifier>mimetype</qualifier>
     <scope_note>Registered MIME type identifiers.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>language</element>
     <!-- unqualified -->
     <scope_note>Catch-all for non-ISO forms of the language of the
@@ -321,6 +368,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>language</element>
     <qualifier>iso</qualifier>
     <scope_note>Current ISO standard for language of intellectual content, including country codes (e.g. "en_US").</scope_note>
@@ -328,24 +376,28 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>publisher</element>
     <!-- unqualified -->
     <scope_note>Entity responsible for publication, distribution, or imprint.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>relation</element>
     <!-- unqualified -->
     <scope_note>Catch-all for references to other related items.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>relation</element>
     <qualifier>isformatof</qualifier>
     <scope_note>References additional physical form.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>relation</element>
     <qualifier>ispartof</qualifier>
     <scope_note>References physically or logically containing item.</scope_note>
@@ -353,42 +405,49 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>relation</element>
     <qualifier>ispartofseries</qualifier>
     <scope_note>Series name and number within that series, if available.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>relation</element>
     <qualifier>haspart</qualifier>
     <scope_note>References physically or logically contained item.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>relation</element>
     <qualifier>isversionof</qualifier>
     <scope_note>References earlier version.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>relation</element>
     <qualifier>hasversion</qualifier>
     <scope_note>References later version.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>relation</element>
     <qualifier>isbasedon</qualifier>
     <scope_note>References source.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>relation</element>
     <qualifier>isreferencedby</qualifier>
     <scope_note>Pointed to by referenced resource.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>relation</element>
     <qualifier>requires</qualifier>
     <scope_note>Referenced resource is required to support function,
@@ -396,42 +455,49 @@
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>relation</element>
     <qualifier>replaces</qualifier>
     <scope_note>References preceeding item.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>relation</element>
     <qualifier>isreplacedby</qualifier>
     <scope_note>References succeeding item.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>relation</element>
     <qualifier>uri</qualifier>
     <scope_note>References Uniform Resource Identifier for related item.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>rights</element>
     <!-- unqualified -->
     <scope_note>Terms governing use and reproduction.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>rights</element>
     <qualifier>uri</qualifier>
     <scope_note>References terms governing use and reproduction.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>source</element>
     <!-- unqualified -->
     <scope_note>Do not use; only for harvested metadata.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>source</element>
     <qualifier>uri</qualifier>
     <scope_note>Do not use; only for harvested metadata.</scope_note>
@@ -439,12 +505,14 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>subject</element>
     <!-- unqualified -->
     <scope_note>Uncontrolled index term.</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>subject</element>
     <qualifier>classification</qualifier>
     <scope_note>Catch-all for value from local classification system;
@@ -452,30 +520,35 @@
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>subject</element>
     <qualifier>ddc</qualifier>
     <scope_note>Dewey Decimal Classification Number</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>subject</element>
     <qualifier>lcc</qualifier>
     <scope_note>Library of Congress Classification Number</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>subject</element>
     <qualifier>lcsh</qualifier>
     <scope_note>Library of Congress Subject Headings</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>subject</element>
     <qualifier>mesh</qualifier>
     <scope_note>MEdical Subject Headings</scope_note>
   </dc-type>
 
   <dc-type>
+	<schema>dc</schema>
     <element>subject</element>
     <qualifier>other</qualifier>
     <scope_note>Local controlled vocabulary; global vocabularies will receive specific qualifier.</scope_note>
@@ -483,6 +556,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>title</element>
     <!-- unqualified -->
     <scope_note>Title statement/title proper.</scope_note>
@@ -490,6 +564,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>title</element>
     <qualifier>alternative</qualifier>
     <scope_note>Varying (or substitute) form of title proper appearing in item,
@@ -498,6 +573,7 @@
 
   <!-- Used by system: do not remove -->
   <dc-type>
+	<schema>dc</schema>
     <element>type</element>
     <!-- unqualified -->
     <scope_note>Nature or genre of content.</scope_note>

dspace/config/templates/log4j.properties

@@ -6,7 +6,7 @@
 
 ###########################################################################
 #
-# dspace-httpd.conf
+# log4j.properties
 #
 # Version: $Revision$
 #
@@ -61,11 +61,24 @@
 # Set root category priority to INFO and its only appender to A1.
 log4j.rootCategory=INFO, A1
 
-# A1 is set to be a DailyRollingFileAppender.
-log4j.appender.A1=org.apache.log4j.DailyRollingFileAppender
+# A1 is set to be a RollingFileAppender.
+log4j.appender.A1=org.apache.log4j.RollingFileAppender
 log4j.appender.A1.File=@@log.dir@@/dspace.log
-log4j.appender.A1.DatePattern='.'yyyy-MM-dd
+# Roll when log file size is over 1Mb
+log4j.appender.A1.MaxFileSize=1048576
+# Keep up to 500 files around
+log4j.appender.A1.MaxBackupIndex=500
+
 
 # A1 uses PatternLayout.
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
 log4j.appender.A1.layout.ConversionPattern=%d %-5p %c @ %m%n
+
+# A2 is the log for the Checker
+log4j.category.org.dspace.checker=INFO, A2
+log4j.appender.A2=org.apache.log4j.RollingFileAppender
+log4j.appender.A2.File=@@log.dir@@/checker.log
+log4j.appender.A2.layout=org.apache.log4j.PatternLayout
+log4j.appender.A2.layout.ConversionPattern=%m%n
+log4j.appender.A2.MaxFileSize=1048576
+log4j.appender.A2.MaxBackupIndex=500

dspace/config/templates/log4j.xml

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+###########################################################################
+# REMEMBER: ONLY UPDATE THE VERSION IN dspace/config/templates
+# AND THEN RUN dspace/bin/install-configs!
+# DO NOT EDIT THE 'LIVE' VERSION!
+###########################################################################
+
+###########################################################################
+#
+# log4j.xml
+#
+# 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
+# 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.
+#
+###########################################################################
+
+# This is the log4j configuration file for DSpace, writing daily rolling logs
+
+# Text surrounded by two '@' symbols is replaced with the corresponding
+# property from dspace.cfg.  For example:
+#
+# @@dspace.url@@
+#
+# would be replaced with the dspace.url property in dspace.cfg.
+# When /dspace/bin/install-configs is run, this file will be installed in the
+# location specified by the property: config.template.log4j.properties
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration>
+	<!-- Standard DSpace file logger -->
+	<appender name="FILE" class="org.apache.log4j.RollingFileAppender">
+		<param name="File" value="@@log.dir@@/dspace.log" />
+		<param name="MaxFileSize" value="1048576" />
+		<param name="MaxBackupIndex" value="500" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" 
+				value="%d %-5p %c @ %m%n" />
+		</layout>
+		<filter class="org.apache.log4j.varia.LevelRangeFilter">
+			<param name="LevelMin" value="INFO" />
+			<param name="LevelMax" value="FATAL" />
+		</filter>
+	</appender>
+	<!-- Mail adapter, recommended for production systems as it
+	     sends out email when errors level messages occur -->
+	<appender name="EMAIL" class="org.apache.log4j.net.SMTPAppender">
+		<param name="BufferSize" value="512" />
+		<param name="SMTPHost" value="@@mail.server@@" />
+		<param name="From" value="@@mail.from.address@@" />
+		<param name="To" value="@@mail.admin@@" />
+		<param name="Subject" value="[DSpace] Application message" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" 
+				value="[%d{ISO8601}]%n%n%%F:-5L%n%n-5p%n%n%c%n%n%m%n%n" />
+		</layout>
+		<filter class="org.apache.log4j.varia.LevelRangeFilter">
+			<param name="LevelMin" value="ERROR" />
+			<param name="LevelMax" value="FATAL" />
+		</filter>
+	</appender>
+	<!-- Console adapters, useful for development but should not be
+	     used in production.  Standard IDE logging integration with
+	     logging source file and line numbers printed on every statement -->
+	<appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
+		<param name="Target" value="System.out" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" 
+				value="%d{ISO8601} [%F:%L] %-5p &lt;%m&gt; %n" />
+		</layout>
+		<filter class="org.apache.log4j.varia.LevelRangeFilter">
+			<param name="LevelMin" value="INFO" />
+			<param name="LevelMax" value="FATAL" />
+		</filter>
+	</appender>
+	<appender name="STDERR" class="org.apache.log4j.ConsoleAppender">
+		<param name="Target" value="System.err" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" 
+				value="%d{ISO8601} [%F:%L] %-5p &lt;%m&gt; %n" />
+		</layout>
+		<filter class="org.apache.log4j.varia.LevelRangeFilter">
+			<param name="LevelMin" value="WARN" />
+			<param name="LevelMax" value="FATAL" />
+		</filter>
+	</appender>
+	<!-- Example for turning up logging in certain packages -->
+	<logger name="org.apache.sample.package">
+		<level value="DEBUG" />
+	</logger>
+	<!-- Add appenders you want live here -->
+	<root>
+		<level value="all" />
+		<appender-ref ref="FILE" />
+		<!--
+		<appender-ref ref="EMAIL" />
+		<appender-ref ref="STDOUT" />
+		<appender-ref ref="STDERR" />
+		-->
+	</root>
+</log4j:configuration>

dspace/config/templates/oaicat.properties

@@ -28,4 +28,12 @@ Identify.earliestDatestamp=2001-01-01T00:00:00Z
 Identify.deletedRecord=persistent
 
 # List the supported metadataPrefixes along with the class that performs the associated crosswalk
+#Crosswalks.didl=org.dspace.app.oai.DIDLCrosswalk
+#Crosswalks.mets=org.dspace.app.oai.METSCrosswalk
 Crosswalks.oai_dc=org.dspace.app.oai.OAIDCCrosswalk
+# OAI crosswalks that use crosswalk plugins.  The
+# metadataPrefixes must match the name of the plugin
+# for interface org.dspace.content.crosswalk.DisseminationCrosswalk
+# Crosswalks.mods=org.dspace.app.oai.PluginCrosswalk
+# Crosswalks.mets=org.dspace.app.oai.PluginCrosswalk
+# Crosswalks.qdc=org.dspace.app.oai.PluginCrosswalk

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

@@ -0,0 +1,946 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html>
+<head>
+  <title>DSpace System Documentation: Application Layer</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: Application Layer</h1>
+
+  <p><a href="index.html">Back to contents</a></P>
+  <P><a href="architecture.html">Back to architecture overview</a></p>
+
+  <h2><a name="webui" id="webui">Web User Interface</a></h2>
+
+  <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 administrators.</p>
+
+  <h3>Web UI Files</h3>
+
+  <p>The Web UI-related files are located in a variety of directories in the DSpace source tree. Note that as of DSpace version 1.2, the deployment mechanism has changed; the build process creates easy-to-deploy Web application archives (<code>.war</code> files).</p>
+
+  <table>
+    <caption>
+      Locations of Web UI Source Files
+    </caption>
+
+    <tbody>
+      <tr>
+        <th>Location</th>
+
+        <th>Description</th>
+      </tr>
+
+      <tr>
+        <td><code>org.dspace.app.webui</code></td>
+
+        <td>Web UI source files</td>
+      </tr>
+
+      <tr>
+        <td><code>org.dspace.app.webui.filter</code></td>
+
+        <td>Servlet Filters (Servlet 2.3 spec)</td>
+      </tr>
+
+      <tr>
+        <td><code>org.dspace.app.webui.jsptag</code></td>
+
+        <td>Custom JSP tag class files</td>
+      </tr>
+
+      <tr>
+        <td><code>org.dspace.app.webui.servlet</code></td>
+
+        <td>Servlets for main Web UI (controllers)</td>
+      </tr>
+
+      <tr>
+        <td><code>org.dspace.app.webui.servlet.admin</code></td>
+
+        <td>Servlets that comprise the administration part of the Web UI</td>
+      </tr>
+
+      <tr>
+        <td><code>org.dspace.app.webui.util</code></td>
+
+        <td>Miscellaneous classes used by the servlets and filters</td>
+      </tr>
+
+      <tr>
+        <td><code><em>[dspace-source]</em>/jsp</code></td>
+
+        <td>The JSP files</td>
+      </tr>
+
+      <tr>
+        <td><code><em>[dspace-source]</em>/jsp/local</code></td>
+
+        <td>This is where you can place customized versions of JSPs -- see <a href="configure.html#customui">the configuration section</a></td>
+      </tr>
+
+      <tr>
+        <td><code><em>[dspace-source]</em>/jsp/WEB-INF/dspace-tags.tld</code></td>
+
+        <td>Custom DSpace JSP tag descriptor</td>
+      </tr>
+
+      <tr>
+        <td><code><em>[dspace-source]</em>/etc/dspace-web.xml</code></td>
+
+        <td>The Web application deployment descriptor. Before including in the <code>.war</code> file, the text <code>@@dspace.dir@@</code> will be replaced with the DSpace installation directory (referred to as <em>[dspace]</em> elsewhere in this system documentation). This allows the Web application to pick up the DSpace configuration and environment.</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <h3><a name="webui_build" id="webui_build">The Build Process</a></h3>
+
+  <p>The DSpace build process constructs a Web application archive, which is placed in <code><em>[dspace-source]</em>/build/dspace.war</code>. The <code>build_wars</code> Ant target does the work. The process works as follows:</p>
+
+  <ul>
+    <li>All the DSpace source code is compiled.</li>
+
+    <li><code><em>[dspace-source]</em>/etc/dspace-web.xml</code> is copied to <code><em>[dspace-source]</em>/build</code> and the <code>@@dspace.dir@@</code> token inside it replaced with the DSpace installation directory (<code>dspace.dir</code> property from <code>dspace.cfg</code></li>
+
+    <li>The JSPs are all copied to <code><em>[dspace-source]</em>/build/jsp</code></li>
+
+    <li>Customized JSPs from <code><em>[dspace-source]</em>/jsp/local</code> are copied on top of these, thus 'overriding' the default versions</li>
+
+    <li><code><em>[dspace-source]</em>/build/dspace.war</code> is built</li>
+  </ul>
+
+  <p>The contents of <code>dspace.war</code> are:</p>
+
+  <ul>
+    <li>(Top level) -- the JSPs (customized versions from <code><em>[dspace-source]</em>/jsp/local</code> will have overwritten the defaults from the DSpace source distribution)</li>
+
+    <li><code>WEB-INF/classes</code> -- the compiled DSpace classes</li>
+
+    <li><code>WEB-INF/lib</code> -- the third party library JAR files from <code><em>[dspace-source]</em>/lib</code>, minus <code>servlet.jar</code> which will be available as part of Tomcat (or other servlet engine)</li>
+
+    <li><code>WEB-INF/web.xml</code> -- web deployment descriptor, copied from <code><em>[dspace-source]</em>/build/dspace-web.xml</code></li>
+
+    <li><code>WEB-INF/dspace-tags.tld</code> -- tag descriptor</li>
+  </ul>
+
+  <p>Note that this does mean there are multiple copies of the compiled DSpace code and third-party libraries in the system, so care must be taken to ensure that they are all in sync. (The storage overhead is a few megabytes, totally insignificant these days.) In general, when you change any DSpace code or JSP, it's best to do a complete update of both the installation (<code><em>[dspace]</em></code>), and to rebuild and redeploy the Web UI and OAI <code>.war</code> files, by running this in <code><em>[dspace-source]</em></code>:</p>
+  <pre>
+ant -D<em>[dspace]</em>/config/dspace.cfg update
+</pre>
+
+  <p>and then following the instructions that command writes to the console.</p>
+
+  <h3>Servlets and JSPs</h3>
+
+  <p>The Web UI is loosely based around the MVC (model, view, controller) model. The content management API corresponds to the model, the Java Servlets are the controllers, and the JSPs are the views. Interactions take the following basic form:</p>
+
+  <ol>
+    <li>An HTTP request is received from a browser</li>
+
+    <li>The appropriate servlet is invoked, and processes the request by invoking the DSpace business logic layer public API</li>
+
+    <li>Depending on the outcome of the processing, the servlet invokes the appropriate JSP</li>
+
+    <li>The JSP is processed and sent to the browser</li>
+  </ol>
+
+  <p>The reasons for this approach are:</p>
+
+  <ul>
+    <li>All of the processing is done before the JSP is invoked, so any error or problem that occurs does not occur halfway through HTML rendering</li>
+
+    <li>The JSPs contain as little code as possible, so they can be customized without having to delve into Java code too much</li>
+  </ul>
+
+  <p>The <code>org.dspace.app.webui.servlet.LoadDSpaceConfig</code> servlet is always loaded first. This is a very simple servlet that checks the <code>dspace-config</code> context parameter from the DSpace deployment descriptor, and uses it to locate <code>dspace.cfg</code>. It also loads up the Log4j configuration. It's important that this servlet is loaded first, since if another servlet is loaded up, it will cause the system to try and load DSpace and Log4j configurations, neither of which would be found.</p>
+
+  <p>All DSpace servlets are subclasses of the <code>DSpaceServlet</code> class. The <code>DSpaceServlet</code> class handles some basic operations such as creating a DSpace <code>Context</code> object (opening a database connection etc.), authentication and error handling. Instead of overriding the <code>doGet</code> and <code>doPost</code> methods as one normally would for a servlet, DSpace servlets implement <code>doDSGet</code> or <code>doDSPost</code> which have an extra context parameter, and allow the servlet to throw various exceptions that can be handled in a standard way.</p>
+
+  <p>The DSpace servlet processes the contents of the HTTP request. This might involve retrieving the results of a search with a query term, accessing the current user's eperson record, or updating a submission in progress. According to the results of this processing, the servlet must decide which JSP should be displayed. The servlet then fills out the appropriate attributes in the <code>HttpRequest</code> object that represents the HTTP request being processed. This is done by invoking the <code>setAttribute</code> method of the <code>javax.servlet.http.HttpServletRequest</code> object that is passed into the servlet from Tomcat. The servlet then forwards control of the request to the appropriate JSP using the <code>JSPManager.showJSP</code> method.</p>
+
+  <p>The <code>JSPManager.showJSP</code> method uses the standard Java servlet forwarding mechanism is then used to forward the HTTP request to the JSP. The JSP is processed by Tomcat and the results sent back to the user's browser.</p>
+
+  <p>There is an exception to this servlet/JSP style: <code>index.jsp</code>, the 'home page', receives the HTTP request directly from Tomcat without a servlet being invoked first. This is because in the servlet 2.3 specification, there is no way to map a servlet to handle only requests made to '<code>/</code>'; such a mapping results in every request being directed to that servlet. By default, Tomcat forwards requests to '<code>/</code>' to <code>index.jsp</code>. To try and make things as clean as possible, <code>index.jsp</code> contains some simple code that would normally go in a servlet, and then forwards to <code>home.jsp</code> using the <code>JSPManager.showJSP</code> method. This means localized versions of the 'home page' can be created by placing a customized <code>home.jsp</code> in <code><em>[dspace-source]</em>/jsp/local</code>, in the same manner as other JSPs.</p>
+
+  <p><code><em>[dspace-source]</em>/jsp/dspace-admin/index.jsp</code>, the administration UI index page, is invoked directly by Tomcat and not through a servlet for similar reasons.</p>
+
+  <p>At the top of each JSP file, right after the license and copyright header, is documented the appropriate attributes that a servlet must fill out prior to forwarding to that JSP. No validation is performed; if the servlet does not fill out the necessary attributes, it is likely that an internal server error will occur.</p>
+
+  <p>Many JSPs containing forms will include hidden parameters that tell the servlets which form has been filled out. The submission UI servlet (<code>SubmitServlet</code> is a prime example of a servlet that deals with the input from many different JSPs. The <code>step</code> hidden parameter is used to inform the servlet which form has been filled out (which step of submission the user has just completed.)</p>
+
+  <p>Below is a detailed, scary diagram depicting the flow of control during the whole process of processing and responding to an HTTP request. More information about the authentication mechanism is mostly <a href="configure.html#authenticate">described in the configuration section</a>.</p>
+
+  <p class="figure"><img src="image/web-ui-flow.gif" alt="Web UI Control Flow"></p>
+
+  <p class="caption">Flow of Control During HTTP Request Processing</p>
+
+  <h3>Custom JSP Tags</h3>
+
+  <p>The DSpace JSPs all use some custom tags defined in <code>/dspace/jsp/WEB-INF/dspace-tags.tld</code>, and the corresponding Java classes reside in <code>org.dspace.app.webui.jsptag</code>. The tags are listed below. The <code>dspace-tags.tld</code> file contains detailed comments about how to use the tags, so that information is not repeated here.</p>
+
+  <dl>
+    <dt><code>layout</code></dt>
+
+    <dd>
+      <p>Just about every JSP uses this tag. It produces the standard HTML header and <code>&lt;BODY&gt;</code>tag. Thus the content of each JSP is nested inside a <code>&lt;dspace:layout&gt;</code> tag. The (XML-style)attributes of this tag are slightly complicated--see <code>dspace-tags.tld</code>. The JSPs in the source code bundle also provide plenty of examples.</p>
+    </dd>
+
+    <dt><code>sidebar</code></dt>
+
+    <dd>
+      <p>Can only be used inside a <code>layout</code> tag, and can only be used once per JSP. The content between the start and end <code>sidebar</code> tags is rendered in a column on the right-hand side of the HTML page. The contents can contain further JSP tags and Java 'scriptlets'.</p>
+    </dd>
+
+    <dt><code>date</code></dt>
+
+    <dd>
+      <p>Displays the date represented by an <code>org.dspace.content.DCDate</code> object. Just the one representation of date is rendered currently, but this could use the user's browser preferences to display a localized date in the future.</p>
+    </dd>
+
+    <dt><code>include</code></dt>
+
+    <dd>
+      <p>Obsolete, simple tag, similar to <code>jsp:include</code>. In versions prior to DSpace 1.2, this tag would use the locally modified version of a JSP if one was installed in jsp/local. As of 1.2, the build process now performs this function, however this tag is left in for backwards compatibility.</p>
+    </dd>
+
+    <dt><code>item</code></dt>
+
+    <dd>
+      <p>Displays an item record, including Dublin Core metadata and links to the bitstreams within it. Note that the displaying of the bitstream links is simplistic, and does not take into account any of the bundling structure. This is because DSpace does not have a fully-fledged dissemination architectural piece yet.</p>
+
+      <p>Displaying an item record is done by a tag rather than a JSP for two reasons: Firstly, it happens in several places (when verifying an item record during submission or workflow review, as well as during standard item accesses), and secondly, displaying the item turns out to be mostly code-work rather than HTML anyway. Of course, the disadvantage of doing it this way is that it is slightly harder to customize exactly what is displayed from an item record; it is necessary to edit the tag code (<code>org.dspace.app.webui.jsptag.ItemTag</code>). Hopefully a better solution can be found in the future.</p>
+    </dd>
+
+    <dt><code>itemlist</code>, <code>collectionlist</code>, <code>communitylist</code></dt>
+
+    <dd>
+      <p>These tags display ordered sequences of items, collections and communities, showing minimal information but including a link to the page containing full details. These need to be used in HTML tables.</p>
+    </dd>
+
+    <dt><code>popup</code></dt>
+
+    <dd>
+      <p>This tag is used to render a link to a pop-up page (typically a help page.) If Javascript is available, the link will either open or pop to the front any existing DSpace pop-up window. If Javascript is not available, a standard HTML link is displayed that renders the link destination in a window named '<code>dspace.popup</code>'. In graphical browsers, this usually opens a new window or re-uses an existing window of that name, but if a window is re-used it is not 'raised' which might confuse the user. In text browsers, following this link will simply replace the current page with the destination of the link. This obviously means that Javascript offers the best functionality, but other browsers are still supported.</p>
+    </dd>
+
+    <dt><code>selecteperson</code></dt>
+
+    <dd>
+      <p>A tag which produces a widget analogous to HTML <code>&lt;SELECT&gt;</code>, that allows a user to select one or multiple e-people from a pop-up list.</p>
+    </dd>
+
+    <dt><code>sfxlink</code></dt>
+
+    <dd>
+      <p>Using an item's Dublin Core metadata DSpace can display an SFX link, if an SFX server is available. This tag does so for a particular item if the <code>sfx.server.url</code> property is defined in <code>dspace.cfg</code>.</p>
+    </dd>
+  </dl>
+
+  <h3><a name="i18n" id="i18n">Internationalisation</a></h3>
+
+  <p>The <a class="external" href="http://jakarta.apache.org/taglibs/doc/standard-1.0-doc/intro.html">Java Standard Tag Library v1.0</a> is used to specify messages in the JSPs like this:</p>
+
+  <p>OLD:</p>
+  <pre>
+&lt;H1&gt;Search Results&lt;/H1&gt;
+</pre>
+
+  <p>NEW:</p>
+  <pre>
+&lt;H1&gt;&lt;fmt:message key="jsp.search.results.title" /&gt;&lt;/H1&gt;
+</pre>
+
+  <p>This message can now be changed using the <tt>config/language-packs/Messages.properties</tt> file. (This must be done at build-time: <tt>Messages.properties</tt> is placed in the <tt>dspace.war</tt> Web application file.)</p>
+  <pre>
+jsp.search.results.title = Search Results
+</pre>
+
+  <p>Phrases may have parameters to be passed in, to make the job of translating easier, reduce the number of 'keys' and to allow translators to make the translated text flow more appropriately for the target language.</p>
+
+  <p>OLD:</p>
+  <pre>
+&lt;P&gt;Results &lt;%= r.getFirst() %&gt; to &lt;%= r.getLast() %&gt; of &lt;%= r.getTotal() %&gt;&lt;/P&gt;
+</pre>
+
+  <p>NEW:</p>
+  <pre>
+&lt;fmt:message key="jsp.search.results.text"&gt;
+  &lt;fmt:param&gt;&lt;%= r.getFirst() %&gt;&lt;/fmt:param&gt;
+  &lt;fmt:param&gt;&lt;%= r.getLast() %&gt;&lt;/fmt:param&gt;
+  &lt;fmt:param&gt;&lt;%= r.getTotal() %&gt;&lt;/fmt:param&gt;
+&lt;/fmt:message&gt;
+</pre>
+
+  <p>(Note: JSTL 1.0 does not seem to allow JSP &lt;%= %&gt; expressions to be passed in as values of attribute in &lt;fmt:param value=""/&gt;)</p>
+
+  <p>The above would appear in the <tt>Messages_xx.properties</tt> file as:</p>
+  <pre>
+jsp.search.results.text = Results {0}-{1} of {2}
+</pre>
+
+  <p>Introducing number parameters that should be formatted according to the locale used makes no difference in the message key compared to atring parameters:</p>
+  <pre>
+jsp.submit.show-uploaded-file.size-in-bytes = {0} bytes
+</pre>
+
+  <p>In the JSP using this key can be used in the way belov:</p>
+  <pre>
+&lt;fmt:message key="jsp.submit.show-uploaded-file.size-in-bytes"&gt;
+  &lt;fmt:param&gt;&lt;fmt:formatNumber&gt;&lt;%= bitstream.getSize() %&gt;&lt;/fmt:formatNumber&gt;&lt;/fmt:param&gt;
+&lt;/fmt:message&gt;
+</pre>
+
+  <p>(Note: JSTL offers a way to include numbers in the message keys as <tt>jsp.foo.key = {0,number} bytes</tt>. Setting the parameter as <tt>&lt;fmt:param value="${variable}" /&gt;</tt> workes when <tt>variable</tt> is a single variable name and doesn't work when trying to use a method's return value instead: <tt>bitstream.getSize()</tt>. Passing the number as string (or using the &lt;%= %&gt; expression) also does not work.)</p>
+
+  <p>Multiple <tt>Messages.properties</tt> can be created for different languages. See <a class="external" href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/ResourceBundle.html#getBundle(java.lang.String,%20java.util.Locale,%20java.lang.ClassLoader)">ResourceBundle.getBundle</a>. e.g. you can add German and Canadian French translations:</p>
+  <pre>
+Messages_de.properties
+Messages_fr_CA.properties
+</pre>
+
+  <p>The end user's browser settings determine which language is used. The English language file <tt>Messages.properties</tt> (or the default server locale) will be used as a default if there's no language bundle for the end user's preferred language.  (Note that the English file is not called <code>Messages_en.properties</code> -- this is so it is always available as a default, regardless of server configuration.)</p>
+
+  <p>The <tt>dspace:layout</tt> tag has been updated to allow dictionary keys to be passed in for the titles. It now has two new parameters: <tt>titlekey</tt> and <tt>parenttitlekey</tt>. So where before you'd do:</p>
+  <pre>
+&lt;dspace:layout title="Here"
+               parentlink="/mydspace"
+               parenttitle="My DSpace"&gt;
+</pre>
+
+  <p>You now do:</p>
+  <pre>
+&lt;dspace:layout titlekey="jsp.page.title"
+               parentlink="/mydspace"
+               parenttitlekey="jsp.mydspace"&gt;
+
+</pre>
+
+  <p>And so the layout tag itself gets the relevant stuff out of the dictionary. <tt>title</tt> and <tt>parenttitle</tt> still work as before for backwards compatibility, and the odd spot where that's preferable.</p>
+
+  <h4>Message Key Convention</h4>
+
+  <p>When translating further pages, please follow the convention for naming message keys to avoid clashes.</p>
+
+  <p><strong>For text in JSPs</strong> use the complete path + filename of the JSP, then a one-word name for the message. e.g. for the title of <tt>jsp/mydspace/main.jsp</tt> use:</p>
+  <pre>
+jsp.mydspace.main.title
+</pre>
+
+  <p>Some common words (e.g. "Help") can be brought out into keys starting <tt>jsp.</tt> for ease of translation, e.g.:</p>
+  <pre>
+jsp.admin = Administer
+</pre>
+
+  <p>Other common words/phrases are brought out into 'general' parameters if they relate to a set (directory) of JSPs, e.g.</p>
+  <pre>
+jsp.tools.general.delete = Delete
+</pre>
+
+  <p>Phrases that relate <strong>strongly</strong> to a topic (eg. MyDSpace) but used in many JSPs outside the particular directory are more convenient to be cross-referenced. For example one could use the key below in <tt>jsp/submit/saved.jsp</tt> to provide a link back to the user's <em>MyDSpace</em>:</p>
+
+  <p><em>(Cross-referencing of keys <strong>in general</strong> is not a good idea as it may make maintenance more difficult. But in some cases it has more advantages as the meaning is obvious.)</em></p>
+  <pre>
+jsp.mydspace.general.goto-mydspace = Go to My DSpace
+</pre>
+
+  <p><strong>For text in servlet code</strong>, in custom JSP tags or wherever applicable use the fully qualified classname + a one-word name for the message. e.g.</p>
+  <pre>
+org.dspace.app.webui.jsptag.ItemListTag.title = Title
+</pre>
+
+  <h4>Which Languages are currently supported?</h4>
+
+  <p>To view translations currently being developed, please refer to the <a href="http://wiki.dspace.org/I18nSupport">i18n page</a> of the DSpace Wiki.</p>
+
+  <h3>HTML Content in Items</h3>
+
+  <p>For the most part, the DSpace item display just gives a link that allows an end-user to download a bitstream. However, if a bundle has a primary bitstream whose format is of MIME type <code>text/html</code>, instead a link to the HTML servlet is given.</p>
+
+  <p>So if we had an HTML document like this:</p>
+  <pre>
+contents.html
+chapter1.html
+chapter2.html
+chapter3.html
+figure1.gif
+figure2.jpg
+figure3.gif
+figure4.jpg
+figure5.gif
+figure6.gif
+</pre>
+
+  <p>The Bundle's primary bitstream field would point to the contents.html Bitstream, which we know is HTML (check the format MIME type) and so we know which to serve up first.</p>
+
+  <p>The HTML servlet employs a trick to serve up HTML documents without actually modifying the HTML or other files themselves. Say someone is looking at <code>contents.html</code> from the above example, the URL in their browser will look like this:</p>
+  <pre>
+https://dspace.mit.edu/html/1721.1/12345/contents.html
+</pre>
+
+  <p>If there's an image called <code>figure1.gif</code> in that HTML page, the browser will do HTTP GET on this URL:</p>
+  <pre>
+https://dspace.mit.edu/html/1721.1/12345/figure1.gif
+</pre>
+
+  <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>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>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
+                                         ^^^^^^^
+                                        Strip this
+</pre>
+
+  <p>BUT all the filenames (regardless of directory names) must be unique. For example, this wouldn't work:</p>
+  <pre>
+contents.html
+chapter1.html
+chapter2.html
+chapter1_images/figure.gif
+chapter2_images/figure.gif
+</pre>
+
+  <p>since the HTML document servlet wouldn't know which bitstream to serve up for:</p>
+  <pre>
+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> 
+
+  <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>
+
+  <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>
+
+  <p>The submission UI has an optional feature that came about as a result of MIT Libraries policy. If the <code>block.theses</code> parameter in <code>dspace.cfg</code> is <code>true</code>, an extra checkbox is included in the first page of the submission UI. This asks the user if the submission is a thesis. If the user checks this box, the submission is halted (deleted) and an error message displayed, explaining that DSpace should not be used to submit theses. This feature can be turned off and on, and the message displayed (<code>/dspace/jsp/submit/no-theses.jsp</code> can be localized as necessary.</p>
+
+  <h2><a name="oai" id="oai">OAI-PMH Data Provider</a></h2>
+
+  <p>The DSpace platform supports the <a href="http://www.openarchives.org/">Open Archives Initiative Protocol for Metadata Harvesting</a> (OAI-PMH) version 2.0 as a data provider. This is accomplished using the <a href="http://www.oclc.org/research/software/oai/cat.shtm">OAICat framework from OCLC</a>.</p>
+
+  <p>The DSpace build process builds a Web application archive, <code><em>[dspace-source]</em>/build/dspace-oai.war</code>), in much the same way as <a href="#webui_build">the Web UI build process</a> described above. The only differences are that the JSPs are not included, and <code><em>[dspace-source]</em>/etc/oai-web.xml</code> is used as the deployment descriptor. This 'webapp' is deployed to receive and respond to OAI-PMH requests via HTTP. Note that typically it should <em>not</em> be deployed on SSL (<code>https:</code> protocol). In a typical configuration, this is deployed at <code>dspace-oai</code>, for example:</p>
+  <pre>
+http://dspace.myu.edu/dspace-oai/request?verb=Identify
+</pre>
+
+  <p>The 'base URL' of this DSpace deployment would be:</p>
+  <pre>
+http://dspace.myu.edu/dspace-oai/request
+</pre>
+
+  <p>It is this URL that should be registered with <a href="http://www.openarchives.org/">www.openarchives.org</a>. Note that you can easily change the '<code>request</code>' portion of the URL by editing <code><em>[dspace-source]</em>/etc/oai-web.xml</code> and rebuilding and deploying <code>dspace-oai.war</code>.</p>
+
+  <p>DSpace provides implementations of the OAICat interfaces <code>AbstractCatalog</code>, <code>RecordFactory</code> and <code>Crosswalk</code> that interface with the DSpace content management API and harvesting API (in the search subsystem).</p>
+
+  <p>Only the basic <code>oai_dc</code> unqualified Dublin Core metadata set export is enabled by default; this is particularly easy since all items have qualified Dublin Core metadata. When this metadata is harvested, the qualifiers are simply stripped; for example, <code>description.abstract</code> is exposed as unqualified <code>description</code>. The <code>description.provenance</code> field is hidden, as this contains private information about the submitter and workflow reviewers of the item, including their e-mail addresses. Additionally, to keep in line with OAI community practices, values of <code>contributor.author</code> are exposed as <code>creator</code> values.</p>
+
+  <p>Other metadata formats are supported as well, using other <code>Crosswalk</code> implementations; consult the <code>oaicat.properties</code> file described below. To enable a format, simply uncomment the lines beginning with <code>Crosswalks.*</code>. Multiple formats are allowed, and the current list includes, in addition to unqualified DC: MPEG DIDL, METS, MODS. There is also an incomplete, experimental qualified DC.</p>
+
+  <p>Note that the current simple DC implementation (<code>org.dspace.app.oai.OAIDCCrosswalk</code>) does not currently strip out any invalid XML characters that may be lying around in the data. If your database contains a DC value with, for example, some ASCII control codes (form feed etc.) this may cause OAI harvesters problems. This should rarely occur, however. XML entities (such as <code>&gt;</code>) are encoded (e.g. to <code>&amp;gt;</code>)</p>
+
+  <p>In addition to the implementations of the OAICat interfaces, there are two configuration files relevant to OAI support:</p>
+
+  <dl>
+    <dt><code>oaicat.properties</code></dt>
+
+    <dd>
+      <p>This resides as a template in <code><em>[dspace]</em>/config/templates</code>, and the live version is written to <code><em>[dspace]</em>/config</code>. You probably won't need to edit this; the <code>install-configs</code> script fills out the relevant deployment-specific parameters. You might want to change the <code>earliestDatestamp</code> field to accurately reflect the oldest datestamp in the system. (Note that this is the value of the <code>last_modified</code> column in the <code>Item</code> database table.)</p>
+    </dd>
+
+    <dt><code>oai-web.xml</code></dt>
+
+    <dd>
+      <p>This standard Java Servlet 'deployment descriptor' is stored in the source as <code><em>[dspace-source]</em>/etc/oai-web.xml</code>, and is written to <code>/dspace/oai/WEB-INF/web.xml</code>.</p>
+    </dd>
+  </dl>
+
+  <h3>Sets</h3>
+
+  <p>OAI-PMH allows repositories to expose an hierarchy of sets in which records may be placed. A record can be in zero or more sets.</p>
+
+  <p>DSpace exposes collections as sets. The organization of communities is likely to change over time, and is therefore a less stable basis for selective harvesting.</p>
+
+  <p>Each collection has a corresponding OAI set, discoverable by harvesters via the ListSets verb. The setSpec is the Handle of the collection, with the ':' and '/' converted to underscores so that the Handle is a legal setSpec, for example:</p>
+  <pre>
+hdl_1721.1_1234
+</pre>
+
+  <p>Naturally enough, the collection name is also the name of the corresponding set.</p>
+
+  <h3>Unique Identifier</h3>
+
+  <p>Every item in OAI-PMH data repository must have an unique identifier, which must conform to the URI syntax. As of DSpace 1.2, Handles are not used; this is because in OAI-PMH, the OAI identifier identifies the <em>metadata record</em> associated with the <em>resource</em>. The <em>resource</em> is the DSpace item, whose <em>resource identifier</em> is the Handle. In practical terms, using the Handle for the OAI identifier may cause problems in the future if DSpace instances share items with the same Handles; the OAI metadata record identifiers should be different as the different DSpace instances would need to be harvested separately and may have different metadata for the item.</p>
+
+  <p>The OAI identifiers that DSpace uses are of the form:</p>
+
+  <p><code>oai:<em>host name</em>:<em>handle</em></code></p>
+
+  <p>For example:</p>
+
+  <p><code>oai:dspace.myu.edu:123456789/345</code></p>
+
+  <p>If you wish to use a different scheme, this can easily be changed by editing the value of <code>OAI_ID_PREFIX</code> at the top of the <code>org.dspace.app.oai.DSpaceOAICatalog</code> class. (You do not need to change the code if the above scheme works for you; the code picks up the host name and Handles automatically from the DSpace configuration.)</p>
+
+  <h3>Access control</h3>
+
+  <p>OAI provides no authentication/authorisation details, although these could be implemented using standard HTTP methods. It is assumed that all access will be anonymous for the time being.</p>
+
+  <p>A question is, "is all metadata public?" Presently the answer to this is yes; all metadata is exposed via OAI-PMH, even if the item has restricted access policies. The reasoning behind this is that people who do actually have permission to read a restricted item should still be able to use OAI-based services to discover the content.</p>
+
+  <p>If in the future, this 'expose all metadata' approach proves unsatisfactory for any reason, it should be possible to expose only publicly readable metadata. The authorisation system has separate permissions for READing and item and READing the content (bitstreams) within it. This means the system can differentiate between an item with public metadata and hidden content, and an item with hidden metadata as well as hidden content. In this case the OAI data repository should only expose items those with anonymous READ access, so it can hide the existence of records to the outside world completely. In this scenario, one should be wary of protected items that are made public after a time. When this happens, the items are "new" from the OAI-PMH perspective.</p>
+
+  <h3>Modification Date (OAI Date Stamp)</h3>
+
+  <p>OAI-PMH harvesters need to know when a record has been created, changed or deleted. DSpace keeps track of a 'last modified' date for each item in the system, and this date is used for the OAI-PMH date stamp. This means that any changes to the metadata (e.g. admins correcting a field, or a withdrawal) will be exposed to harvesters.</p>
+
+  <h3>'About' Information</h3>
+
+  <p>As part of each record given out to a harvester, there is an optional, repeatable "about" section which can be filled out in any (XML-schema conformant) way. Common uses are for provenance and rights information, and there are schemas in use by OAI communities for this. Presently DSpace does not provide any of this information.</p>
+
+  <h3>Deletions</h3>
+
+  <p>DSpace keeps track of deletions (withdrawals). These are exposed via OAI, which has a specific mechansim for dealing with this. Since DSpace keeps a permanent record of withdrawn items, in the OAI-PMH sense DSpace supports deletions 'persistently'. This is as opposed to 'transient' deletion support, which would mean that deleted records are forgotten after a time.</p>
+
+  <p>Once an item has been withdrawn, OAI-PMH harvests of the date range in which the withdrawal occurred will find the 'deleted' record header. Harvests of a date range prior to the withdrawal will <em>not</em> find the record, despite the fact that the record did exist at that time.</p>
+
+  <p>As an example of this, consider an item that was created on 2002-05-02 and withdrawn on 2002-10-06. A request to harvest the month 2002-10 will yield the 'record deleted' header. However, a harvest of the month 2002-05 will not yield the original record.</p>
+
+  <p>Note that presently, the deletion of 'expunged' items is not exposed through OAI.</p>
+
+  <h3>Flow Control (Resumption Tokens)</h3>
+
+  <p>An OAI data provider can prevent any performance impact caused by harvesting by forcing a harvester to receive data in time-separated chunks. If the data provider receives a request for a lot of data, it can send part of the data with a resumption token. The harvester can then return later with the resumption token and continue.</p>
+
+  <p>DSpace supports resumption tokens for 'ListRecords' OAI-PMH requests. ListIdentifiers and ListSets requests do not produce a particularly high load on the system, so resumption tokens are not used for those requests.</p>
+
+  <p>Each OAI-PMH ListRecords request will return at most 100 records. This limit is set at the top of <code>org.dspace.app.oai.DSpaceOAICatalog.java</code> (<code>MAX_RECORDS</code>). A potential issue here is that if a harvest yields an exact multiple of <code>MAX_RECORDS</code>, the last operation will result in a harvest with no records in it. It is unclear from the OAI-PMH specification if this is acceptable.</p>
+
+  <p>When a resumption token is issued, the optional <code>completeListSize</code> and <code>cursor</code> attributes are not included. OAICat sets the <code>expirationDate</code> of the resumption token to one hour after it was issued, though in fact since DSpace resumption tokens contain all the information required to continue a request they do not actually expire.</p>
+
+  <p>Resumption tokens contain all the state information required to continue a request. The format is:</p>
+  <pre>
+from/until/setSpec/offset
+</pre>
+
+  <p><code>from</code> and <code>until</code> are the ISO 8601 dates passed in as part of the original request, and <code>setSpec</code> is also taken from the original request. <code>offset</code> is the number of records that have already been sent to the harvester. For example:</p>
+  <pre>
+2003-01-01//hdl_1721_1_1234/300
+</pre>
+
+  <p>This means the harvest is 'from' <code>2003-01-01</code>, has no 'until' date, is for collection hdl:1721.1/1234, and 300 records have already been sent to the harvester. (Actually, if the original OAI-PMH request doesn't specify a 'from' or 'until, OAICat fills them out automatically to '0000-00-00T00:00:00Z' and '9999-12-31T23:59:59Z' respectively. This means DSpace resumption tokens will always have from and until dates in them.)</p>
+
+  <h2><a name="packager" id="packager">Package Importer and Exporter</a></h2>
+
+  <p>This command-line tool gives you access to the Packager plugins. It can <em>ingest</em> a package to create a new DSpace Item, or <em>disseminate</em> an Item as a package.</p>
+
+ <p>To see all the options, invoke it as: <pre><em>[dspace]</em>/bin/dsrun org.dspace.app.packager.Packager --help</pre> This mode also displays a list of the names of package ingesters and disseminators that are available.</p>
+
+ <h3>Ingesting</h3>
+
+ <p>To ingest a package from a file, give the command: <pre><em>[dspace]</em>/bin/dsrun org.dspace.app.packager.Packager -e <em>user</em> -c <em>handle</em> -t <em>packager</em> <em>path</em></pre>
+Where <em>user</em> is the e-mail address of the E-Person under whose authority this runs; <em>handle</em> is the Handle of the collection into which the Item is added, <em>packager</em> is the plugin name of the
+package ingester to use, and <em>path</em> is the path to the file to ingest (or <code>"-"</code> to read from the standard input).</p>
+
+ <p>Here is an example that loads a PDF file with internal metadata as a package:
+ <pre>/dspace/bin/dsrun org.dspace.app.packager.Packager -e florey@mit.edu -c 1721.2/13  -t pdf thesis.pdf</pre>
+ </p>
+
+ <p>This example takes the result of retrieving a URL and ingests it:
+<pre>wget -O - http://alum.mit.edu/jarandom/my-thesis.pdf | \
+/dspace/bin/dsrun org.dspace.app.packager.Packager -e florey@mit.edu -c 1721.2/13  -t pdf -</pre></p>
+
+ <h3>Disseminating</h3>
+
+ <p>To disseminate an Item as a package, give the command:
+ <pre><em>[dspace]</em>/bin/dsrun org.dspace.app.packager.Packager -e <em>user</em> -d -i <em>handle</em> -t   <em>packager</em> <em>path</em></pre> Where <em>user</em> is the e-mail address of the E-Person under whose
+authority this runs; <em>handle</em> is the Handle of the Item to disseminate;
+<em>packager</em> is the plugin name of the package disseminator to use; and <em>path</em> is the path to the file to
+create (or <code>"-"</code> to write to the standard output).
+
+This example writes an Item out as a METS package in the file "454.zip":
+<pre>/dspace/bin/dsrun org.dspace.app.packager.Packager -e florey@mit.edu -d -i 1721.2/454 -t METS 454.zip</pre></p>
+
+ <h3>METS packages</h3>
+
+ <p>DSpace 1.4 includes a package disseminator and matching ingester for the DSpace METS SIP (Submission Information Package) format.  They were created to help end users prepare sets of digital resources and metadata for submission
+to the archive using well-defined standards such as
+<a href="http://www.loc.gov/standards/mets/">METS</a>,
+<a href="http://www.loc.gov/standards/mods/">MODS</a>,
+<a href="http://www.loc.gov/standards/premis/">and PREMIS</a>.
+The plugin name is <code>METS</code> by default, and it uses MODS for descriptive metadata.</p>
+
+ <p>The DSpace METS SIP profile is available at:
+ <a href="http://www.dspace.org/standards/METS/SIP/profilev1p0/metsipv1p0.pdf">
+ <code>http://www.dspace.org/standards/METS/SIP/profilev1p0/metsipv1p0.pdf</code></a>.</p>
+
+  <h2><a name="itemimporter" id="itemimporter">Item Importer and Exporter</a></h2>
+
+  <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>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>
+  <pre>
+archive_directory/
+    item_000/
+        dublin_core.xml -- qualified Dublin Core metadata
+        contents        -- text file containing one line per filename
+        file_1.doc      -- files to be added as bitstreams to the item
+        file_2.pdf
+    item_001/
+        dublin_core.xml
+        contents
+        file_1.png
+        ...
+</pre>
+
+  <p>The <code>dublin_core.xml</code> file has the following format, where each Dublin Core element has it's own entry within a <code>&lt;dcvalue&gt;</code> tagset. There are currently three tag elements available in the <code>&lt;dcvalue&gt;</code> tagset:</p>
+
+  <ul>
+    <li><code>&lt;element&gt;</code> - the Dublin Core element</li>
+
+    <li><code>&lt;qualifier&gt;</code> - the element's qualifier</li>
+
+    <li><code>&lt;language&gt;</code> - (optional)ISO language code for element</li>
+  </ul>
+  <pre>
+&lt;dublin_core&gt;
+    &lt;dcvalue element="title" qualifier="none"&gt;A Tale of Two Cities&lt;/dcvalue&gt;
+    &lt;dcvalue element="date" qualifier="issued"&gt;1990&lt;/dcvalue&gt;&lt;/dublin_core&gt;
+    &lt;dcvalue element="title" qualifier="alternate" language="fr" "&gt;J'aime les Printemps&lt;/dcvalue&gt;
+&lt;/dublin_core&gt;
+
+</pre>
+
+  <p>(Note the optional language tag which notifies the system that the optional title is in French.)</p>
+
+  <p>The <code>contents</code> file simply enumerates, one file per line, the bitstream file names. The bitstream name may optionally be followed by the sequence:<br><br> <code>\tbundle:bundlename</code><br><br> where '\t' is the tab character and 'bundlename' is replaced by the name of the bundle to which the bitstream should be added. If no bundle is specified, the bitstream will be added to the 'ORIGINAL' bundle.<p> 
+
+  <h3><a name="importingitems" id="importingitems">Importing Items</a></h3>
+
+  <p><strong>Note:</strong> Before running the item importer over items previously exported from a DSpace instance, please first refer to <a href="application.html#transferitem">Transferring Items Between DSpace Instances</a>.</p>
+
+  <p>The item importer is in <code>org.dspace.app.itemimport.ItemImport</code>, and is run with the <code>dsrun</code> utility in the <code>dspace/bin</code> directory. Running it with -h gets the current command-line arguments. Another very important flag is the --test flag, which you can use with any command to simulate all of the actions it will perform without actually making any changes to your DSpace instance - very useful for validating your item directories before doing an import. In the importer's arguments you can use either the user's database ID or email address and the eperson ID, and the collection's database ID or handle as arguments. Currently with the importer you can add, remove, and replace items in a collection. If you specify more than one collection argument then the items will be imported to multiple collections, and the first collection specified becomes the "owning" collection. If there is an error and the import is aborted, there is a --resume flag that you can try to resume the import where you left off after you fix the error.</p>
+
+  <p>To add items to a collection with an EPerson as the submitter, type:</p>
+  <pre>
+dsrun org.dspace.app.itemimport.ItemImport --add --eperson=joe@user.com  --collection=collectionID --source=items_dir --mapfile=mapfile
+</pre>
+
+  <p>(or by using the short form)</p>
+  <pre>
+dsrun org.dspace.app.itemimport.ItemImport -a -e joe@user.com  -c collectionID -s items_dir -m mapfile
+</pre>
+
+  <p>which would then cycle through the archive directory's items, import them, and then generate a map file which stores the mapping of item directories to item handles. Save this map file! Using the map file you can then 'unimport' with the command:</p>
+  <pre>
+dsrun org.dspace.app.itemimport.ItemImport --delete --mapfile=mapfile
+</pre>
+
+  <p>The imported items listed in the map file would then be deleted. If you wish to replace previously imported items, you can give the command:</p>
+  <pre>
+dsrun org.dspace.app.itemimport.ItemImport --replace --eperson=joe@user.com --collection=collectID --source=items_dir --mapfile=mapfile
+</pre>
+
+  <p>Replacing items uses the map file to replace the old items and still retain their handles.</p>
+
+  <p>The importer usually bypasses any workflow assigned to a collection, but adding the --workflow option will route the imported items through the workflow system.</p>
+
+  <p>The importer also has a --test flag that will simulate the entire import process without actually doing the import. This is extremely useful for verifying your import files before doing the import step.</p>
+
+  <h3><a name="exportingitems" id="exportingitems"></a>Exporting Items</h3>
+
+  <p>The item exporter can export a single item or a collection of items, and creates a DSpace simple archive for each item to be exported. To export a collection's items you type:</p>
+  <pre>
+dsrun org.dspace.app.itemexport.ItemExport --type=COLLECTION --id=collID --dest=dest_dir --number=seq_num
+</pre>
+
+  <p>The keyword <code>COLLECTION</code> means that you intend to export an entire collection. The ID can either be the database ID or the handle. The exporter will begin numbering the simple archives with the sequence number that you supply. To export a single item use the keyword <code>ITEM</code> and give the item ID as an argument:</p>
+  <pre>
+dsrun org.dspace.app.itemexport.ItemExport --type=ITEM --id=itemID --dest=dest_dir --number=seq_num
+</pre>
+
+  <p>Each exported item will have an additional file in its directory, named 'handle'. This will contain the handle that was assigned to the item, and this file will be read by the importer so that items exported and then imported to another machine will retain the item's original handle.</p>
+
+  <h2><a name="transferitem" id="transferitem">Transferring Items Between DSpace Instances</a></h2>
+
+  <p>Where items are to be moved between DSpace instances (for example from a test DSpace into a production DSpace) the item exporter and item importer can be used in conjunction with a script to assist in this process.</p>
+
+  <p>After running the item exporter each <code>dublin_core.xml</code> file will contain metadata that was automatically added by DSpace. These fields are as follows:</p>
+
+  <ul>
+    <li>date.accessioned</li>
+
+    <li>date.available</li>
+
+    <li>date.issued</li>
+
+    <li>description.provenance</li>
+
+    <li>format.extent</li>
+
+    <li>format.mimetype</li>
+
+    <li>identifier.uri</li>
+  </ul>
+
+  <p>In order to avoid duplication of this metadata, run</p>
+
+  <p><code>dspace_migrate &lt;exported item directory&gt;</code></p>
+
+  <p>prior to running the item importer. This will remove the above metadata items, except for date.issued - if the item has been published or publicly distributed before and identifier.uri - if it is not the handle, from the <code>dublin_core.xml</code> file and remove all <code>handle</code> files. It will then be safe to run the item exporter. Use</p>
+
+  <p><code>dspace_migrate --help</code></p>
+
+  <p>for instructions on use of the script.</p>
+
+  <h2><a name="registration" id="registration">Registering (Not Importing) Bitstreams</a></h2>
+
+  <p>Registration is an alternate means of incorporating items, their metadata, and their bitstreams into DSpace by taking advantage of the bitstreams already being in storage accessible to DSpace. An example might be that there is a repository for existing digital assets. Rather than using the normal <a href="functional.html#ingest">interactive ingest process</a> or the <a href="functional.html#importexport">batch import</a> to furnish DSpace the metadata and to upload bitstreams, registration provides DSpace the metadata and the <span style="font-style: italic;">location</span> of the bitstreams. DSpace uses a variation of the import tool to accomplish registration.</p>
+
+  <h3>Accessible Storage</h3>
+
+  <p>To register an item its bitstreams must reside on storage accessible to DSpace and therefore referenced by an <span style="font-style: italic;">asset store number</span> in <code>dspace.cfg</code>. The configuration file <code>dspace.cfg</code> establishes one or more asset stores through the use of an integer asset store number. This number relates to a directory in the DSpace host's file system or a set of SRB account parameters. This asset store number is described in <a href="configure.html#dspacecfg">The <code>dspace.cfg</code> Configuration Properties File</a> section and in the <code>dspace.cfg</code> file itself. The asset store number(s) used for registered items should generally not be the value of the <code>assetstore.incoming</code> property since it is unlikely that that you will want to mix the bitstreams of normally ingested and imported items and registered items.</p>
+
+  <h3>Registering Items Using the Item Importer</h3>
+
+  <p>DSpace uses the same import tool that is used for batch import except that several variations are employed to support registration. The discussion that follows assumes familiarity with the import tool.</p>
+
+  <p>The archive format for registration does not include the actual content files (bitstreams) being registered. The format is however a directory full of items to be registered, with a subdirectory per item. Each item directory contains a file for the item's descriptive metadata (<code>dublin_core.xml</code>) and a file listing the item's content files (<code>contents</code>), but not the actual content files themselves.</p>
+
+  <p>The <code>dublin_core.xml</code> file for item registration is exactly the same as for regular item import.</p>
+
+  <p>The <code>contents</code> file, like that for regular item import, lists the item's content files, one content file per line, but each line has the one of the following formats:</p>
+  <pre>
+-r -s n -f filepath
+-r -s n -f filepath\tbundle:bundlename
+</pre>
+
+  <P>where</P>
+
+  <UL>
+    <LI><code>-r</code> indicates this is a file to be registered</LI>
+    <LI><code>-s n</code> indicates the asset store number (<code>n</code>)</li>
+    <li><code>-f filepath</code> indicates the path and name of the content file to be registered (filepath)</li>
+    <li><code>\t</code> is a tab character</li>
+    <li><code>bundle:bundlename</code> is an optional bundle name</li>
+  </ul>
+
+  <p>The bundle, that is everything after the filepath, is optional and is normally not used.</p>
+
+  <p>The command line for registration is just like the one for regular import:</p>
+  <pre>
+dsrun org.dspace.app.itemimport.ItemImport --add --eperson=joe@user.com  --collection=collectionID --source=items_dir --mapfile=mapfile
+</pre>
+
+  <p>(or by using the short form)</p>
+  <pre>
+dsrun org.dspace.app.itemimport.ItemImport -a -e joe@user.com  -c collectionID -s items_dir -m mapfile
+</pre>
+
+  <p>The <code>--workflow</code> and <code>--test</code> flags will function as described in <a href="application.html#importingitems">Importing Items</a>.</p>
+
+  <p>The <code>--delete</code> flag will function as described in <a href="application.html#importingitems">Importing Items</a> but the registered content files will not be removed from storage. See <a href="#deletingregistereditems">Deleting Registered Items</a>.</p>
+
+  <p>The <code>--replace</code> flag will function as described in <a href="application.html#importingitems">Importing Items</a> but care should be taken to consider different cases and implications. With old items and new items being registered or ingested normally, there are four combinations or cases to consider. Foremost, an old registered item deleted from DSpace using <code>--replace</code> will not be removed from the storage. See <a href="application.html#deletingregistereditems">Deleting Registered Items</a>. where is resides. A new item added to DSpace using <code>--replace</code> will be ingested normally or will be registered depending on whether or not it is marked in the <code>contents</code> files with the -r.</p>
+
+  <h3>Internal Identification and Retrieval of Registered Items</h3>
+
+  <p>Once an item has been registered, superficially it is indistinguishable from items ingested interactively or by batch import. But internally there are some differences:</p>
+
+  <p>First, the randomly generated internal ID is not used because DSpace does not control the file path and name of the bitstream. Instead, the file path and name are that specified in the <code>contents</code> file.</p>
+
+  <p>Second, the <code>store_number</code> column of the bitstream database row contains the asset store number specified in the <code>contents</code> file.</p>
+
+  <p>Third, the <code>internal_id</code> column of the bitstream database row contains a leading flag (<code>-R</code>) followed by the registered file path and name. For example, <code>-Rfilepath</code> where <code>filepath</code> is the file path and name relative to the asset store corresponding to the asset store number. The asset store could be traditional storage in the DSpace server's file system or an SRB account.</p>
+
+  <p>Fourth, an MD5 checksum is calculated by reading the registered file if it is in local storage. If the registerd file is in remote storage (say, SRB) a checksup is calulated on just the file name! This is an efficiency choice since registering a large number of large files that are in SRB would consume substantial network resources and time. A future option could be to have an SRB proxy process calculate MD5s and store them in SRB's metadata catalog (MCAT) for rapid retrieval. SRB offers such an option but it's not yet in production release.</p>
+
+  <p>Registered items and their bitstreams can be retrieved transparently just like normally ingested items.</p>
+
+  <h3>Exporting Registered Items</h3>
+
+  <p>Registered items may be exported as described in <a href="#exportingitems">Exporting Items</a>. If so, the export directory will contain actual copies of the files being exported but the lines in the contents file will flag the files as registered. This means that if DSpace items are "round tripped" (see Transferring Items Between DSpace Instances) using the exporter and importer, the registered files in the export directory will again registered in DSpace instead of being uploaded and ingested normally.</p>
+
+  <h3>METS Export of Registered Items</h3>
+
+  <p>The <a href="#mets">METS Export Tool</a> can also be used but note the cautions described in that section and note that MD5 values for items in remote storage are actually MD5 values on just the file name.</p>
+
+  <h3><a name="deletingregistereditems" id="deletingregistereditems"></a>Deleting Registered Items</h3>
+
+  <p>If a registered item is deleted from DSpace, either interactively or by using the <code>--delete</code> or <code>--replace</code> flags described in <a href="application.html#importingitems">Importing Items</a>, the item will disappear from DSpace but it's registered content files will remain in place just as they were prior to registration. Bitstreams not registered but added by DSpace as part of registration, such as <code>license.txt</code> files, will be deleted.</p>
+
+  <h2><a name="mets" id="mets">METS Tools</a></h2>
+
+  <p>The experimental (incomplete) METS export tool writes DSpace items to a filesystem with the metadata held in a more standard format based on METS.</p>
+
+  <h3>The Export Tool</h3>
+
+  <p>The METS export tool is invoked via the command line like this:</p>
+  <pre>
+<em>[dspace]</em>/bin/dsrun org.dspace.app.mets.METSExport --help
+</pre>
+
+  <p>The tool can export an individual item, the items within a given collection, or everything in the DSpace instance. To export an individual item, use:</p>
+  <pre>
+<em>[dspace]</em>/bin/dsrun org.dspace.app.mets.METSExport --item <em>[handle]</em>
+</pre>
+
+  <p>To export the items in collection <code>hdl:123.456/789</code>, use:</p>
+  <pre>
+<em>[dspace]</em>/bin/dsrun org.dspace.app.mets.METSExport --collection hdl:123.456/789
+</pre>
+
+  <p>To export all the items DSpace, use:</p>
+  <pre>
+<em>[dspace]</em>/bin/dsrun org.dspace.app.mets.METSExport --all
+</pre>
+
+  <p>With any of the above forms, you can specify the base directory into which the items will be exported, using <code>--destination <em>[directory]</em></code>. If this parameter is omitted, the current directory is used.</p>
+
+  <h3>The AIP Format</h3>
+
+  <p>Each exported item is written to a separate directory, created under the base directory specified in the command-line arguments, or in the current directory if <code>--destination</code> is omitted. The name of each directory is the Handle, URL-encoded so that the directory name is 'legal'.</p>
+
+  <p>Within each item directory is a <code>mets.xml</code> file which contains the METS-encoded metadata for the item. Bitstreams in the item are also stored in the directory. Their filenames are their MD5 checksums, firstly for easy integrity checking, and also to avoid any problems with 'special characters' in the filenames that were legal on the original filing system they came from but are illegal in the server filing system. The <code>mets.xml</code> file includes XLink pointers to these bitstream files.</p>
+
+  <p>An example AIP might look like this:</p>
+
+  <ul>
+    <li>
+      <code>hdl%3A123456789%2F8/</code>
+
+      <ul>
+        <li><code>mets.xml</code> -- METS metadata</li>
+
+        <li><code>184BE84F293342</code> -- bitstream</li>
+
+        <li><code>3F9AD0389CB821</code></li>
+
+        <li><code>135FB82113C32D</code></li>
+      </ul>
+    </li>
+  </ul>
+
+  <p>The contents of the METS in the <code>mets.xml</code> file are as follows:</p>
+
+  <ul>
+    <li>
+      <p>A <code>dmdSec</code> (descriptive metadata section) containing the item's metadata in <a href="http://www.loc.gov/standards/mods/">Metadata Object Description Schema (MODS)</a> XML. The Dublin Core descriptive metadata is mapped to MODS since there is no official qualified Dublin Core XML schema in existence as of yet, and the Library Application Profile of DC that DSpace uses includes some qualifiers that are not part of the <a href="http://dublincore.org/documents/dcmi-terms/">DCMI Metadata Terms</a>.</p>
+    </li>
+
+    <li>
+      <p>An <code>amdSec</code> (administrative metadata section), which contains the a rights metadata element, which in turn contains the base64-encoded deposit license (the license the submitter granted as part of the submission process).</p>
+    </li>
+
+    <li>
+      <p>A <code>fileSec</code> containing a list of the bitstreams in the item. Each bundle constitutes a <code>fileGrp</code>. Each bitstream is represented by a <code>file</code> element, which contains an <code>FLocat</code> element with a simple XLink to the bitstream in the same directory as the <code>mets.xml</code> file. The <code>file</code> attributes consist of most of the basic technical metadata for the bitstream. Additionally, for those bitstreams that are thumbnails or text extracted from another bitstream in the item, those 'derived' bitstreams have the same <code>GROUPID</code> as the bitstream they were derived from, in order that clients understand that there is a relationship.</p>
+
+      <p>The <code>OWNERID</code> of each <code>file</code> is the <a href="functional.html#bitstream_ids">'persistent' bitstream identifier</a> assigned by the DSpace instance. The <code>ID</code> and <code>GROUPID</code> attributes consist of the item's Handle, together with the bitstream's sequence ID, which underscores used in place of dots and slashes. For example, a bitstream with sequence ID 24, in the item <code>hdl:123.456/789</code> will have the <code>ID</code> <code>123_456_789_24</code>. This is because <code>ID</code> and <code>GROUPID</code> attributes must be of type <code>xsd:id</code>.</p>
+    </li>
+  </ul>
+
+  <h3>Limitations</h3>
+
+  <ul>
+    <li>No corresponding import tool yet</li>
+
+    <li>No <code>structmap</code> section</li>
+
+    <li>Some technical metadata not written, e.g. the primary bitstream in a bundle, original filenames or descriptions.</li>
+
+    <li>Only the MIME type is stored, not the (finer grained) bitstream format.</li>
+
+    <li>Dublin Core to MODS mapping is very simple, probably needs verification</li>
+  </ul>
+
+  <h2><a name="mediafilters" id="mediafilters">MediaFilters: Transforming DSpace Content</a></h2>
+
+  <p>DSpace can apply filters to content/bitstreams, creating new content. Filters are included that extract text for <strong>full-text searching</strong>, and create <strong>thumbnails</strong> for items that contain images. The media filters are controlled by the <code>MediaFilterManager</code> which traverses the asset store, invoking the <code>MediaFilter</code> subclasses on bitstreams. The MediaFilter plugin config item <code>plugin.named.org.dspace.app.mediafilter.MediaFilter</code> in <code>dspace.cfg</code> contains a list of bitstream format types and the filters that operate on bitstreams of that type. The media filter system is intended to be run from the command line (or regularly as a cron task):</p>
+  <pre>
+dspace/bin/filter-media
+</pre>
+
+  <p>Traverse the asset store, applying media filters to bitstreams, skipping bitstreams that have already been filtered.</p>
+  <pre>
+dspace/bin/filter-media -f
+</pre>
+
+  <p>Apply filters to ALL bitstreams, even if they've already been filtered.</p>
+  <pre>
+dspace/bin/filter-media -v
+</pre>
+
+  <p>Verbose mode - print all extracted text and other filter details to STDOUT.</p>
+  <pre>
+dspace/bin/filter-media -n
+</pre>
+
+  <p>Suppress index creation - by default, a new search index is created for full-text searching. This option suppresses index creation if you intend to run <code>index-all</code> elsewhere.</p>
+  
+  <pre>
+dspace/bin/filter-media -i 123456789/2
+</pre>
+
+  <p>Restrict processing to the community, collection, or item named by the identifier - by default, all bitstreams of all items in the repository are processed. The identifier must be a handle, not a DB key. This option may be combined with any other option.</p>
+  
+  <pre>
+dspace/bin/filter-media -m 1000
+</pre>
+
+  <p>Suspend operation after the specified maximum number of items have been processed - by default, no limit exists. This option may be combined with any other option.</p>
+
+  <p>Adding your own filters is done by creating a sub-class of the <code>MediaFilter</code> class. See the comments in the source file MediaFilter.java for more information. In theory filters could be implemented in any language (C, Perl, etc.) They only need to be invoked by the Java code in the <code>MediaFilter</code> class that you create.</p>
+
+  <h2><a name="filiator" id="filiator">Sub-Community Management</a></h2>
+
+  <p>DSpace provides an administrative tool - 'CommunityFiliator' - for managing community sub-structure. Normally this structure seldom changes, but prior to the 1.2 release sub-communities were not supported, so this tool could be used to place existing pre-1.2 communities into a hierarchy. It has two operations, either establishing a community to sub-community relationship, or dis-establishing an existing relationship.</p>
+
+  <p>The familiar parent/child metaphor can be used to explain how it works. Every community in DSpace can be either a 'parent' community - meaning it has at least one sub-community, or a 'child' community - meaning it is a sub-community of another community, or both or neither. In these terms, an 'orphan' is a community that lacks a parent (although it can be a parent); 'orphans' are referred to as 'top-level' communities in the DSpace user-interface, since there is no parent community 'above' them. The first operation - establishing a parent/child relationship - can take place between any community and an orphan. The second operation - removing a parent/child relationship - will make the child an orphan.</p>
+
+  <p>Using the dsrun utility in the dspace/bin directory, the establish operation looks like this:</p>
+  <pre>
+dsrun org.dspace.administer.CommunityFiliator --set --parent=parentID --child=childID
+</pre>
+
+  <p>(or using the short form)</p>
+  <pre>
+dsrun org.dspace.administer.CommunityFiliator -s -p parentID -c childID
+</pre>
+
+  <p>where '-s' or '--set' means establish a relationship whereby the community identified by the '-p' parameter becomes the parent of the community identified by the '-c' parameter. Both the 'parentID' and 'childID' values may be handles or database IDs.</p>
+
+  <p>The reverse operation looks like this:</p>
+  <pre>
+dsrun org.dspace.administer.CommunityFiliator --remove --parent=parentID --child=childID
+</pre>
+
+  <p>(or using the short form)</p>
+  <pre>
+dsrun org.dspace.administer.CommunityFiliator -r -p parentID -c childID
+</pre>
+
+  <p>where '-r' or '--remove' means dis-establish the current relationship in which the community identified by 'parentID' is the parent of the community identified by 'childID'. The outcome will be that the 'childID' community will become an orphan, i.e. a top-level community.</p>
+
+  <p>If the required constraints of operation are violated, an error message will appear explaining the problem, and no change will be made. An example in a removal operation, where the stated child community does not have the stated parent community as its parent: "Error, child community not a child of parent community".</p>
+
+  <p>It is possible to effect arbitrary changes to the community hierarchy by chaining the basic operations together. For example, to move a child community from one parent to another, simply perform a 'remove' from its current parent (which will leave it an orphan), followed by a 'set' to its new parent.</p>
+
+  <p>It is important to understand that when any operation is performed, all the sub-structure of the child community follows it. Thus, if a child has itself children (sub-communities), or collections, they will all move with it to its new 'location' in the community tree.</p>
+  <hr>
+
+  <address>
+    Copyright &copy; 2002-2005 MIT and Hewlett Packard
+  </address>
+</body>
+</html>

dspace/docs/architecture.html

@@ -0,0 +1,138 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html>
+<head>
+  <title>DSpace System
+Documentation: Architecture</title>
+  <link rel="StyleSheet" href="style.css" type="text/css">
+  <meta http-equiv="Content-Type"
+ content="text/html; charset=iso-8859-1">
+</head>
+<body>
+<h1>DSpace
+System Documentation: Architecture</h1>
+<p><a href="index.html">Back to contents</a></p>
+<h2><a name="overview">Overview</a></h2>
+<p>The DSpace system is organized
+into three layers, each of which
+consists of a number of components.</p>
+<p class="figure"><img src="image/architecture-600x450.gif"
+ alt="Application Layer, Business Logic Layer, Storage Layer"></p>
+<p class="caption">DSpace
+System Architecture</p>
+<p>The storage layer is
+responsible for physical storage of metadata
+and content. The business logic layer deals with managing the content
+of the archive, users of the archive (e-people), authorization, and
+workflow. The application layer contains components that communicate
+with the world outside of the individual DSpace installation, for
+example the Web user interface and the <a
+ href="http://www.openarchives.org/">Open Archives
+Initiative</a>
+protocol for metadata harvesting service.</p>
+<p>Each layer only invokes the
+layer below it; the application layer
+may not used the storage layer directly, for example. Each component in
+the storage and business logic layers has a defined public API. The
+union of the APIs of those components are referred to as the Storage
+API (in the case of the storage layer) and the DSpace Public API (in
+the case of the business logic layer). These APIs are in-process Java
+classes, objects and methods.</p>
+<p>It is important to note that
+each layer is <em>trusted</em>.
+Although the logic for <em>authorising
+actions</em> is in the business
+logic layer, the system relies on individual applications in the
+application layer to correctly and securely <em>authenticate</em>
+e-people. If a 'hostile' or insecure application were allowed to invoke
+the Public API directly, it could very easily perform actions as any
+e-person in the system.</p>
+<p>The reason for this design
+choice is that authentication methods
+will vary widely between different applications, so it makes sense to
+leave the logic and responsibility for that in these applications.</p>
+<p>The source code is organized to
+cohere very strictly to this
+three-layer architecture. Also, only methods in a component's public
+API are given the <code>public</code>
+access level. This means that
+the Java compiler helps ensure that the source code conforms to the
+architecture.</p>
+<table>
+  <caption>Source Code Packages</caption> <tbody>
+    <tr>
+      <th>Packages within</th>
+      <th>Correspond to components
+in</th>
+    </tr>
+    <tr>
+      <td><code>org.dspace.app</code></td>
+      <td>Application layer</td>
+    </tr>
+    <tr>
+      <td><code>org.dspace</code></td>
+      <td>Business logic layer
+(except <code>storage</code>
+and <code>app</code>)</td>
+    </tr>
+    <tr>
+      <td><code>org.dspace.storage</code></td>
+      <td>Storage layer</td>
+    </tr>
+  </tbody>
+</table>
+<p>The storage and business logic
+layer APIs are extensively documented
+with Javadoc-style comments. Generate the HTML version of these by
+entering the source directory and running:</p>
+<pre>ant public_api</pre>
+<p>The package-level documentation
+of each package usually contains an
+overview of the package and some example usage. This information is not
+repeated in this architecture document; this and the Javadoc APIs are
+intended to be used in parallel.</p>
+<p>Each layer is described in a
+separate section:</p>
+<ul>
+  <li><a href="storage.html">Storage Layer</a>
+    <ul>
+      <li><a href="storage.html#rdbms">RDBMS</a></li>
+      <li><a href="storage.html#bitstreams">Bitstream Store</a></li>
+    </ul>
+  </li>
+  <li><a href="business.html">Business Logic Layer</a>
+    <ul>
+      <li><a href="business.html#core">Core Classes</a></li>
+      <li><a href="business.html#content">Content Management API</a></li>
+      <li><a href="business.html#workflow">Workflow System</a></li>
+      <li><a href="business.html#administer">Administration Toolkit</a></li>
+      <li><a href="business.html#eperson">E-person/Group Manager</a></li>
+      <li><a href="business.html#authorize">Authorisation</a></li>
+      <li><a href="business.html#handle">Handle Manager/Handle
+Plugin</a></li>
+      <li><a href="business.html#search">Search</a></li>
+      <li><a href="business.html#browse">Browse API</a></li>
+      <li><a href="business.html#history">History Recorder</a></li>
+      <li><a href="business.html#checker">Checksum Checker</a></li>
+    </ul>
+  </li>
+  <li><a href="application.html">Application Layer</a>
+    <ul>
+      <li><a href="application.html#webui">Web User Interface</a></li>
+      <li><a href="application.html#oai">OAI-PMH Data Provider</a></li>
+      <li><a href="application.html#itemimporter">Item Importer
+and Exporter</a></li>
+      <li><a href="application.html#transferitem">Transferring
+Items Between DSpace Instances</a></li>
+      <li><a href="application.html#registration">Registration</a></li>
+      <li><a href="application.html#mets">METS Tools</a></li>
+      <li><a href="application.html#mediafilters">Media Filters</a></li>
+      <li><a href="application.html#filiator">Sub-Community
+Management</a></li>
+    </ul>
+  </li>
+</ul>
+<hr>
+<address> Copyright &copy;
+2002-2004 MIT and Hewlett Packard </address>
+</body>
+</html>

dspace/docs/controlledvocabulary.xsd

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+This Schema was created by the University of Minho <http://www.uminho.pt>, Department of Information Systems <http://www.dsi.uminho.pt> 
+for the Controlled-vocabulary Add-on of the HP/MIT's DSpace <http://www.dspace.org>. 
+
+For more information regarding this schema, please contact the authors: 
+Miguel Ferreira <mferreira@dsi.uminho.pt> and Ana Alice Baptista <analice@dsi.uminho.pt>; 
+or refer to the Web site http://dspace-dev.dsi.uminho.pt. 
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:element name="node">
+		<xs:annotation>
+			<xs:documentation>Element that describes a concept</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="isComposedBy" minOccurs="0">
+					<xs:annotation>
+						<xs:documentation>Contains the children of this node.</xs:documentation>
+					</xs:annotation>
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element ref="node" maxOccurs="unbounded"/>
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="isRelatedTo" minOccurs="0">
+					<xs:annotation>
+						<xs:documentation>A list of related terms</xs:documentation>
+					</xs:annotation>
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="node" maxOccurs="unbounded">
+								<xs:annotation>
+									<xs:documentation>Link to an existing node</xs:documentation>
+								</xs:annotation>
+								<xs:complexType>
+									<xs:attribute name="id" type="xs:IDREF" use="required"/>
+								</xs:complexType>
+							</xs:element>
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="hasNote" minOccurs="0">
+					<xs:annotation>
+						<xs:documentation>A note related to this term</xs:documentation>
+					</xs:annotation>
+					<xs:complexType>
+						<xs:simpleContent>
+							<xs:extension base="xs:string">
+								<xs:attribute name="type" type="xs:string"/>
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
+				</xs:element>
+			</xs:all>
+			<xs:attribute name="id" type="xs:ID" use="optional"/>
+			<xs:attribute name="label" type="xs:string" use="required"/>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

dspace/docs/directories.html

@@ -0,0 +1,173 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>DSpace System Documentation: Directories and Files</TITLE>
+    <LINK REL=StyleSheet HREF="style.css" TYPE="text/css">
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" >
+  </HEAD>
+  <BODY>
+    <H1>DSpace System Documentation: Directories and Files</H1>
+
+    <P><A HREF="index.html">Back to contents</A></P>
+
+    <H2><A NAME="overview">Overview</A></H2>
+
+    <p>A complete DSpace installation consists of three separate directory trees:
+
+    <dl>
+      <dt>The source directory:</dt>
+      <dd><p>This is where (surprise!) the source code lives.  Note that the config files here are used only during the initial install process. After the install, config files should be changed in the install directory. It is referred to in this document as <code><i>[dspace-source]</i></code>.</p></dd>
+
+      <dt>The install directory:<dt>
+      <dd><p>This directory is populated during the install process and also by DSpace as it runs.  It contains config files, command-line tools (and the libraries necessary to run them), and usually--although not necessarily--the contents of the DSpace archive (depending on how DSpace is configured). After the initial build and install, changes to config files should be made in this directory.  It is referred to in this document as <code><i>[dspace]</i></code>.<p> </dd>
+
+      <dt>The web deployment directory: </dt>
+      <dd><p>This directory is generated by the web server the first time it finds a dspace.war file in its webapps directory. It contains the unpacked contents of dspace.war, i.e. the JSPs and java classes and libraries necessary to run DSpace.  Files in this directory should never be edited directly; if you wish to modify your DSpace installation, you should edit files in the source directory and then rebuild. The contents of this directory aren't listed here since its creation is completely automatic.  It is usually referred to in this document as <code><i>[tomcat]</i>/webapps/dspace</code>.</p></dd>
+    </dl>
+
+    <H2><A NAME="sourcedir">Source Directory Layout</A></H2>
+
+    <ul>
+      <li><code><i>[dspace-source]</i></code>
+        <ul>
+          <li><code>build.xml</code> - build file for Ant</li>
+          <li><code>CHANGES</code> - Detailed list of code changes between versions</li>
+          <li><code>KNOWN_BUGS</code> - Known bugs in the current version</li>
+          <li><code>LICENSE</code> - DSpace source code license</li>
+          <li><code>README</code> - Obligatory basic information file</li>
+          <li><code>bin/</code> - Some shell and Perl scripts for running DSpace command-line tasks</li>
+          <li><code>config/</code> - configuration files
+            <ul>
+              <li><code>controlled-vocabularies/</code> - Fixed, limited vocabularies used in metadata entry</li>
+              <li><code>crosswalks/</code> - Metadata crosswalks - property files or XSL stylesheets</li>
+              <li><code>dspace.cfg</code> - main DSpace configuration file</li>
+              <li><code>dc2mods.cfg</code> - Mappings from Dublin Core metadata to <A HREF="http://www.loc.gov/standards/mods/">MODS</A> for the METS export</li>
+              <li><code>default.license</code>  - default license that users must grant when submitting items</li>
+              <li><code>dstat.cfg</code>, <code>dstat.map</code> - statistical report configuration</li>
+              <li><code>input-forms.xml</code> - Submission UI metadata field configuration</li>
+              <li><code>news-side.html</code> - Text of the front-page news in the sidebar</li>
+              <li><code>news-top.html</code> - Text of the front-page news in the top box</li>
+              <li><code>emails/</code> - Text and layout templates for emails sent out by the system</li>
+              <li><code>language-packs/</code> - contains "dictionary files" -- Java properties files that contain user interface text in different languages</li>
+              <li><code>registries/</code> - <strong>initial</strong> contents of the bitstream format registry and Dublin Core element/qualifier registry.  These are only used on initial system setup, after which they are maintained in the database.</li>
+              <li><code>templates/</code> - configuration files for libraries and external applications (e.g. Apache, Tomcat) are kept and edited here.  They can refer to properties in the main DSpace configuration - have a look at a couple.  When they're updated, a command line tool fills out these files with appropriate values from dspace.cfg, and copies them to their appropriate location (hence "templates".)</li>
+            </ul>
+          </li>
+          <li><code>docs/</code> - DSpace system documentation. The technical documentation for functionality, installation, configuration, etc.</li>
+          <li><code>etc/</code> - miscelleanous stuff need to install DSpace that isn't really to do with system configuration - e.g. the PostgreSQL database schema, and a couple of configuration files that are used during the build process but not by the live system.  Also contains the deployment descriptors (<code>web.xml</code> files) for the Web UI and OAI-PMH support <code>.war</code> files.
+            <ul>
+              <li><code>oracle/</code> - versions of the database schema and updater SQL scripts for Oracle</li>
+            </ul>
+          </li>
+          <li><code>jsp/</code> - The Web UI JSPs.  As much as possible, these are simply HTML with little bits of Java - the business code resides in the servlets</li>
+          <li><code>lib/</code> - Library JARs used by the system
+            <ul>
+              <li><code>README</code> - Lists the packages third-party libraries (JARs) and their use</li>
+              <li><code>licenses</code> - Contains the licenses associated with the JARs</li>
+            </ul>
+          </li>
+          <li><code>src/</code> - DSpace system source code.  For details on how this is laid out, see the overview page of the Javadoc.</li>
+        </ul>
+      </li>
+    </ul>
+
+
+    <H2><A NAME="installdir">Installed Directory Layout</A></H2>
+
+    <P>Below is the basic layout of a DSpace installation using the default configuration.  These paths can be configured if necessary.</P>
+
+
+    <UL>
+    <li><code><i>[dspace]</i></code>
+    <UL>
+    <li><code>assetstore/</code> - asset store files</li>
+    <li><code>bin/</code> - shell and Perl scripts</li>
+    <li><code>config/</code> - configuration, with sub-directories as above</li>
+    <li><code>handle-server/</code> - Handles server files</li>
+    <li><code>history/</code> - stored history files (generally RDF/XML)</li>
+    <li><code>lib/</code> - JARs, including dspace.jar, containing the DSpace classes</li>
+    <li><code>log/</code> - Log files</li>
+    <li><code>reports/</code> - Reports generated by statistical report generator</li>
+    <li><code>search/</code> - Lucene search index files</li>
+    <li><code>upload/</code> - temporary directory used during file uploads etc.</li>
+    </ul>
+    </ul>
+
+    <H2><A NAME="webapp">Contents of Web Application</A></H2>
+
+    <P>DSpace's Ant build file creates a <code>.war</code> file with the following structure:</P>
+
+    <UL>
+      <LI>(top level dir)
+        <UL>
+          <LI>The JSPs</LI>
+          <LI><code>WEB-INF/</code>
+            <UL>
+              <LI><code>web.xml</code> - Created from <code><i>[dspace-source]</i>/etc/dspace-web.xml</code>, appropriate filled out with configuration parameters (e.g. location of DSpace installation directory</li>
+              <LI><code>dspace-tags.tld</code> - DSpace custom tag descriptor</LI>
+              <LI><code>fmt.tld</code> - JSTL message format tag descriptor, for internationalization</LI>
+              <LI><code>lib/</code> - All the third-party JARs needed to run DSpace</lI>
+              <li><code>classes/</code> - The DSpace class files, plus all of the <code>Messages_xx.properties</code> files.  The latter are placed here so they are in the CLASSPATH and thus can be picked up as resource bundles.</LI>
+            </UL>
+          </LI>
+        </UL>
+      </LI>
+    </UL>
+
+
+
+    <H2><A NAME="logfiles">Log Files</A></H2>
+
+    <P>The first source of potential confusion is the log files.  Since DSpace uses a number of third-party tools, problems can occur in a variety of places.  Below is a table listing the main log files used in a typical DSpace setup.  The locations given are defaults, and might be different for your system depending on where you installed DSpace and the third-party tools.  The ordering of the list is roughly the recommended order for searching them for the details about a particular problem or error.</P>
+
+    <TABLE>
+      <CAPTION>DSpace Log File Locations</CAPTION>
+      <TR>
+        <TH>Log File</TH>
+        <TH>What's In It</TH>
+      </TR>
+      <TR>
+        <TD><code><i>[dspace]</i>/log/dspace.log</code></TD>
+        <TD>Main DSpace log file.  This is where the DSpace code writes a simple log of events and errors that occur within the DSpace code.  You can control the verbosity of this by editing the <code><i>[dspace]</i>/config/templates/log4j.properties</code> file and then running <code><i>[dspace]</i>/bin/install-configs</code>.</TD>
+      </TR>
+      <TR>
+        <TD><code><i>[tomcat]</i>/logs/catalina.out</code></TD>
+        <TD>This is where Tomcat's standard output is written.  Many errors that occur within the Tomcat code are logged here.  For example, if Tomcat can't find the DSpace code (<code>dspace.jar</code>), it would be logged in <code>catalina.out</code>.</TD>
+      </TR>
+      <TR>
+        <TD><code><i>[tomcat]</i>/logs/hostname_log.yyyy-mm-dd.txt</code></TD>
+        <TD>If you're running Tomcat stand-alone (without Apache), it logs some information and errors for specific Web applications to this log file.  <code>hostname</code> will be your host name (e.g. <code>dspace.myu.edu</code>) and <code>yyyy-mm-dd</code> will be the date.</TD>
+      </TR>
+      <TR>
+        <TD><code><i>[tomcat]</i>/logs/apache_log.yyyy-mm-dd.txt</code></TD>
+        <TD>If you're using Apache, Tomcat logs information about Web applications running through Apache (<code>mod_webapp</code>) in this log file (<code>yyyy-mm-dd</code> being the date.)</TD>
+      </TR>
+      <TR>
+        <TD><code><i>[apache]</i>/error_log</code></TD>
+        <TD>Apache logs to this file.  If there is a problem with getting <code>mod_webapp</code> working, this is a good place to look for clues.  Apache also writes to several other log files, though <code>error_log</code> tends to contain the most useful information for tracking down problems.</TD>
+      </TR>
+      <TR>
+        <TD><code><i>[dspace]</i>/log/handle-plug.log</code></TD>
+        <TD>The Handle server runs as a separate process from the DSpace Web UI (which runs under Tomcat's JVM).  Due to a limitation of log4j's 'rolling file appenders', the DSpace code running in the Handle server's JVM must use a separate log file.  The DSpace code that is run as part of a Handle resolution request writes log information to this file.  You can control the verbosity of this by editing <code><i>[dspace]</i>/config/templates/log4j-handle-plugin.properties</code>.</TD>
+      </TR>
+      <TR>
+        <TD><code><i>[dspace]</i>/log/handle-server.log</code></TD>
+        <TD>This is the log file for CNRI's Handle server code.  If a problem occurs within the Handle server code, before DSpace's plug-in is invoked, this is where it may be logged.</TD>
+      </TR>
+      <TR>
+        <TD><code><i>[dspace]</i>/handle-server/error.log</code></TD>
+        <TD>On the other hand, a problem with CNRI's Handle server code might be logged here.</TD>
+      </TR>
+      <TR>
+        <TD>PostgreSQL log</TD>
+        <TD>PostgreSQL also writes a log file.  This one doesn't seem to have a default location, you probably had to specify it yourself at some point during installation.  In general, this log file rarely contains pertinent information--PostgreSQL is pretty stable, you're more likely to encounter problems with connecting via JDBC, and these problems will be logged in <code>dspace.log</code>.</TD>
+      </TR>
+    </TABLE>
+
+    <HR>
+
+    <ADDRESS>
+      Copyright &copy; 2002-2005 MIT and Hewlett Packard
+    </ADDRESS>
+  </BODY>
+</HTML>

dspace/docs/functional.html

@@ -0,0 +1,648 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+
+<html>
+<head>
+  <title>DSpace System Documentation: Functional Overview</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: Functional Overview</h1>
+
+  <p><a href="index.html">Back to contents</a></p>
+
+  <p>The following sections describe the various functional aspects of the DSpace system.</p>
+
+  <h2><a name="data_model" id="data_model">Data Model</a></h2>
+
+  <p class="figure"><img src="image/data-model.gif" alt="Data Model Diagram"></p>
+
+  <p class="caption">Data Model Diagram</p>
+
+  <p>The way data is organized in DSpace is intended to reflect the structure of the organization using the DSpace system. Each DSpace site is divided into <em>communities</em>; these typically correspond to a laboratory, research center or department. As of DSpace version 1.2, these communities can be organized into an hierarchy.</p>
+
+  <p>Communities contain <em>collections</em>, which are groupings of related content. A collection may appear in more than one community.</p>
+
+  <p>Each collection is composed of <em>items</em>, which are the basic archival elements of the archive. Each item is owned by one collection. Additionally, an item may appear in additional collections; however every item has one and only one owning collection.</p>
+
+  <p>Items are further subdivided into named <em>bundles</em> of <em>bitstreams</em>. Bitstreams are, as the name suggests, streams of bits, usually ordinary computer files. Bitstreams that are somehow closely related, for example HTML files and images that compose a single HTML document, are organised into bundles.</p>
+
+  <p>In practice, most items tend to have these named bundles:</p>
+
+  <ul>
+    <li><em>ORIGINAL</em> -- the bundle with the original, deposited bitstreams</li>
+
+    <li><em>THUMBNAILS</em> -- thumbnails of any image bitstreams</li>
+
+    <li><em>TEXT</em> -- extracted full-text from bitstreams in ORIGINAL, for indexing</li>
+
+    <li><em>LICENSE</em> -- contains the deposit license that the submitter granted the host organization; in other words, specifies the rights that the hosting organization have</li>
+
+    <li><em>CC_LICENSE</em> -- contains the distribution license, if any (a <a href="http://www.creativecommons.org">Creative Commons</a> license) associated with the item. This license specifies what end users downloading the content can do with the content</li>
+  </ul>
+
+  <p>Each bitstream is associated with one <em>Bitstream Format</em>. Because preservation services may be an important aspect of the DSpace service, it is important to capture the specific formats of files that users submit. In DSpace, a bitstream format is a unique and consistent way to refer to a particular file format. An integral part of a bitstream format is an either implicit or explicit notion of how material in that format can be interpreted. For example, the interpretation for bitstreams encoded in the JPEG standard for still image compression is defined explicitly in the Standard ISO/IEC 10918-1. The interpretation of bitstreams in Microsoft Word 2000 format is defined implicitly, through reference to the Microsoft Word 2000 application. Bitstream formats can be more specific than MIME types or file suffixes. For example, <code>application/ms-word</code> and <code>.doc</code> span multiple versions of the Microsoft Word application, each of which produces bitstreams with presumably different characteristics.</p>
+
+  <p>Each bitstream format additionally has a <em>support level</em>, indicating how well the hosting institution is likely to be able to preserve content in the format in the future. There are three possible support levels that bitstream formats may be assigned by the hosting institution. The host institution should determine the exact meaning of each support level, after careful consideration of costs and requirements. MIT Libraries' interpretation is shown below:</p>
+
+  <table>
+    <caption>
+      MIT Libraries' Definitions of Bitstream Format Support Levels
+    </caption>
+
+    <tbody>
+      <tr>
+        <td><strong>Supported</strong></td>
+
+        <td>The format is recognized, and the hosting institution is confident it can make bitstreams of this format useable in the future, using whatever combination of techniques (such as migration, emulation, etc.) is appropriate given the context of need.</td>
+      </tr>
+
+      <tr>
+        <td><strong>Known</strong></td>
+
+        <td>The format is recognized, and the hosting institution will promise to preserve the bitstream as-is, and allow it to be retrieved. The hosting institution will attempt to obtain enough information to enable the format to be upgraded to the 'supported' level.</td>
+      </tr>
+
+      <tr>
+        <td><strong>Unsupported</strong></td>
+
+        <td>The format is unrecognized, but the hosting institution will undertake to preserve the bitstream as-is and allow it to be retrieved.</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <p>Each item has one qualified Dublin Core metadata record. Other metadata might be stored in an item as a serialized bitstream, but we store Dublin Core for every item for interoperability and ease of discovery. The Dublin Core may be entered by end-users as they submit content, or it might be derived from other metadata as part of an ingest process.</p>
+
+  <p><a name="deletions" id="deletions">Items can be removed from DSpace in one of two ways:</a> They may be 'withdrawn', which means they remain in the archive but are completely hidden from view. In this case, if an end-user attempts to access the withdrawn item, they are presented with a 'tombstone,' that indicates the item has been removed. For whatever reason, an item may also be 'expunged' if necessary, in which case all traces of it are removed from the archive.</p>
+
+  <table>
+    <caption>
+      Objects in the DSpace Data Model
+    </caption>
+
+    <tbody>
+      <tr>
+        <th>Object</th>
+
+        <th>Example</th>
+      </tr>
+
+      <tr>
+        <td>Community</td>
+
+        <td>Laboratory of Computer Science; Oceanographic Research Center</td>
+      </tr>
+
+      <tr>
+        <td>Collection</td>
+
+        <td>LCS Technical Reports; ORC Statistical Data Sets</td>
+      </tr>
+
+      <tr>
+        <td>Item</td>
+
+        <td>A technical report; a data set with accompanying description; a video recording of a lecture</td>
+      </tr>
+
+      <tr>
+        <td>Bundle</td>
+
+        <td>A group of HTML and image bitstreams making up an HTML document</td>
+      </tr>
+
+      <tr>
+        <td>Bitstream</td>
+
+        <td>A single HTML file; a single image file; a source code file</td>
+      </tr>
+
+      <tr>
+        <td>Bitstream&nbsp;Format</td>
+
+        <td>Microsoft Word version 6.0; JPEG encoded image format</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <h2><a name="plugin" id="plugin">Plugin Manager</a></h2>
+
+  <p>The PluginManager is a very simple component container. It creates and organizes components (plugins), and helps select a plugin in the cases where there are many possible choices. It also gives some limited control over the lifecycle of a plugin.</p>
+  <p>A plugin is defined by a Java interface. The consumer of a plugin asks for its plugin by interface. A Plugin is an instance of any class that implements the plugin interface. It is interchangeable with other implementations, so that any of them may be "plugged in".</p>
+  <p>The mediafilter is a simple example of a plugin implementation. Refer to the <a href="business.html#plugin">Business Logic Layer<a> for more details on Plugins.</p>
+
+  <h2><a name="metadata" id="metadata">Metadata</a></h2>
+
+  <p>Broadly speaking, DSpace holds three sorts of metadata about archived content:</p>
+
+  <dl>
+    <dt>Descriptive Metadata</dt>
+
+    <dd>
+	<p>DSpace can support multiple flat metadata schemas for describing an item. <p>A qualified Dublin Core metadata schema loosely based on the <a href="http://www.dublincore.org/documents/library-application-profile/">Library Application Profile</a> set of elements and qualifiers is provided by default. The <a href="http://dspace.org/technology/metadata.html">set of elements and qualifiers used by MIT Libraries</a> comes pre-configured with the DSpace source code. However, you can configure multiple schemas and select metadata fields from a mix of configured schemas to describe your items.</p>
+
+      <p>Other descriptive metadata about items (e.g. metadata described in a hierarchical schema) may be held in serialized bitstreams. <em>Communities</em> and <em>collections</em> have some simple descriptive metadata (a name, and some descriptive prose), held in the DBMS.</p>
+    </dd>
+
+    <dt>Administrative Metadata</dt>
+
+    <dd>
+      <p>This includes preservation metadata, provenance and authorization policy data. Most of this is held within DSpace's relation DBMS schema. Provenance metadata (prose) is stored in Dublin Core records. Additionally, some other administrative metadata (for example, bitstream byte sizes and MIME types) is replicated in Dublin Core records so that it is easily accessible outside of DSpace.</p>
+    </dd>
+
+    <dt>Structural Metadata</dt>
+
+    <dd>
+      <p>This includes information about how to present an item, or bitstreams within an item, to an end-user, and the relationships between constituent parts of the item. As an example, consider a thesis consisting of a number of TIFF images, each depicting a single page of the thesis. Structural metadata would include the fact that each image is a single page, and the ordering of the TIFF images/pages. Structural metadata in DSpace is currently fairly basic; within an item, bitstreams can be arranged into separate bundles as <a href="#data_model">described above</a>. A bundle may also optionally have a <em>primary bitstream</em>. This is currently used by the <a href="#html">HTML support</a> to indicate which bitstream in the bundle is the first HTML file to send to a browser.</p>
+
+      <p>In addition to some basic technical metadata, bitstreams also have a 'sequence ID' that uniquely identifies it within an item. This is used to produce a <a href="#bitstream_ids">'persistent' bitstream identifier</a> for each bitstream.</p>
+
+      <p>Additional structural metadata can be stored in serialized bitstreams, but DSpace does not currently understand this natively.</p>
+    </dd>
+  </dl>
+
+  <h2><a name="packager" id="packager">Packager Plugins</a></h2>
+
+  <p><em>Packagers</em> are software modules that translate between
+  DSpace Item objects and a self-contained external representation,
+  or "package".  A <em>Package Ingester</em> interprets, or <em>ingests</em>,
+  the package and creates an Item.  A <em>Package Disseminator</em>
+  writes out the contents of an Item in the package format.</p>
+
+  <p>A package is typically an archive file such as a Zip or "tar" file,
+  including a <em>manifest</em> document which contains metadata and
+  a description of the package contents. The <a href="http://www.imsglobal.org/content/packaging/">IMS Content       Package</a> is a typical packaging standard.  A package might also be a single
+  document or media file that contains its own metadata, such as a PDF
+  document with embedded descriptive metadata.</p>
+
+  <p>Package ingesters and package disseminators are each a type of named
+  plugin (see <a href="#plugin">Plugin Manager</a>), so it is easy to
+  add new packagers specific to the needs of your site.  You do not have
+  to supply both an ingester and disseminator for each format; it is
+  perfectly acceptable to just implement one of them.</p>
+
+  <p>Most packager plugins call upon Crosswalk plugins to translate
+  the metadata between DSpace's object model and the package format.</p>
+
+  <h2><a name="crosswalk" id="crosswalk">Crosswalk Plugins</a></h2>
+
+  <p><em>Crosswalks</em> are software modules that translate between
+  DSpace object metadata and a specific external representation.
+  An <em>Ingestion Crosswalk</em> interprets the external format
+  and crosswalks it to DSpace's internal data structure, while a
+  <em>Dissemination Crosswalk</em> does the opposite.</p>
+
+  <p>For example, a MODS ingestion crosswalk translates descriptive metadata
+  from the MODS format to the metadata fields on a DSpace Item.
+  A MODS dissemination crosswalk generates a MODS document from the
+  metadata on a DSpace Item.</p>
+
+  <p>Crosswalk plugins are named plugins see <a href="#plugin">Plugin Manager</a>), so it is easy to add
+  new crosswalks. You do not have to supply both an ingester and disseminator for each format; it is
+  perfectly acceptable to just implement one of them.</p>
+
+  <p>There is also a special pair of crosswalk plugins which use XSL
+  stylesheets to translate the external metadata to or from an internal
+  DSpace format.  You can add and modify XSLT crosswalks simply by editing
+  the DSpace configuration and the stylesheets, which are stored in
+  files in the DSpace installation directory.</p>
+
+  <p>The <a href="#packager">Packager plugins</a> and <a href="#oai">OAH-PMH server</a> make use of crosswalk plugins.</p>
+
+  <h2><a name="epeople" id="epeople">E-People and Groups</a></h2>
+
+  <p>Although many of DSpace's functions such as document discovery and retrieval can be used anonymously, some features (and perhaps some documents) are only available to certain "privileged" users. E-People and Groups are the way DSpace identifies application users for the purpose of granting privileges. This identity is bound to a session of a DSpace application such as the Web UI or one of the command-line batch programs. Both E-People and Groups are granted privileges by the <a href="#auth">authorization</a> system described below.</p>
+
+  <h3>E-Person</h3>
+  <p>DSpace hold the following information about each e-person:</p>
+
+  <ul>
+    <li>E-mail address</li>
+
+    <li>First and last names</li>
+
+    <li>Whether the user is able to log in to the system via the Web UI, and whether they must use an X509 certificate to do so;</li>
+
+    <li>A password (encrypted), if appropriate</li>
+
+    <li>A list of collections for which the e-person wishes to be notified of new items</li>
+
+    <li>Whether the e-person 'self-registered' with the system; that is, whether the system created the e-person record automatically as a result of the end-user independently registering with the system, as opposed to the e-person record being generated from the institution's personnel database, for example.</li>
+
+    <li>The network ID for the corresponding LDAP record</li>
+  </ul>
+
+  <h3>Groups</h3>
+
+  <p>Groups are another kind of entity that can be granted permissions in the <a href="#auth">authorization</a> system.  A group is usually an explicit list of E-People; anyone identified as one of those E-People
+also gains the privileges granted to the group.</p>
+
+  <p>However, an application session can be assigned membership in a group <em>without</em> being identified as an E-Person.  For example, some sites use this feature to identify users of a local network so they can read
+restricted materials not open to the whole world.  Sessions originating from the local network are given membership in the "LocalUsers" group and gain the corresonding privileges.</p>
+
+  <p>Administrators can also use groups as "roles" to manage the granting
+     of privileges more efficiently.</p>
+
+  <h2><a name="authentication" id="authentication">Authentication</a></h2>
+
+  <p><em>Authentication</em> is when an application session positively identifies itself as belonging to an E-Person and/or Group. In DSpace 1.4, it is implemented by a mechanism called <em>Stackable Authentication</em>:
+the DSpace configuration declares a "stack" of authentication methods.  An application (like the Web UI)
+calls on the Authentication Manager, which tries each of these methods in turn to identify the E-Person to which
+the session belongs, as well as any extra Groups. The E-Person authentication methods are tried in turn until one succeeds. Every authenticator in the stack is given a chance to assign extra Groups.
+This mechanism offers the following advantages:
+  <ul>
+	<li>Separates authentication from the Web user interface so the same authentication methods are used for other applications such as non-interactive Web Services</li>
+        <li>Improved modularity: The authentication methods are all independent of each other.
+Custom authentication methods can be "stacked" on top of the default DSpace username/password method.</li>
+        <li>Cleaner support for "implicit" authentication where username is found in the environment of a Web request, e.g. in an X.509 client certificate.</li>
+  </ul></p>
+
+  <h2><a name="auth" id="auth">Authorization</a></h2>
+
+  <p>DSpace's authorization system is based on associating actions with objects and the lists of EPeople who can perform them. The associations are called Resource Policies, and the lists of EPeople are called Groups. There are two special groups: 'administrators', who can do anything in a site, and 'anonymous', which is a list that contains all users. Assigning a policy for an action on an object to anonymous means giving everyone permission to do that action. (For example, most objects in DSpace sites have a policy of 'anonymous' READ.) Permissions must be explicit - lack of an explicit permission results in the default policy of 'deny'. Permissions also do not 'commute'; for example, if an e-person has READ permission on an item, they might not necessarily have READ permission on the bundles and bitstreams in that item. Currently Collections, Communities and Items are discoverable in the browse and search systems regardless of READ authorization.</p>
+
+  <p>The following actions are possible:</p>
+
+  <p><strong>Community</strong></p>
+
+  <table>
+    <tbody>
+      <tr>
+        <td>ADD/REMOVE</td>
+
+        <td>add or remove collections or sub-communities</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <p><strong>Collection</strong></p>
+
+  <table>
+    <tbody>
+      <tr>
+        <td>ADD/REMOVE</td>
+
+        <td>add or remove items (ADD = permission to submit items)</td>
+      </tr>
+
+      <tr>
+        <td>DEFAULT_ITEM_READ</td>
+
+        <td>inherited as READ by all submitted items</td>
+      </tr>
+
+      <tr>
+        <td>DEFAULT_BITSTREAM_READ</td>
+
+        <td>inherited as READ by bitstreams of all submitted items</td>
+      </tr>
+
+      <tr>
+        <td>COLLECTION_ADMIN</td>
+
+        <td>collection admins can edit items in a collection, withdraw items, map other items into this collection.</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <p><strong>Item</strong></p>
+
+  <table>
+    <tbody>
+      <tr>
+        <td>ADD/REMOVE</td>
+
+        <td>add or remove bundles</td>
+      </tr>
+
+      <tr>
+        <td>READ</td>
+
+        <td>can view item (item metadata is always viewable)</td>
+      </tr>
+
+      <tr>
+        <td>WRITE</td>
+
+        <td>can modify item</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <p><strong>Bundle</strong></p>
+
+  <table>
+    <tbody>
+      <tr>
+        <td>ADD/REMOVE</td>
+
+        <td>add or remove bitstreams to a bundle</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <p><strong>Bitstream</strong></p>
+
+  <table>
+    <tbody>
+      <tr>
+        <td>READ</td>
+
+        <td>view bitstream</td>
+      </tr>
+
+      <tr>
+        <td>WRITE</td>
+
+        <td>modify bitstream</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <p>Note that there is no 'DELETE' action. In order to 'delete' an object (e.g. an item) from the archive, one must have REMOVE permission on all objects (in this case, collection) that contain it. The 'orphaned' item is automatically deleted.</p>
+
+  <p>Policies can apply to individual e-people or groups of e-people.</p>
+
+  <h2><a name="ingest" id="ingest">Ingest Process and Workflow</a></h2>
+
+  <p>Rather than being a single subsystem, ingesting is a process that spans several. Below is a simple illustration of the current ingesting process in DSpace.</p>
+
+  <p class="figure"><img src="image/ingest.gif" alt="Ingest Process Diagram"></p>
+
+  <p class="caption">DSpace Ingest Process</p>
+
+  <p>The batch item importer is an application, which turns an external SIP (an XML metadata document with some content files) into an "in progress submission" object. The Web submission UI is similarly used by an end-user to assemble an "in progress submission" object.</p>
+
+  <p>Depending on the policy of the collection to which the submission in targeted, a workflow process may be started. This typically allows one or more human reviewers or 'gatekeepers' to check over the submission and ensure it is suitable for inclusion in the collection.</p>
+
+  <p>When the Batch Ingester or Web Submit UI completes the InProgressSubmission object, and invokes the next stage of ingest (be that workflow or item installation), a provenance message is added to the Dublin Core which includes the filenames and checksums of the content of the submission. Likewise, each time a workflow changes state (e.g. a reviewer accepts the submission), a similar provenance statement is added. This allows us to track how the item has changed since a user submitted it. (The <a href="#history">History system</a> is also invoked, but provenance is easier for us to access at the moment.)</p>
+
+  <p>Once any workflow process is successfully and positively completed, the InProgressSubmission object is consumed by an "item installer", that converts the InProgressSubmission into a fully blown archived item in DSpace. The item installer:</p>
+
+  <ul>
+    <li>Assigns an accession date</li>
+
+    <li>Adds a "date.available" value to the Dublin Core metadata record of the item</li>
+
+    <li>Adds an issue date if none already present</li>
+
+    <li>Adds a provenance message (including bitstream checksums)</li>
+
+    <li>Assigns a <a href="#handles">Handle</a> persistent identifier</li>
+
+    <li>Adds the item to the target collection, and adds appropriate authorization policies</li>
+
+    <li>Adds the new item to the search and browse indices</li>
+  </ul>
+
+  <h3>Workflow Steps</h3>
+
+  <p>A collection's workflow can have up to three steps. Each collection may have an associated e-person group for performing each step; if no group is associated with a certain step, that step is skipped. If a collection has no e-person groups associated with any step, submissions to that collection are installed straight into the main archive.</p>
+
+  <p>In other words, the sequence is this: The collection receives a submission. If the collection has a group assigned for workflow step 1, that step is invoked, and the group is notified. Otherwise, workflow step 1 is skipped. Likewise, workflow steps 2 and 3 are performed if and only if the collection has a group assigned to those steps.</p>
+
+  <p>When a step is invoked, the task of performing that workflow step put in the 'task pool' of the associated group. One member of that group takes the task from the pool, and it is then removed from the task pool, to avoid the situation where several people in the group may be performing the same task without realizing it.</p>
+
+  <p>The member of the group who has taken the task from the pool may then perform one of three actions:</p>
+
+  <table>
+    <tbody>
+      <tr>
+        <th>Workflow&nbsp;Step</th>
+
+        <th>Possible actions</th>
+      </tr>
+
+      <tr>
+        <td>1</td>
+
+        <td>Can accept submission for inclusion, or reject submission.</td>
+      </tr>
+
+      <tr>
+        <td>2</td>
+
+        <td>Can edit metadata provided by the user with the submission, but cannot change the submitted files. Can accept submission for inclusion, or reject submission.</td>
+      </tr>
+
+      <tr>
+        <td>3</td>
+
+        <td>Can edit metadata provided by the user with the submission, but cannot change the submitted files. Must then commit to archive; may not reject submission.</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <p class="figure"><img src="image/workflow.gif" alt="Submission Workflow Diagram"></p>
+
+  <p class="caption">Submission Workflow in DSpace</p>
+
+  <p>If a submission is rejected, the reason (entered by the workflow participant) is e-mailed to the submitter, and it is returned to the submitter's 'My DSpace' page. The submitter can then make any necessary modifications and re-submit, whereupon the process starts again.</p>
+
+  <p>If a submission is 'accepted', it is passed to the next step in the workflow. If there are no more workflow steps with associated groups, the submission is installed in the main archive.</p>
+
+  <p>One last possibility is that a workflow can be 'aborted' by a DSpace site administrator. This is accomplished using the administration UI.</p>
+
+  <p>The reason for this apparently arbitrary design is that is was the simplist case that covered the needs of the early adopter communities at MIT. The functionality of the workflow system will no doubt be extended in the future.</p>
+
+
+  <h2><a name="supervision" id="supervision">Supervision and Collaboration</a></h2>
+  
+  <p>In order to facilitate, as a primary objective, the opportunity for thesis authors to be supervised in the preparation of their e-thesis,
+  a supervision order system exists to bind groups of other users (thesis supervisors) to an item in someone's pre-submission workspace.  The bound group can have
+  system policies associated with it that allow different levels of interaction with the student's item; a small set of default policy groups are
+  provided:</p>
+  
+  <ul>
+  	<li>Full editorial control
+  	<li>View item contents
+  	<li>No policies
+  </ul>
+  
+  <p>Once the default set has been applied, a system administrator may modify them as they would any other policy set in DSpace</p>
+  
+  <p>This functionality could also be used in situations where researchers wish to collaborate on a particular submission, although there
+  is no particular collaborative workspace functionality.</p>
+
+
+  <h2><a name="handles" id="handles">Handles</a></h2>
+
+  <p>Researchers require a stable point of reference for their works. The simple evolution from sharing of citations to emailing of URLs broke when Web users learned that sites can disappear or be reconfigured without notice, and that their bookmark files containing critical links to research results couldn't be trusted long term. To help solve this problem, a core DSpace feature is the creation of persistent identifier for every item, collection and community stored in DSpace. To persist identifier, DSpace requires a storage- and location- independent mechanism for creating and maintaining identifiers. DSpace uses the <a href="http://www.handle.net/">CNRI Handle System</a> for creating these identifiers. The rest of this section assumes a basic familiarity with the Handle system.</p>
+
+  <p>DSpace uses Handles primarily as a means of assigning globally unique identifiers to objects. Each site running DSpace needs to obtain a Handle 'prefix' from CNRI, so we know that if we create identifiers with that prefix, they won't clash with identifiers created elsewhere.</p>
+
+  <p>Presently, Handles are assigned to communities, collections, and items. Bundles and bitstreams are not assigned Handles, since over time, the way in which an item is encoded as bits may change, in order to allow access with future technologies and devices. Older versions may be moved to off-line storage as a new standard becomes de facto. Since it's usually the <em>item</em> that is being preserved, rather than the particular bit encoding, it only makes sense to persistently identify and allow access to the item, and allow users to access the appropriate bit encoding from there.</p>
+
+  <p>Of course, it may be that a particular bit encoding of a file is explicitly being preserved; in this case, the bitstream could be the only one in the item, and the item's Handle would then essentially refer just to that bitstream. The same bitstream can also be included in other items, and thus would be citable as part of a greater item, or individually.</p>
+
+  <p>The Handle system also features a global resolution infrastructure; that is, an end-user can enter a Handle into any service (e.g. Web page) that can resolve Handles, and the end-user will be directed to the object (in the case of DSpace, community, collection or item) identified by that Handle. In order to take advantage of this feature of the Handle system, a DSpace site must also run a 'Handle server' that can accept and resolve incoming resolution requests. All the code for this is included in the DSpace source code bundle.</p>
+
+  <p>Handles can be written in two forms:</p>
+  <pre>
+hdl:1721.123/4567
+http://hdl.handle.net/1721.123/4567
+</pre>
+
+  <p>The above represent the same Handle. The first is possibly more convenient to use only as an identifier; however, by using the second form, any Web browser becomes capable of resolving Handles. An end-user need only access this form of the Handle as they would any other URL. It is possible to enable some browsers to resolve the first form of Handle as if they were standard URLs using <a href="http://www.handle.net/resolver/index.html">CNRI's Handle Resolver plug-in</a>, but since the first form can always be simply derived from the second, DSpace displays Handles in the second form, so that it is more useful for end-users.</p>
+
+  <p>It is important to note that DSpace uses the CNRI Handle infrastructure only at the 'site' level. For example, in the above example, the DSpace site has been assigned the prefix '1721.123'. It is still the responsibility of the DSpace site to maintain the association between a full Handle (including the '4567' local part) and the community, collection or item in question.</p>
+
+  <h2><a name="bitstream_ids" id="bitstream_ids">Bitstream 'Persistent' Identifiers</a></h2>
+
+  <p>As of DSpace 1.2, bitstreams in DSpace also have more persistent identifiers. They are more volatile than Handles, since if the content is moved to a different server or organizaion, they will no longer work (hence the quotes around 'persistent'). However, they are more easily persisted than the simple URLs based on database primary key previously used. This means that external systems can more reliably refer to specific bitstreams stored in a DSpace instance.</p>
+
+  <p>Each bitstream has a sequence ID, unique within an item. This sequence ID is used to create a persistent ID, of the form:</p>
+
+  <p><code><em>dspace url</em>/bitstream/<em>handle</em>/<em>sequence ID</em>/<em>filename</em></code></p>
+
+  <p>For example:</p>
+  <pre>
+https://dspace.myu.edu/bitstream/123.456/789/24/foo.html
+</pre>
+
+  <p>The above refers to the bitstream with sequence ID 24 in the item with the Handle <code>hdl:123.456/789</code>. The <code>foo.html</code> is really just there as a hint to browsers: Although DSpace will provide the appropriate MIME type, some browsers only function correctly if the file has an expected extension.</p>
+
+  <h2><a name="srb" id="srb">Storage Resource Broker (SRB) Support</a></h2>
+
+  <p>DSpace offers two means for storing bitstreams. The first is in the file system on the server. The second is using <a href="http://www.sdsc.edu/srb">SRB (Storage Resource Broker)</a>. Both are achieved using a simple, lightweight API.</P>
+
+  <P>SRB is purely an option but may be used in lieu of the server's file system or in addition to the file system. Without going into a full description, SRB is a very robust, sophisticated storage manager that offers essentially unlimited storage and straightforward means to replicate (in simple terms, backup) the content on other local or remote storage resources.</P>
+
+  <h2><a name="search_browse" id="search_browse">Search and Browse</a></h2>
+
+  <p>DSpace allows end-users to discover content in a number of ways, including:</p>
+
+  <ul>
+    <li>Via external reference, such as a Handle</li>
+
+    <li>Searching for one or more keywords in metadata or extracted full-text</li>
+
+    <li>Browsing though title, author, date or subject indices, with optional image thumbnails</li>
+  </ul>
+
+  <p>Search is an essential component of discovery in DSpace. Users' expectations from a search engine are quite high, so a goal for DSpace is to supply as many search features as possible. DSpace's indexing and search module has a very simple API which allows for indexing new content, regenerating the index, and performing searches on the entire corpus, a community, or collection. Behind the API is the Java freeware search engine <a href="http://jakarta.apache.org/lucene/">Lucene</a>. Lucene gives us fielded searching, stop word removal, stemming, and the ability to incrementally add new indexed content without regenerating the entire index. As of DSpace 1.2.1 the Lucene search indexes are configurable, enabling institutions to customise which DSpace metadata fields are indexed.</p>
+
+  <p>Another important mechanism for discovery in DSpace is the browse. This is the process whereby the user views a particular index, such as the title index, and navigates around it in search of interesting items. The browse subsystem provides a simple API for achieving this by allowing a caller to specify an index, and a subsection of that index. The browse subsystem then discloses the portion of the index of interest. Indices that may be browsed are item title, item issue date, item author, and subject terms. Additionally, the browse can be limited to items within a particular collection or community.</p>
+
+  <h2><a name="html" id="html">HTML Support</a></h2>
+
+  <p>For the most part, at present DSpace simply supports uploading and downloading of bitstreams as-is. This is fine for the majority of commonly-used file formats -- for example PDFs, Microsoft Word documents, spreadsheets and so forth. HTML documents (Web sites and Web pages) are far more complicated, and this has important ramifications when it comes to digital preservation:</p>
+
+  <ul>
+    <li>
+      <p>Web pages tend to consist of several files -- one or more HTML files that contain references to each other, and stylesheets and image files that are referenced by the HTML files.</p>
+    </li>
+
+    <li>
+      <p>Web pages also link to or include content from other sites, often imperceptably to the end-user. Thus, in a few year's time, when someone views the preserved Web site, they will probably find that many links are now broken or refer to other sites than are now out of context.</p>
+
+      <p>In fact, it may be unclear to an end-user when they are viewing content stored in DSpace and when they are seeing content included from another site, or have navigated to a page that is not stored in DSpace. This problem can manifest when a submitter uploads some HTML content. For example, the HTML document may include an image from an external Web site, or even their local hard drive. When the submitter views the HTML in DSpace, their browser is able to use the reference in the HTML to retrieve the appropriate image, and so to the submitter, the whole HTML document appears to have been deposited correctly. However, later on, when another user tries to view that HTML, their browser might not be able to retrieve the included image since it may have been removed from the external server. Hence the HTML will seem broken.</p>
+    </li>
+
+    <li>
+      <p>Often Web pages are produced dynamically by software running on the Web server, and represent the state of a changing database underneath it.</p>
+    </li>
+  </ul>
+
+  <p>Dealing with these issues is the topic of much active research. Currently, DSpace bites off a small, tractable chunk of this problem. DSpace can store and provide on-line browsing capability for <em>self-contained, non-dynamic</em> HTML documents. In practical terms, this means:</p>
+
+  <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' 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>../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>/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>
+
+    <li>Any 'absolute links' (e.g. <code>http://somedomain.com/content.html</code>) are stored 'as is', and will continue to link to the external content (as opposed to relative links, which will link to the copy of the content stored in DSpace.) Thus, over time, the content refered to by the absolute link may change or disappear.</li>
+  </ul>
+
+  <h2><a name="oai" id="oai">OAI Support</a></h2>
+
+  <p>The <a href="http://www.openarchives.org/">Open Archives Initiative</a> has developed a <a href="http://www.openarchives.org/OAI/openarchivesprotocol.html">protocol for metadata harvesting</a>. This allows sites to programmatically retrieve or 'harvest' the metadata from several sources, and offer services using that metadata, such as indexing or linking services. Such a service could allow users to access information from a large number of sites from one place.</p>
+
+  <p>DSpace exposes the Dublin Core metadata for items that are publicly (anonymously) accessible. Additionally, the collection structure is also exposed via the OAI protocol's 'sets' mechanism. OCLC's open source <a href="http://www.oclc.org/research/software/oai/cat.shtm">OAICat</a> framework is used to provide this functionality.</p>
+
+  <p>You can also configure the OAI service to make use of any <a href="#crosswalk">crosswalk plugin</a> to offer additional metadata formats, such as MODS.</p>
+
+  <p>DSpace's OAI service does support the exposing of deletion information for withdrawn items, but not for items that are 'expunged' (<a href="#deletions">see above</a>). DSpace also supports OAI-PMH resumption tokens.</p>
+
+  <h2><a name="openurl" id="openurl">OpenURL Support</a></h2>
+
+  <p>DSpace supports the <a href="http://www.sfxit.com/OpenURL/">OpenURL protocol</a> from <a href="http://www.sfxit.com/">SFX</a>, in a rather simple fashion. If your institution has an SFX server, DSpace will display an OpenURL link on every item page, automatically using the Dublin Core metadata. Additionally, DSpace can respond to incoming OpenURLs. Presently it simply passes the information in the OpenURL to the search subsystem. A list of results is then displayed, which usually gives the relevant item (if it is in DSpace) at the top of the list.</p>
+
+  <h2><a name="creativecommons" id="creativecommons">Creative Commons Support</a></h2>
+
+  <p>Dspace provides support for Creative Commons licenses to be attached to items in the repository. They represent an alternative to traditional copyright. To learn more about Creative Commons, visit <a href="http://creativecommons.org">their website</a>. Support for the licenses is controlled by a site-wide configuration option, and since license selection involves redirection to the Creative Commons website, additional parameters may be configured to work with a proxy server. If the option is enabled, users may select a Creative Commons license during the submission process, or elect to skip Creative Commons licensing. If a selection is made a copy of the license text and RDF metadata is stored along with the item in the repository. There is also an indication - text and a Creative Commons icon - in the item display page of the web user interface when an item is licensed under Creative Commons.</p>
+
+  <h2><a name="subscriptions" id="subscriptions">Subscriptions</a></h2>
+
+  <p>As <a href="#epeople">noted above</a>, end-users (e-people) may 'subscribe' to collections in order to be alerted when 
+new items appear in those collections. Each day, end-users who are subscribed to one or more collections will receive an 
+e-mail giving brief details of all new items that appeared in any of those collections the previous day. If no new items 
+appeared in any of the subscribed collections, no e-mail is sent. Users can unsubscribe themselves at any time. RSS feeds 
+of new items are also available for collections and communities.</p>
+
+  <h2><a name="history" id="history">History</a></h2>
+
+  <p>While provenance information in the form of prose is very useful, it is not easily programmatically manipulated. The History system captures a time-based record of significant changes in DSpace, in a manner suitable for later 'refactoring' or repurposing.</p>
+
+  <p>Currently, the History subsystem is explicitly invoked when significant events occur (e.g., DSpace accepts an item into the archive). The History subsystem then creates RDF data describing the current state of the object. The RDF data is modeled using <a href="http://www.metadata.net/harmony/">Harmony/ABC</a>, an ontology for describing temporal-based data, and stored in the file system. Some simple indices for unwinding the data are available.</p>
+
+  <h2><a name="importexport" id="importexport">Import and Export</a></h2>
+
+  <p>DSpace also includes batch tools to import and export items in a simple directory structure, where the Dublin Core metadata is stored in an XML file. This may be used as the basis for moving content between DSpace and other systems.</p>
+
+  <p>There is also a METS-based export tool, which exports items as METS-based metadata with associated bitstreams referenced from the METS file.</p>
+
+  <h2><a name="registration" id="registration">Registration</a></h2>
+
+  <p>Registration is an alternate means of incorporating items, their metadata, and their bitstreams into DSpace by taking advantage of the bitstreams already being in accessible computer storage. An example might be that there is a repository for existing digital assets. Rather than using the normal <a href="#ingest">interactive ingest process</a> or the <a href="#importexport">batch import</a> to furnish DSpace the metadata and to upload bitstreams, registration provides DSpace the metadata and the <span style="font-style: italic;">location</span> of the bitstreams. DSpace uses a variation of the import tool to accomplish registration.</p>
+
+  <h2><a name="statistics">Statistics</a></h2>
+
+  <p>Various statistical report about the contents and use of your system can be automatically generated by the system.  These are generated by analysing DSpace's log files.  Statistics can be broken down monthly.</P>
+
+  <P>The report includes data such as:</P>
+
+  <UL>
+  	<LI>A customisable general summary of activities in the archive, by default including:
+  	  <ul>
+  	  	<li>Number of item views</li>
+  	  	<li>Number of collection visits</li>
+  	  	<li>Number of community visits</li>
+  	  	<li>Number of OAI Requests</li>
+  	  </ul></li>
+  	<LI>Customisable summary of archive contents</LI>
+  	<li>Broken-down list of item viewings</li>
+    <LI>A full break-down of all system activity</li>
+    <li>User logins</li>
+    <li>Most popular searches</li>
+  </ul>
+
+  <p>The results of statistical analysis can be presented on a by-month and an in-total report, and are available via the user interface.  The
+  reports can also either be made public or restricted to administrator access only.</p>
+  
+  <h2><a name="checker" id="checker">Checksum Checker</a></h2>
+  
+  <p>The purpose of the checker is to verify that the content in a DSpace repository has not become corrupted or been tampered with. The functionality can be invoked on an ad-hoc basis from the command line, or configured via cron or similar. Options exist to support large repositories that cannot be entirely checked in one run of the tool. The tool is extensible to new reporting and checking priority approaches.
+  </p>
+
+  <hr>
+
+  <address>
+    Copyright &copy; 2002-2006 MIT and Hewlett Packard
+  </address>
+</body>
+</html>

dspace/docs/history.html

@@ -0,0 +1,553 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html>
+<head>
+  <title>DSpace System Documentation: Version History</title>
+  <link rel="StyleSheet" href="style.css" type="text/css">
+  <meta http-equiv="Content-Type"
+ content="text/html; charset=iso-8859-1">
+</head>
+<body>
+<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>
+
+<ul>
+   <li>Content verification through periodic checksum checking</li>
+   <li>Support for branded preview image</li>
+   <li>Add/replace Creative Commons in 'edit item' tool</li>
+   <li>Customisable item listing columns and browse indices</li>
+   <li>Script for updating handle prefixes (e.g. for moving from development to production)</li>
+   <li>Configurable boolean search operator</li>
+   <li>Controlled vocabulary patch to provide search on classification terms, and addition of terms during submission.</li>
+   <li>Add 'visibility' element to input-forms.xml</li>
+   <li>Browse by subject feature</li>
+   <li>Log4J enhancement to use XML configuration</li>
+   <li>QueryArgs class can support any number of fields in advanced search.</li>
+   <li>Community names no longer have to be unique</li>
+   <li>Enhanced Windows support</li>
+   <li>Support for multiple (flat) metadata schemas</li>
+   <li>Suggest an item page</li>
+   <li>RSS Feeds</li>
+   <li>Performance enhancements</li>
+   <li>Stackable authentication methods</li>
+   <li>Plug-in manager</li>
+   <li>Pluggable SIP/DIP support and metadata crosswalks</li>
+   <li>Nested groups of e-people</li>
+   <li>Expose METS and MPEG-21 DIDL DIPs via OAI-PMH</li>
+   <li>Configurable Lucene search analyzer (e.g. for Chinese metadata)</li>
+   <li>Support for SMTP servers requiring authentication</li>
+</ul>
+
+<h3>Bug fixes</h3>
+
+<ul>
+   <li>1358197 - Edit Item, empty DC fields not removable</li>
+   <li>1363633 - Submission step 1 fails when there are no collections</li>
+   <li>1255264 - Resource policy eperson value was set to wrong column</li>
+   <li>1380494 - Error deleting an item with multiple metadata schema support</li>
+   <li>1443649 - Cannot configure unqualified elements for advanced search index</li>
+   <li>1333687 - Browse-(title|date) fails on withdrawn item</li>
+   <li>1066713 - Two (sub)communities cannot have one name</li>
+   <li>1284055 - Two Communities of same name throws error</li>
+   <li>1035366 - Bitstream size column should be bigint</li>
+   <li>1352257 - Selecting a Group for GroupToGroup while Creating Collection</li>
+   <li>1352226 - Navigation and Sorting in Group List (Select Groups) fails</li>
+   <li>1348276 - Null in collection name causes OAI ListSets to fail</li>
+   <li>1160898 - dspace_migrate removes Date.Issued from prev published items</li>
+   <li>1261191 - Malformed METS metadata exported</li>
+</ul>
+
+
+<h2><a name="version1_3_2">Changes in DSpace 1.3.2</a></h2>
+
+<h3>General Improvements</h3>
+
+<ul>
+   <li>DSpace UI XHTML/WAI compliant</li>
+   <li>Configure metadata fields shown on simple item display</li>
+   <li>Supervisor/workspace help documentation</li>
+</ul>
+
+<h3>Bug fixes</h3>
+<ul>
+   <li>Oracle compatibility fixes</li>
+   <li>Item exporter now correctly exports metadata in UTF-8</li>
+   <li>fixed to handle 'null' values passed in</li>
+</ul>
+
+<h2><a name="version1_3_1">Changes in DSpace 1.3.1</a></h2>
+
+<h3>Bug fixes</h3>
+<ul>
+   <li>1252153 - Error on fresh install</li>
+</ul>
+
+
+<h2><a name="version1_3">Changes in DSpace 1.3</a></h2>
+
+<h3>General Improvements</h3>
+
+<ul>
+    <li>Initial i18n Support for JSPs - Note: the implementation of this feature required changes to almost all JSP pages</li>
+    <li>LDAP authentication support</li>
+    <li>Log file analysis and report generation</li>
+    <li>Configurable item licence viewing</li>
+    <li>Supervision order/collaborative workspace administrative tools</li>
+    <li>Basic workspace for submissions in progress, with support for supervision</li>
+    <li>SRB storage system option</li>
+    <li>Updated handle server system</li>
+    <li>Database optimisations</li>
+    <li>Latest versions of Xerces, Xalan and OAICAT jars</li>
+    <li>Various documentation additions and cleanups</li>
+</ul>
+
+<h3>Bug fixes</h3>
+<ul>
+   <li>1161459 - ItemExporter fails with Too many open files</li>
+   <li>1167373 - Email date field not populated</li>
+   <li>1193948 - New item submit problem</li>
+   <li>1188132 - NullPointerException when Adding EPerson</li>
+   <li>1188016 - Cannot Edit an Eperson</li>
+   <li>1219701 - Unable to open unfinished submission</li>
+   <li>1206836 - community strengths not reflecting sub-community
+   <li>1238262 - Submit UI nav/progress buttons no longer show progress</li>
+   <li>1238276 - Double quote problem in some fields in submit UI</li>
+   <li>1238277 - format support level not shown in "uploaded file" page</li>
+   <li>1242548 - Uploading non-existing files</li>
+   <li>1244743 - Bad lookup key for special case of DC Title in ItemTag.java</li>
+   <li>1245223 - Subscription Emailer fails</li>
+   <li>1247508 - Error when browsing item with no content/bitstream collections</li>
+   <li>Set the content type in the HTTP header</li>
+   <li>Fix issue where EPerson edit would not work due to form indexing (partial fix)</li>
+   <li>POST handling in HTMLServlet</li>
+   <li>Missing ContentType directives added to some JSPs</li>
+   <li>Name dependency on Collection Admin and Submitter groups fixed</li>
+   <li>Fixed OAI-PMH XML encoding</li>
+</ul>
+
+
+<h2><a name="version1_2_2">Changes in DSpace 1.2.2</a></h2>
+
+<H3>General Improvements</h3>
+
+<ul>
+  <li>Customisable submission forms added</li>
+  <li>Configurable number of index terms in Lucene for full-text indexing</li>
+  <li>Improved scalability in media filter</li>
+  <li>Submit button on collection pages only appears if user has authorisation</li>
+  <li>PostgreSQL 8.0 compatibility</li>
+  <li>Search scope retention to improve browsing</li>
+  <li>Community and collection strengths displayed</li>
+  <li>Upgraded OAICat software</li>
+</ul>
+
+<h3>Bug fixes</h3>
+<ul>
+  <li>Fix for Oracle too many cursors problem.</li>
+  <li>Fix for UTF-8 encoded searches in advanced search.</li>
+  <li>Fix for handling "\" in bitstream names.</li>
+  <li>Fix to prevent delete of "unknown" bitstream format</li>
+  <li>Fix for ItemImport creating new handles for replaced items</li>
+</ul>
+
+<H3><A NAME="jsp-changes-1_2_1-1_2_2">Changes in JSPs</A></H3>
+
+<ul>
+<li><code>collection-home.jsp</code> <em>changed</em></li>
+<li><code>community-home.jsp</code> <em>changed</em></li>
+<li><code>community-list.jsp</code> <em>changed</em></li>
+<li><code>home.jsp</code> <em>changed</em></li>
+<li><code>dspace-admin/list-formats.jsp</code> <em>changed</em></li>
+<li><code>dspace-admin/wizard-questions.jsp</code> <em>changed</em></li>
+<li><code>search/results.jsp</code> <em>changed</em></li>
+<li><code>submit/cancel.jsp</code> <em>changed</em></li>
+<li><code>submit/change-file-description.jsp</code> <em>changed</em></li>
+<li><code>submit/choose-file.jsp</code> <em>changed</em></li>
+<li><code>submit/complete.jsp</code> <em>changed</em></li>
+<li><code>submit/creative-commons.jsp</code> <em>changed</em></li>
+<li><code>submit/edit-metadata.jsp</code> <em>new</em></li>
+<li><code>submit/get-file-format.jsp</code> <em>changed</em></li>
+<li><code>submit/initial-questions.jsp</code> <em>changed</em></li>
+<li><code>submit/progressbar.jsp</code> <em>changed</em></li>
+<li><code>submit/review.jsp</code> <em>changed</em></li>
+<li><code>submit/select-collection.jsp</code> <em>changed</em></li>
+<li><code>submit/show-license.jsp</code> <em>changed</em></li>
+<li><code>submit/show-uploaded-file.jsp</code> <em>changed</em></li>
+<li><code>submit/upload-error.jsp</code> <em>changed</em></li>
+<li><code>submit/upload-file-list.jsp</code> <em>changed</em></li>
+</ul>
+
+<h2><a name="version1_2_1">Changes in DSpace 1.2.1</a></h2>
+
+
+<H3>General Improvements</h3>
+
+<ul>
+  <li>Oracle support added</li>
+  <li>Thumbnails in item view can now be switched off/on</li>
+  <li>Browse and search thumbnail options</li>
+  <li>Improved item importer
+      <ul>
+        <li> can now import to multiple collections</li>
+        <li> added --test flag to simulate an import, without actually making any changes </li>
+        <li> added --resume flag to try to resume the import in case the import is aborted</li>
+      </ul>
+  </li>
+  <li>Configurable fields for the search index</li>
+  <li>Script for transferring items between DSpace instances</li>
+  <li>Sun library JARs (JavaMail, Java Activation Framework and Servlet) now included in DSpace source code bundle</li>
+</ul>
+
+<h3>Bug fixes</h3>
+<ul>
+  <li>A logo to existing collection can now be added. Fixes SF bug #1065933</li>
+  <li>The community logo can now be edited. Fixes SF bug #1035692</li>
+  <li>MediaFilterManager doesn't 'touch' every item every time. Fixes SF bug #1015296 </li>
+  <li>Supported formats help page, set the format support level to "known" as default</li>
+  <LI>Fixed various database connection pool leaks</LI>
+
+</ul>
+
+<H3><A NAME="jsp-changes-1_2-1_2_1">Changed JSPs</A></H3>
+
+<UL>
+<li><code>collection-home</code> <em>changed</em></li>
+<li><code>community-home</code> <em>changed</em></li>
+<li><code>display-item</code> <em>changed</em></li>
+<li><code>dspace-admin/confirm-delete-collection</code> <em>moved to tools/ and changed</em></li>
+<li><code>dspace-admin/confirm-delete-community</code> <em>moved to tools/ and changed</em></li>
+<li><code>dspace-admin/edit-collection</code> <em>moved to tools/ and changed</em></li>
+<li><code>dspace-admin/edit-community</code> <em>moved to tools/ and changed</em></li>
+<li><code>dspace-admin/index</code> <em>changed </em></li>
+<li><code>dspace-admin/upload-logo</code> <em>changed </em></li>
+<li><code>dspace-admin/wizard-basicinfo</code> <em>changed </em></li>
+<li><code>dspace-admin/wizard-default-item</code> <em>changed </em></li>
+<li><code>dspace-admin/wizard-permissions</code> <em>changed </em></li>
+<li><code>dspace-admin/wizard-questions</code> <em>changed </em></li>
+<li><code>help/formats.html</code> <em>removed</em></li>
+<li><code>help/formats</code> <em>changed</em></li>
+<li><code>index</code> <em>changed</em></li>
+<li><code>layout/navbar-admin</code> <em>changed</em></li>
+</UL>
+
+
+<h2><a name="version1_2">Changes in DSpace 1.2</a></h2>
+
+<H3>General Improvments</h3>
+
+<ul>
+  <li>Communities can now contain sub-communities</li>
+  <li>Items may be included in more than one collection</li>
+  <li>Full text extraction and searching for MS Word, PDF, HTML, text
+documents</li>
+  <li>Thumbnails displayed in item view for items that contain images</li>
+  <li>Configurable MediaFilter tool creates both extracted text and
+thumbnails</li>
+  <li>Bitstream IDs are now persistent - generated from item's handle
+and a sequence number</li>
+  <li>Creative Commons licenses can optionally be added to items
+ during web submission process</li>
+</ul>
+
+<H3>Administration</H3>
+<ul>
+  <li>If you are logged in as administrator, you see admin buttons on
+item, collection, and community pages</li>
+  <li>New collection administration wizard</li>
+  <li>Can now administer collection's submitters from collection admin
+tool</li>
+  <li>Delegated administration - new 'collection editor' role - edits
+item metadata, manages submitters list, edits collection metadata, links
+to items from other collections, and can withdraw items</li>
+  <li>Admin UI moved from /admin to /dspace-admin to avoid conflict
+with Tomcat /admin JSPs</li>
+  <li>New EPerson selector popup makes Group editing much easier</li>
+  <li>'News' section is now editable using admin UI (no more mucking
+with JSPs)</li>
+</ul>
+
+<H3>Import/Export/OAI</H3>
+
+<ul>
+  <li>New tool that exports DSpace content in AIPs that use METS XML
+for metadata (incomplete)</li>
+  <li>OAI - sets are now collections, identified by Handles ('safe'
+with /, : converted to _)</li>
+  <li>OAI - contributor.author now mapped to oai_dc:creator</li>
+</ul>
+
+<H3>Miscellaneous</H3>
+<ul>
+  <li>Build process streamlined with use of WAR files, symbolic links
+no longer used, friendlier to later versions of Tomcat</li>
+  <li>MIT-specific aspects of UI removed to avoid confusion</li>
+  <li>Item metadata now rendered to avoid interpreting as HTML
+(displays as entered)</li>
+  <li>Forms now have no-cache directive to avoid trouble with browser
+'back' button</li>
+  <li>Bundles now have 'names' for more structure in item's content</li>
+</ul>
+<div id="jsp-file-changes">
+<h3><a name="jsp-file-changes">JSP file changes between 1.1 and 1.2</a></h3>
+<p>This list generated with <code>cvs -Q rdiff -s -r dspace-1_1 dspace</code>
+and a sprinkling of perl.</p>
+<ul>
+<li>Changed: dspace/jsp/collection-home.jsp </li>
+<li>Changed: dspace/jsp/community-home.jsp </li>
+<li>Changed: dspace/jsp/community-list.jsp </li>
+<li>Changed: dspace/jsp/display-item.jsp </li>
+<li>Changed: dspace/jsp/index.jsp </li>
+<li>Changed: dspace/jsp/home.jsp </li>
+<li>Changed: dspace/jsp/styles.css.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/authorize-advanced.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/authorize-collection-edit.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/authorize-community-edit.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/authorize-item-edit.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/authorize-main.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/authorize-policy-edit.jsp </li>
+<li>Moved to dspace-admin: dspace/jsp/admin/collection-select.jsp </li>
+<li>Moved to dspace-admin: dspace/jsp/admin/community-select.jsp </li>
+<li>Moved to dspace-admin: dspace/jsp/admin/confirm-delete-collection.jsp </li>
+<li>Moved to dspace-admin: dspace/jsp/admin/confirm-delete-community.jsp </li>
+<li>Moved to dspace-admin: dspace/jsp/admin/confirm-delete-dctype.jsp </li>
+<li>Moved to dspace-admin: dspace/jsp/admin/confirm-delete-eperson.jsp </li>
+<li>Moved to dspace-admin: dspace/jsp/admin/confirm-delete-format.jsp </li>
+<li>Moved to dspace/jsp/tools: dspace/jsp/admin/confirm-delete-item.jsp </li>
+<li>Moved to dspace/jsp/tools: dspace/jsp/admin/confirm-withdraw-item.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/edit-collection.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/edit-community.jsp </li>
+<li>Moved to dspace/jsp/tools and changed: dspace/jsp/admin/edit-item-form.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/eperson-browse.jsp </li>
+<li>Moved to dspace-admin: dspace/jsp/admin/eperson-confirm-delete.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/eperson-edit.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/eperson-main.jsp </li>
+<li>Moved to dspace/jsp/tools and changed: dspace/jsp/admin/get-item-id.jsp </li>
+<li>Moved to dspace/jsp/tools and changed: dspace/jsp/admin/group-edit.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/group-eperson-select.jsp </li>
+<li>Moved to dspace/jsp/tools and changed: dspace/jsp/admin/group-list.jsp </li>
+<li>Moved to dspace-admin: dspace/jsp/admin/index.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/item-select.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/list-communities.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/list-dc-types.jsp </li>
+<li>Removed: dspace/jsp/admin/list-epeople.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/list-formats.jsp </li>
+<li>Moved to dspace/jsp/tools: dspace/jsp/admin/upload-bitstream.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/upload-logo.jsp </li>
+<li>Moved to dspace-admin: dspace/jsp/admin/workflow-abort-confirm.jsp </li>
+<li>Moved to dspace-admin and changed: dspace/jsp/admin/workflow-list.jsp </li>
+<li>Changed: dspace/jsp/browse/authors.jsp </li>
+<li>Changed: dspace/jsp/browse/items-by-author.jsp </li>
+<li>Changed: dspace/jsp/browse/items-by-date.jsp </li>
+<li>Changed: dspace/jsp/browse/no-results.jsp </li>
+<li>New: dspace-admin/eperson-deletion-error.jsp </li>
+<li>New: dspace/jsp/dspace-admin/news-edit.jsp </li>
+<li>New: dspace/jsp/dspace-admin/news-main.jsp </li>
+<li>New: dspace/jsp/dspace-admin/wizard-basicinfo.jsp </li>
+<li>New: dspace/jsp/dspace-admin/wizard-default-item.jsp </li>
+<li>New: dspace/jsp/dspace-admin/wizard-permissions.jsp </li>
+<li>New: dspace/jsp/dspace-admin/wizard-questions.jsp </li>
+<li>Changed: dspace/jsp/components/contact-info.jsp </li>
+<li>Changed: dspace/jsp/error/internal.jsp </li>
+<li>New: dspace/jsp/help/formats.jsp </li>
+<li>Changed: dspace/jsp/layout/footer-default.jsp </li>
+<li>Changed: dspace/jsp/layout/header-default.jsp </li>
+<li>Changed: dspace/jsp/layout/navbar-admin.jsp </li>
+<li>Changed: dspace/jsp/layout/navbar-default.jsp </li>
+<li>Changed: dspace/jsp/login/password.jsp </li>
+<li>Changed: dspace/jsp/mydspace/main.jsp </li>
+<li>Changed: dspace/jsp/mydspace/perform-task.jsp </li>
+<li>Changed: dspace/jsp/mydspace/preview-task.jsp </li>
+<li>Changed: dspace/jsp/mydspace/reject-reason.jsp </li>
+<li>Changed: dspace/jsp/mydspace/remove-item.jsp </li>
+<li>Changed: dspace/jsp/register/edit-profile.jsp </li>
+<li>Changed: dspace/jsp/register/inactive-account.jsp </li>
+<li>Changed: dspace/jsp/register/new-password.jsp </li>
+<li>Changed: dspace/jsp/register/registration-form.jsp </li>
+<li>Changed: dspace/jsp/search/advanced.jsp </li>
+<li>Changed: dspace/jsp/search/results.jsp </li>
+<li>Changed: dspace/jsp/submit/cancel.jsp </li>
+<li>New: dspace/jsp/submit/cc-license.jsp </li>
+<li>Changed: dspace/jsp/submit/choose-file.jsp </li>
+<li>New: dspace/jsp/submit/creative-commons.css </li>
+<li>New: dspace/jsp/submit/creative-commons.jsp </li>
+<li>Changed: dspace/jsp/submit/edit-metadata-1.jsp </li>
+<li>Changed: dspace/jsp/submit/edit-metadata-2.jsp </li>
+<li>Changed: dspace/jsp/submit/get-file-format.jsp </li>
+<li>Changed: dspace/jsp/submit/initial-questions.jsp </li>
+<li>Changed: dspace/jsp/submit/progressbar.jsp </li>
+<li>Changed: dspace/jsp/submit/review.jsp </li>
+<li>Changed: dspace/jsp/submit/select-collection.jsp </li>
+<li>Changed: dspace/jsp/submit/show-license.jsp </li>
+<li>Changed: dspace/jsp/submit/show-uploaded-file.jsp </li>
+<li>Changed: dspace/jsp/submit/upload-error.jsp </li>
+<li>Changed: dspace/jsp/submit/upload-file-list.jsp </li>
+<li>Changed: dspace/jsp/submit/verify-prune.jsp </li>
+<li>New: dspace/jsp/tools/edit-item-form.jsp </li>
+<li>New: dspace/jsp/tools/eperson-list.jsp </li>
+<li>New: dspace/jsp/tools/itemmap-browse.jsp </li>
+<li>New: dspace/jsp/tools/itemmap-info.jsp </li>
+<li>New: dspace/jsp/tools/itemmap-main.jsp </li>
+
+</ul>
+</div>
+
+
+<h2><a name="version1_1_1">Changes in DSpace 1.1.1</a></h2>
+<h3>Bug fixes</h3>
+<ul>
+  <li>non-administrators can now submit again</li>
+  <li>installations now preserve file creation dates, eliminating
+confusion with    upgrades</li>
+  <li>authorization editing pages no longer create null entries in
+database, and no longer handles them poorly (no longer gives blank page
+instead of displaying policies.)</li>
+  <li>registration page Invalid token error page now displayed when an
+invalid token is received (as opposed to internal server error.) Fixes
+SF bug #739999</li>
+  <li>eperson admin 'recent submission' links fixed for DSpaces
+deployed somewhere other than at / (e.g. /dspace).</li>
+  <li>help pages Link to help pages now includes servlet context (e.g.
+'/dspace'). Fixes SF bug #738399.</li>
+</ul>
+<h3>Improvements</h3>
+<ul>
+  <li><code>bin/dspace-info.pl</code> now checks jsp and asset store
+files for zero-length files</li>
+  <li><code>make-release-package</code> now works with SourceForge CVS</li>
+  <li>eperson editor now doesn't display the spurious text 'null'</li>
+  <li>item exporter now uses Jakarta's cli command line arg parser
+(much cleaner)</li>
+  <li>item importer improvements:
+    <ul>
+      <li>now uses Jakarta's cli command line arg parser (much cleaner)</li>
+      <li>imported items can now be routed through a workflow</li>
+      <li>more validation and error messages before import</li>
+      <li>can now use email addresses and handles instead of just
+database IDs</li>
+      <li>can import an item to a collection with the workflow
+suppressed</li>
+    </ul>
+  </li>
+</ul>
+<h2><a name="version1_1">Changes in DSpace 1.1</a></h2>
+<ul>
+  <li>Fixed various OAI-related bugs; DSpace's OAI support should now
+be correct.  Note that harvesting is now based on the new Item 'last
+modified' date (as opposed to the Dublin Core <code>date.available</code>
+date.)</li>
+  <li>Fixed Handle support--DSpace now responds to naming authority
+requests  correctly.</li>
+  <li>Multiple bitstream stores can now be specified; this allows
+DSpace storage to span several disks, and so there is no longer a hard
+limit on storage.</li>
+  <li>Search improvements:
+    <ul>
+      <li>New fielded searching UI</li>
+      <li>Search results are now paged</li>
+      <li>Abstracts are indexed</li>
+      <li>Better use of Lucene API; should stop the number of open file
+handles getting large</li>
+    </ul>
+  </li>
+  <li>Submission UI improvements:
+    <ul>
+      <li>now insists on a title being specified</li>
+      <li>fixed navigation on file upload page</li>
+      <li>citation &amp; identifier fields for previously published
+submissions now    fixed</li>
+    </ul>
+  </li>
+  <li>Many Unicode fixes to the database and Web user interface</li>
+  <li>Collections can now be deleted</li>
+  <li>Bitstream descriptions (if available) displayed on item display
+page</li>
+  <li>Modified a couple of servlets to handle invalid parameters better
+(i.e. to report a suitable error message instead of an internal server
+error)</li>
+  <li>Item templates now work</li>
+  <li>Fixed registration token expiration problem (they no longer
+expire.)</li>
+</ul>
+<hr>
+<address> Copyright &copy; 2002-2006 MIT and Hewlett Packard </address>
+</body>
+</html>

dspace/docs/index.html

@@ -0,0 +1,176 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>DSpace System Documentation: Contents</TITLE>
+    <LINK REL=StyleSheet HREF="style.css" TYPE="text/css">
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" >
+  </HEAD>
+  <BODY>
+    <H1>DSpace System Documentation: Contents</H1>
+
+    <P>Authors: Robert Tansley, Mick Bass, Margret Branschofsky, Grace Carpenter, Greg McClellan, David Stuve, and others</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>
+
+    <UL>
+      <LI><A HREF="introduction.html">Introduction</A></LI>
+      <LI><A HREF="functional.html">Functional Overview</A>
+        <UL>
+          <LI><A HREF="functional.html#data_model">Data Model</A></LI>
+          <LI><A HREF="functional.html#plugin">Plugin Manager</A></LI>
+          <LI><A HREF="functional.html#metadata">Metadata</A></LI>
+          <LI><A HREF="functional.html#packager">Packager Plugins</a></LI>
+          <LI><A HREF="functional.html#crosswalk">Crosswalk Plugins</a></LI>
+          <LI><A HREF="functional.html#epeople">E-people and Groups</A></LI>
+          <LI><A HREF="functional.html#authentication">Authentication</A></LI>
+          <LI><A HREF="functional.html#auth">Authorization</A></LI>
+          <LI><A HREF="functional.html#ingest">Ingest Process and Workflow</A></LI>
+          <LI><A HREF="functional.html#supervision">Supervision and Collaboration</A></LI>
+          <LI><A HREF="functional.html#handles">Handles</A></LI>
+          <LI><A HREF="functional.html#bitstream_ids">Bitstream 'Persistent' Identifiers</A></LI>
+          <li><a href="functional.html#srb">Storage Resource Broker (SRB) Support</a></li>
+          <LI><A HREF="functional.html#search_browse">Search and Browse</A></LI>
+          <LI><A HREF="functional.html#html">HTML Support</A></LI>
+          <LI><A HREF="functional.html#oai">OAI Support</A></LI>
+          <LI><A HREF="functional.html#openurl">OpenURL Support</A></LI>
+          <LI><A HREF="functional.html#creativecommons">Creative Commons Support</A></LI>
+          <LI><A HREF="functional.html#subscriptions">Subscriptions</A></LI>
+          <LI><A HREF="functional.html#history">History</A></LI>
+          <LI><A HREF="functional.html#history">Import and Export</A></LI>
+          <li><a href="functional.html#registration">Registration</a></li>
+          <li><a href="functional.html#statistics">Statistical Reports</a></li>
+	  <li><a href="functional.html#checker">Checksum Checker</a></li>
+        </UL>
+      </LI>
+      <LI><A HREF="install.html">Installation</A>
+        <UL>
+          <LI><A HREF="install.html#prerequisite">Prerequisite Software</A></LI>
+          <LI><A HREF="install.html#installsteps">Quick Installation Steps</A></LI>
+          <LI><A HREF="install.html#advancedinstall">Advanced Installation</A></LI>
+	<li><a href="install.html#windows">Windows Installation</a></li>
+          <LI><A HREF="install.html#knownbugs">Known Bugs</A></LI>
+          <LI><A HREF="install.html#problems">Common Problems</A></LI>
+        </UL>
+      </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>
+          <LI><A HREF="update.html#121_122">Updating From 1.2.1 to 1.2.2</A></LI>
+          <LI><A HREF="update.html#12_121">Updating From 1.2 to 1.2.1</A></LI>
+          <LI><A HREF="update.html#11_12">Updating From 1.1 (or 1.1.1) to 1.2</A></LI>
+          <LI><A HREF="update.html#11_111">Updating From 1.1 to 1.1.1</A></LI>
+          <LI><A HREF="update.html#101_11">Updating From 1.0.1 to 1.1</A></LI>
+        </UL>
+      </LI>
+      <LI><A HREF="configure.html">Configuration and Customization</A>
+        <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 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>
+          <LI><A HREF="configure.html#statistics">Configuring System Statistical Reports</A></LI>
+          <LI><A HREF="configure.html#mediafilters">MediaFilters</A></LI>
+          <LI><A HREF="configure.html#preview">Displaying Image Item Preview</A></LI>
+          <LI><A HREF="configure.html#webuithumbs">Displaying Image Thumbnails</A></LI>
+          <LI><A HREF="configure.html#strengths">Displaying Community and Collection Item Counts</A></LI>
+          <LI><A HREF="configure.html#luceneanalyzer">Lucene Analyzer</A></LI>
+	   <li><a href="configure.html#formathelp">On-line Help About File Formats</a></li>
+	   <li><a href="configure.html#viewlicence">View Item Licence</a></li>
+           <li><a href="configure.html#syndication">Configuring RSS Syndication</a></li>
+           <li><a href="configure.html#suggest">Configuring Item Recommendations</a></li>
+	   <li><a href="configure.html#controlledvocabulary">Configuring Controlled Vocabularies</a></li>
+	   <li><a href="configure.html#checker">Configuring the checksum checker</a></li>
+           <li><a href="configure.html#packager">Configuring Packager Plugins</a></li>
+           <li><a href="configure.html#crosswalk">Configuring Crosswalk Plugins</a></li>
+
+        </UL>
+      </LI>
+      <LI><A HREF="submission.html">Customizing Submission Metadata Entry</A></LI>
+      <LI><A HREF="directories.html">Directories and Files</A>
+        <UL>
+          <LI><A HREF="directories.html#sourcedir">Source Directory Layout</A></LI>
+          <LI><A HREF="directories.html#installdir">Installed Directory Layout</A></LI>
+          <LI><A HREF="directories.html#webapp">Contents of Web Application</A></LI>
+          <LI><A HREF="directories.html#logfiles">Log Files</A></LI>
+        </UL>
+      </LI>
+      <LI><A HREF="architecture.html">Architecture</A>
+        <UL>
+          <LI><A HREF="architecture.html#overview">Overview</A></LI>
+          <LI><A HREF="storage.html">Storage Layer</A>
+            <UL>
+              <LI><A HREF="storage.html#rdbms">RDBMS</A></LI>
+              <LI><A HREF="storage.html#bitstreams">Bitstream Store</A></LI>
+            </UL>
+          </LI>
+          <LI><A HREF="business.html">Business Logic Layer</A>
+            <UL>
+              <LI><A HREF="business.html#core">Core Classes</A></LI>
+              <LI><A HREF="business.html#content">Content Management API</A></LI>
+              <LI><A HREF="business.html#plugin">Plugin Manager</A></LI>
+              <LI><A HREF="business.html#workflow">Workflow System</A></LI>
+              <LI><A HREF="business.html#administer">Administration Toolkit</A></LI>
+              <LI><A HREF="business.html#eperson">E-person/Group Manager</A></LI>
+              <LI><A HREF="business.html#authorize">Authorization</A></LI>
+              <LI><A HREF="business.html#handle">Handle Manager/Handle Plugin</A></LI>
+              <LI><A HREF="business.html#search">Search</A></LI>
+              <LI><A HREF="business.html#browse">Browse API</A></LI>
+              <LI><A HREF="business.html#history">History Recorder</A></LI>
+            </UL>
+          </LI>
+          <LI><A HREF="application.html">Application Layer</A>
+            <UL>
+              <LI><A HREF="application.html#webui">Web User Interface</A></LI>
+              <LI><A HREF="application.html#oai">OAI-PMH Data Provider</A></LI>
+	      <LI><A HREF="application.html#packager">Package Importer and Exporter</a></LI>
+              <LI><A HREF="application.html#itemimporter">Item Importer and Exporter</A></LI>
+              <LI><A HREF="application.html#transferitem">Transferring Items Between DSpace Instances</A></LI>
+              <LI><A HREF="application.html#registration">Registering (Not Importing) Bitstreams</A></LI>
+              <LI><A HREF="application.html#mets">METS Tools</A></LI>
+              <LI><A HREF="application.html#mediafilters">Media Filters</A></LI>
+              <LI><A HREF="application.html#filiator">Sub-Community Management</A></LI>
+            </UL>
+          </LI>
+        </UL>
+      </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>
+          <LI><A HREF="history.html#version1_3">Changes in DSpace 1.3</A></LI>
+          <LI><A HREF="history.html#version1_2_2">Changes in DSpace 1.2.2</A></LI>
+          <LI><A HREF="history.html#version1_2_1">Changes in DSpace 1.2.1</A></LI>
+          <LI><A HREF="history.html#version1_2">Changes in DSpace 1.2</A></LI>
+          <LI><A HREF="history.html#version1_1_1">Changes in DSpace 1.1.1</A></LI>
+          <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>
+
+    <ADDRESS>
+      Copyright &copy; 2002-2006 MIT and Hewlett Packard
+    </ADDRESS>
+  </BODY>
+</HTML>

dspace/docs/install.html

@@ -0,0 +1,657 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>DSpace System Documentation: Installation</TITLE>
+    <LINK REL=StyleSheet HREF="style.css" TYPE="text/css">
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" >
+  </HEAD>
+  <BODY>
+    <H1>DSpace System Documentation: Installation</H1>
+
+    <P><A HREF="index.html">Back to contents</A></P>
+
+
+    <H2><A NAME="prerequisite">Prerequisites</A></H2>
+
+    <P>The list below describes the third-party components and tools you'll need to run a DSpace server.  These are simply recommendations based on our setup at MIT; since DSpace is built on open source, standards-based tools, there are numerous other possibilities and setups.</P>
+
+    <P>Also, please note that the configuration and installation guidelines relating to a particular tool below are here for convenience.  You should refer to the documentation for each individual component for complete and up-to-date details.  Many of the tools are updated on a frequent basis, and the guidelines below may become out of date.</P>
+
+    <ol>
+      <li><P>UNIX-like OS (Linux, HP/UX etc)</P></li>
+
+      <li><P><A HREF="http://java.sun.com/">Java 1.4</A> or later (standard SDK is fine, you don't need J2EE)</P></li>
+
+      <li><P><A HREF="http://ant.apache.org/">Apache Ant 1.6.2</A> or later (Java make-like tool)</P></li>
+
+      <li>
+        <P><A HREF="http://www.postgresql.org/">PostgreSQL 7.3</A> or later, an open source relational database, or <a href="http://www.oracle.com/database/">Oracle 9 or higher</A>.</P>
+
+        <UL>
+          <LI>
+            <P><strong>PostgreSQL</strong></P>
+
+            <P>Unicode (specifically UTF-8) support must be enabled.  This is enabled by default in 8.0+.  For 7.<em>x</em>, be sure to compile with the following options to the '<code>configure</code>' script:</P>
+
+            <PRE>--enable-multibyte --enable-unicode --with-java</PRE>
+
+            <P><A NAME="enabletcpip"></a>Once installed, you need to enable TCP/IP connections (DSpace uses JDBC).  For 7.<em>x</em>, edit <code>postgresql.conf</code> (usually in <code>/usr/local/pgsql/data</code> or <code>/var/lib/pgsql/data</code>), and add this line:</P>
+
+            <PRE>tcpip_socket = true</PRE>
+
+            <P>For 8.0+, in <code>postgresql.conf</code> uncomment the line starting:</P>
+
+            <PRE>listen_addresses = 'localhost'</PRE>
+
+            <P>Then tighten up security a bit by editing <code>pg_hba.conf</code> and adding this line:</P>
+
+            <PRE>host  dspace  dspace  127.0.0.1  255.255.255.255  md5</PRE>
+
+            <P>Then restart PostgreSQL.</P>
+          </LI>
+
+          <LI>
+            <P><strong>Oracle</strong></P>
+
+            <p>You will need to create a database for DSpace. Make sure that the character set is one of the Unicode character sets. DSpace uses UTF-8 natively, and it is suggested that the Oracle database use the same character set. You will also need to create a user account for DSpace (e.g. <code>dspace</code>,) and ensure that it has permissions to add and remove tables in the database. Refer to the Quick Installation for more details.</p>
+
+            <P><STRONG>NOTE:</STRONG> DSpace uses sequences to generate unique object IDs - beware Oracle sequences, which are said to lose their values when doing a database export/import, say restoring from a backup.  Be sure to run the script <code>etc/update-sequences.sql</code>.</P>
+
+            <P><STRONG>ALSO NOTE:</STRONG> Everything is fully functional, although Oracle limits you to 4k of text in text fields such as item metadata or collection descriptions.</P>
+
+            <P>For people interested in switching from Postgres to Oracle, I know of no tools that would do this automatically.  You will need to recreate the community, collection, and eperson structure in the Oracle system, and then use the item export and import tools to move your content over.</P>
+          </LI>
+        </UL>
+
+      </li>
+
+      <li><P><A HREF="http://jakarta.apache.org/tomcat/">Jakarta Tomcat 4.x/5.x</A> or equivalent, such as <A HREF="http://www.mortbay.org/jetty/index.html">Jetty</A> or <A HREF="http://www.caucho.com/">Caucho Resin</A>.</P>
+
+      <P>Note that DSpace will need to run as the same user as Tomcat, so you might want to install and run Tomcat as a user called '<code>dspace</code>'.</P>
+
+      <P>You need to ensure that Tomcat has a) enough memory to run DSpace and b) uses UTF-8 as its default file encoding for international character support.  So ensure in your startup scripts (etc) that the following environment variable is set:</P>
+
+      <PRE>JAVA_OPTS="-Xmx512M -Xms64M -Dfile.encoding=UTF-8"</PRE>
+
+      <P>You also need to alter Tomcat's default configuration to support searching and browsing of multi-byte UTF-8 correctly.  You need to add a configuration option to the <code>&lt;Connector&gt;</code> element in <code><i>[tomcat]</i>/config/server.xml</code>:</P>
+
+      <PRE>URIEncoding="UTF-8"</PRE>
+
+      <P>e.g. if you're using the default Tomcat config, it should read:</P>
+
+      <PRE>&lt;!-- Define a non-SSL HTTP/1.1 Connector on port 8080 --&gt;
+&lt;Connector port="8080"
+           maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+           enableLookups="false" redirectPort="8443" acceptCount="100"
+           connectionTimeout="20000" disableUploadTimeout="true"
+           <strong>URIEncoding="UTF-8"</strong> /&gt;</PRE>
+
+       <P>Jetty and Resin are configured for correct handling of UTF-8 by default.</P>
+      </li>
+    </ol>
+
+
+    <H2><A NAME="installsteps">Quick Installation Steps</A></H2>
+
+    <p><strong>But First, a Word on Directories and Path Names</strong></p>
+
+    <p>DSpace uses three separate directory trees. Although you don't need to know all the details
+of them in order to install DSpace, you do need to know they exist and also know how they're referred to in this document:<p>
+    <ul>
+    <li>the source directory, referred to as <i><code>[dspace-source]</code></i></li>
+    <li>the install directory, referred to as <i><code>[dspace]</code></i></li>
+    <li>the web deployment directory. If you're using Tomcat, this will be <code><i>[tomcat]</i>/webapps/dspace</code> (with <code><i>[tomcat]</i></code> being wherever
+you installed Tomcat--also known as $CATALINA_HOME). This directory is generated by the web server when it unpacks dspace.war, and should never be edited.</li>
+    </ul>
+
+    <p>For details on the contents of these separate directory trees, refer to
+    <a href="directories.html">directories.html</a>.
+    <strong>Note that the source directory and install directory should always be separate!</strong></p>
+
+    <ol>
+      <li>
+        <P>Create the DSpace user.  This needs to be the same user that Tomcat (or Jetty etc) will run as.  e.g. as root run:</P>
+
+        <PRE>useradd -m dspace</PRE>
+      </li>
+
+      <li>
+        <P>Download the <A HREF="http://sourceforge.net/projects/dspace/">latest DSpace source code release</A> and unpack it:</P>
+
+        <PRE>gunzip -c dspace-source-1.x.tar.gz | tar -xf -</PRE>
+
+        </li>
+
+      <li>
+        <p>Database Setup</p>
+	<p><strong>Postgres: </strong>
+	<ol type="i">
+	<li>
+	<p><a name="pgdriver"></a>Copy the PostgreSQL JDBC driver (<code>.jar</code> file) into
+<code><i>[dspace-source]</i>/lib</code>.  If you compiled PostgreSQL yourself, it'll be in <code>postgresql-7.x.x/src/interfaces/jdbc/jars/postgresql.jar</code>.  Alternatively you can download it directly from <a href="http://jdbc.postgresql.org/download.html">the PostgreSQL JDBC site</a>.  Make sure you get the driver for the version of PostgreSQL you're running and for JDBC2.</p></li>
+        <li>
+	      <p>Create a <code>dspace</code> database, owned by the <code>dspace</code> PostgreSQL user:</p>
+
+	        <pre>createuser -U postgres -d -A -P dspace ; createdb -U dspace -E UNICODE dspace</pre>
+
+	        <p>Enter a password for the DSpace database.  (This isn't the same as the <code>dspace</code> user's UNIX password.)</p>
+	</li>
+	</ol></p>
+	<p><strong>Oracle:</strong>
+	<ol type="i">
+	   <li>
+            <p>Copy the Oracle JDBC driver into <code><i>[dspace-source]</i>/lib</code>.</p>
+	   </li>
+	   <li>
+            <p>Create a database for DSpace.  Make sure that the character set is one of the Unicode character sets.  DSpace uses UTF-8 natively, and it is suggested that the Oracle database use the same character set.  Create a user account for DSpace (e.g. <code>dspace</code>,) and ensure that it has permissions to add and remove tables in the database.</p>
+	   </li>
+	   <li>
+            <p>Edit the config/dspace.cfg file in your source directory for the  following settings:</p>
+		<pre>db.name   = oracle
+db.url    = jdbc.oracle.thin:@//host:port/dspace
+db.driver = oracle.jdbc.OracleDriver</pre>
+	   </li>
+	   <li>
+            <p>Go to <code><i>[dspace-source]</i>/etc/oracle</code> and copy the contents to their parent directory, overwriting the versions in the parent:
+
+<pre>cd dspace_source/etc/oracle
+cp * ..</pre>
+            <p>You now have Oracle-specific <code>.sql</code> files in your <code>etc</code> directory, and your dspace.cfg is modified to point to your Oracle database.</p>
+	   </li>
+	</ol></p>
+      </li>
+
+      <li>
+        <P>Edit <code><i>[dspace-source]</i>/config/dspace.cfg</code>, in particular you'll need to set these properties:
+
+<br><code>dspace.dir</code> -- must be set to the <code>[dspace]</code> (installation) directory.
+
+<br><code>dspace.url</code> -- complete URL of this server's DSpace home page.
+
+<br><code>dspace.hostname</code> -- fully-qualified domain name of web server.
+
+<br><code>dspace.name</code> -- "Proper" name of your server, e.g. "My Digital Library".
+
+<br><code>db.password</code> --  the database password you entered in the previous step.
+
+<br><code>mail.server</code> -- fully-qualified domain name of your outgoing mail server.
+
+<br><code>mail.from.address</code> -- the "From:" address to put on email sent by DSpace.
+
+<br><code>feedback.recipient</code> -- mailbox for feedback mail.
+
+<br><code>mail.admin</code> -- mailbox for DSpace site administrator.
+
+<br><code>alert.recipient</code> --  mailbox for server errors/alerts (not essential but very useful!)
+<p>
+<b>NOTE:</b> You can interpolate the value of one configuration variable
+in the value of another one.  For example, to set <code>feedback.recipient</code>
+to the same value as <code>mail.admin</code>, the line would look like:
+<pre>    feedback.recipient = ${mail.admin}</pre>
+See the <code>dspace.cfg</code> file for examples.
+
+      </li>
+
+      <li>
+        <P>Create the directory for the DSpace installation.  As root, run:</P>
+
+        <PRE>mkdir <i>[dspace]</i> ; chown dspace <i>[dspace]</i></PRE>
+
+        <P>(Assuming the <code>dspace</code> UNIX username.)</P>
+      </li>
+
+      <li>
+        <P>As the <code>dspace</code> UNIX user, compile and install DSpace:</P>
+
+        <pre>cd <i>[dspace-source]</i> ; ant fresh_install</pre>
+
+        <P>The most likely thing to go wrong here is the database connection.  See the <A HREF="#problems">common problems section</A>.</P>
+      </li>
+
+      <li>
+        <P>Copy the DSpace Web application archives (<code>.war</code> files) to the appropriate directory in your Tomcat/Jetty/Resin installation.  For example:</P>
+
+        <PRE>cp <i>[dspace-source]</i>/build/*.war <i>[tomcat]</i>/webapps</PRE>
+      </li>
+
+      <LI>
+        <p>Create an initial administrator account:</p>
+
+        <pre><i>[dspace]</i>/bin/create-administrator</pre>
+      </LI>
+
+      <LI>
+        <P>Now the moment of truth!  Start up (or restart) Tomcat.  Visit the base URL of your server, e.g. http://dspace.myu.edu:8080/dspace.  You should see the DSpace home page.  Congratulations!</P>
+      </LI>
+    </ol>
+
+    <p>In order to set up some communities and collections, you'll need to access the administration UI.  To do this, append 'admin' to your server's URL, e.g. http://dspace.myu.edu:8080/dspace/dspace-admin.</P>
+
+    <H2><A NAME="advancedinstall">Advanced Installation</A></H2>
+
+    <P>The above installation steps are sufficient to set up a test server to play around with, but there are a few other steps and options you should probably consider before deploying a DSpace production site.</P>
+
+    <H3>'cron' Jobs</H3>
+
+    <P>A couple of DSpace features require that a script is run regularly -- the e-mail subscription feature that alerts users of new items being deposited, and the new 'media filter' tool, that generates thumbnails of images and extracts the full-text of documents for indexing.</P>
+
+    <P>To set these up, you just need to run the following command as the <code>dspace</code> UNIX user:</P>
+
+    <PRE>crontab -e</PRE>
+
+    <P>Then add the following lines:</P>
+
+    <PRE># Send out subscription e-mails at 01:00 every day
+0 1 * * * <i>[dspace]</i>/bin/sub-daily
+# Run the media filter at 02:00 every day
+0 2 * * * <i>[dspace]</i>/bin/filter-media
+# Run the checksum checker at 03:00
+0 3 * * * <i>[dspace]</i>/bin/checker -lp
+# Mail the results to the sysadmin at 04:00
+0 4 * * * <i>[dspace]</i>/bin/dsrun org.dspace.checker.DailyReportEmailer -c
+</PRE>
+
+    <P>Naturally you should change the frequencies to suit your environment.</P>
+
+    <P>PostgreSQL also benefits from regular 'vacuuming', which optimizes the indices and clears out any deleted data.  Become the <code>postgres</code> UNIX user, run <code>crontab -e</code> and add (for example):
+
+    <pre># Clean up the database nightly at 4.20am
+20 4 * * * vacuumdb --analyze dspace > /dev/null 2>&1</pre>
+
+    <p>In order that statistical reports are generated regularly and thus kept up to date you should set up the following cron jobs:</p>
+
+    <pre># Run stat analyses
+0 1 * * * [dspace]/bin/stat-general
+0 1 * * * [dspace]/bin/stat-monthly
+0 2 * * * [dspace]/bin/stat-report-general
+0 2 * * * [dspace]/bin/stat-report-monthly</pre>
+
+    <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>
+
+
+    <H3><A NAME="https">DSpace over HTTPS</a></H3>
+
+    <P>If your DSpace is configured to have users login with a username
+    and password (as opposed to, say, client Web certificates), then you
+    should consider using HTTPS.  Whenever a user logs in with the Web
+    form (e.g. <code>dspace.myuni.edu/dspace/password-login</code>)
+    their DSpace password is exposed in plain text on the network.  This
+    is a very serious security risk since network traffic monitoring is
+    very common, especially at universities.  If the risk seems minor, then
+    consider that your DSpace administrators also login this way and they
+    have ultimate control over the archive.
+
+    <p>
+    The solution is to use <em>HTTPS</em> (HTTP over SSL, i.e. Secure
+    Socket Layer, an encrypted transport), which protects your passwords
+    against being captured.  You can configure DSpace to require SSL on
+    all "authenticated" transactions so it only accepts passwords
+    on SSL connections.
+    <p>
+	The following sections show how to set up the most commonly-used Java Servlet containers to support HTTP over SSL.
+
+    <h4>To enable the HTTPS support in Tomcat 5.0:</h4>
+
+    <ol><li><b>For Production use:</b> Follow this procedure to
+      set up SSL on your server.  Using a "real" server certificate
+      ensures your users' browsers will accept it without complaints.
+      <p>
+      In the examples below, <code>$CATALINA_BASE</code> is the directory
+      under which your Tomcat is installed.
+      <ol>
+        <li><p>Create a Java keystore for your server with the password
+            <code>changeit</code>, and install your server certificate
+            under the alias <code>"tomcat"</code>.
+            This assumes the certificate was put in the file <code>server.pem</code>:</p>
+        <pre> $JAVA_HOME/bin/keytool -import -noprompt -v -storepass changeit -keystore $CATALINA_BASE/conf/keystore -alias tomcat -file myserver.pem</pre></li>
+
+        <LI><p>Install the CA (Certifying Authority) certificate for the CA that
+        granted your server cert, if necessary.  This
+        assumes    the server CA certificate is in <code>ca.pem</code>:</p>
+        <pre> $JAVA_HOME/bin/keytool -import -noprompt -storepass changeit -trustcacerts -keystore $CATALINA_BASE/conf/keystore -alias ServerCA -file ca.pem</pre>
+      </LI>
+
+        <li><p>Optional -- ONLY if you need to accept client certificates
+            for the X.509 certificate stackable authentication module
+            See the
+          <A HREF="configure.html#authenticate">configuration section</A>
+          for instructions on enabling the X.509 authentication method.
+            Load the keystore with the CA (certifying authority)
+            certificates for
+            the authorities of any clients whose certificates you wish to accept.
+            For example, assuming the client CA certificate is in <code>client1.pem</code>:</p>
+            <pre> $JAVA_HOME/bin/keytool -import -noprompt -storepass changeit -trustcacerts -keystore $CATALINA_BASE/conf/keystore  -alias client1 -file client1.pem</pre>
+      </LI>
+
+        <LI><p>Now add another Connector tag to your <code>server.xml</code>
+        Tomcat configuration file, like the example below.  The parts
+        affecting or specific to SSL are shown in bold.
+        (You may wish to change
+      some details such as the port, pathnames, and keystore password)</p>
+      <pre>
+    &lt;Connector port="8443"
+               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+               enableLookups="false" disableUploadTimeout="true"
+                 acceptCount="100" debug="0"
+                 <b>scheme="https"
+                 secure="true"
+               sslProtocol="TLS"
+                 keystoreFile="conf/keystore"
+               keystorePass="changeit"
+                 clientAuth="true" </b><i>- ONLY if using client X.509 certs for authentication!</i><b>
+                 truststoreFile="conf/keystore"
+                 trustedstorePass="changeit"</b> /&gt;</pre>
+        Also, check that the default Connector is set up to redirect
+        "secure" requests to the same port as your SSL connector, e.g.:
+       <pre>&lt;Connector port="8080"
+                 maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+                 enableLookups="false" <b>redirectPort="8443"</b>
+                 acceptCount="100" debug="0" /&gt;</pre>
+
+        </LI>
+
+      </OL>
+
+      <p><li><b>Quick-and-dirty Procedure for Testing:</b><br>
+      If you are just setting up a DSpace server for testing, or to
+      experiment with HTTPS, then you don't need to get a real server
+      certificate.  You can create a "self-signed" certificate for testing;
+      web browsers will issue warnings before accepting it but they will
+      function exactly the same after that as with a "real" certificate.
+      <p>
+      In the examples below, <code>$CATALINA_BASE</code> is the directory
+      under which your Tomcat is installed.
+      <ol>
+      <li><p>Optional -- ONLY if you don't already have a server certificate.
+        Follow this sub-procedure to request a new, signed server certificate
+        from your Certifying Authority (CA):
+        <ul>
+          <li><p>Create a new key pair under the alias name <code>"tomcat"</code>.
+              When generating your key, give the Distinguished
+              Name fields the appropriate values for your server and
+              institution.  CN should be the fully-qualified domain name of your server host.
+              Here is an example:
+              <pre>
+$JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keysize 1024 \
+  -keystore $CATALINA_BASE/conf/keystore -storepass changeit -validity 365 \
+  -dname 'CN=dspace.myuni.edu, OU=MIT Libraries, O=Massachusetts Institute of Technology, L=Cambridge, S=MA, C=US'
+       </pre>
+          <li><p>Then, create a <em>CSR</em> (Certificate Signing Request)
+            and send it to your Certifying Authority.  They will send you
+            back a signed Server Certificate.  This example command creates a CSR
+            in the file <code>tomcat.csr</code>
+            <pre>
+ $JAVA_HOME/bin/keytool -keystore $CATALINA_BASE/conf/keystore -storepass changeit \
+   -certreq -alias tomcat -v -file tomcat.csr</pre>
+
+          <li><p>Before importing the signed certificate, you must have
+             the CA's certificate in your keystore as a <em>trusted certificate</em>.
+             Get their certificate, and import it with a command like
+             this (for the example <code>mitCA.pem</code>):<pre>
+ $JAVA_HOME/bin/keytool -keystore $CATALINA_BASE/conf/keystore -storepass changeit \
+     -import -alias mitCA -trustcacerts -file mitCA.pem</pre>
+
+          <li><p>Finally, when you get the signed certificate from your CA,
+          import it into the keystore with a command like the following
+          example: (cert is in the file <code>signed-cert.pem</code>)<pre>
+ $JAVA_HOME/bin/keytool -keystore $CATALINA_BASE/conf/keystore -storepass changeit \
+     -import -alias tomcat -trustcacerts -file signed-cert.pem</pre>
+
+          Since you now have a signed server certificate in your keystore,
+          you can, obviously, skip the next steps of installing a signed
+          server certificate and the server CA's certificate.
+        </ul>
+        </li>
+        <LI><p>Create a Java keystore for your server with the password
+            <code>changeit</code>, and install your server certificate
+            under the alias <code>"tomcat"</code>.
+            This assumes the certificate was put in the file <code>server.pem</code>:</p>
+        <pre> $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keystore $CATALINA_BASE/conf/keystore -storepass changeit</pre>
+        <p>When answering the questions to identify the certificate, be
+        sure to respond to "First and last name" with the fully-qualified
+        domain name of your server (e.g. <code>test-dspace.myuni.edu</code>).
+        The other questions are not important.</p></li>
+
+        <li><p>Optional -- ONLY if you need to accept client certificates
+            for the X.509 certificate stackable authentication module
+            See the
+          <A HREF="configure.html#authenticate">configuration section</A>
+        for instructions on enabling the X.509 authentication method.
+            Load the keystore with the CA (certifying authority)
+            certificates for
+            the authorities of any clients whose certificates you wish to accept.
+            For example, assuming the client CA certificate is in <code>client1.pem</code>:</p>
+            <pre> $JAVA_HOME/bin/keytool -import -noprompt -storepass changeit -trustcacerts -keystore $CATALINA_BASE/conf/keystore  -alias client1 -file client1.pem</pre>
+        </LI>
+
+        <li><p>Follow the procedure in the section above to
+          add another Connector tag, for the HTTPS port, to your <code>server.xml</code> file.</p></li>
+        </ol>
+    </ol>
+
+	<h4>To use SSL on Apache HTTPD with mod_jk:</h4>
+    If you choose <a href="http://httpd.apache.org/">Apache HTTPD</a>
+    as your primary HTTP server, you can have it forward requests to
+    the <a href="http://tomcat.apache.org/">Tomcat servlet container</a> via
+    <a href="http://tomcat.apache.org/connectors-doc/">Apache
+    Jakarta Tomcat Connector</a>.  This can be configured to work
+    over SSL as well.
+    <p>
+    First, you must configure Apache for SSL; for Apache 2.0
+    see <a href="http://httpd.apache.org/docs/2.0/ssl/">
+    Apache SSL/TLS Encryption</a> for information about using
+    <a href="http://httpd.apache.org/docs/2.0/mod/mod_ssl.html">mod_ssl</a>.
+    <p>
+    <em><b>If you are using X.509 Client Certificates for authentication:</b></em>
+    add these configuration options to the appropriate <i>httpd</i>
+    configuration file, e.g. <code>ssl.conf</code>, and be sure they
+    are in force for the virtual host and namespace locations dedicated to DSpace:
+    <pre>
+        ##  SSLVerifyClient can be "optional" or "require"
+        SSLVerifyClient optional
+        SSLVerifyDepth  10
+        SSLCACertificateFile  <i>path-to-your-client-CA-certificate</i>
+        SSLOptions StdEnvVars ExportCertData
+    </pre>
+    <p>
+    Now consult the
+    <a href="http://tomcat.apache.org/connectors-doc/">Apache
+    Jakarta Tomcat Connector</a> documentation to configure the
+    <code>mod_jk</code> (note: <b>NOT</b> <code>mod_jk2</code>) module.
+    Select the AJP 1.3 connector protocol.
+    Also follow the instructions there to configure your Tomcat server to
+    respond to AJP.
+
+    <p><strong>To use SSL on Apache HTTPD with mod_webapp</strong> consult the DSpace 1.3.2 documentation. Apache have deprecated the <code>mod_webapp</code> connector and recommend using <code>mod_jk</code>.</p>
+
+    <p><strong>To use Jetty's HTTPS support</strong> consult the documentation for the relevant tool.</p>
+
+
+    <H3><A NAME="handles">The Handle Server</A></H3>
+
+    <P>First a few facts to clear up some common misconceptions:</P>
+
+    <UL>
+      <LI><P>You don't <strong>have</strong> to use CNRI's Handle system.  At the moment, you need to change the code a little to use something else (e.g PURLs) but that should change soon.</P></LI>
+
+      <LI><P>You'll notice that while you've been playing around with a test server, DSpace has apparently been creating handles for you looking like <code>hdl:123456789/24</code> and so forth.  These aren't really Handles, since the global Handle system doesn't actually know about them, and lots of other DSpace test installs will have created the same IDs.</P>
+
+      <P>They're only really Handles once you've registered a prefix with CNRI (see below) and have correctly set up the Handle server included in the DSpace distribution.  This Handle server communicates with the rest of the global Handle infrastructure so that anyone that understands Handles can find the Handles your DSpace has created.</P>
+      </LI>
+    </UL>
+
+    <P>If you want to use the Handle system, you'll need to set up a Handle server.  This is included with DSpace.  Note that this is not required in order to evaluate DSpace; you only need one if you are running a production service.  You'll need to obtain a Handle prefix from <A HREF="http://www.handle.net/">the central CNRI Handle site</A>.</P>
+
+    <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>. <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:
+      <PRE>java -cp /hs/bin/handle.jar net.handle.server.SimpleSetup /hs/svr_1</pre>
+      as directed in the <A HREF="http://hdl.handle.net/4263537/4093">Handle Server Administration Guide</A>, you should run
+      <pre><i>[dspace]</i>/bin/dsrun net.handle.server.SimpleSetup <i>[dspace]</i>/handle-server</pre>
+      ensuring that <code><i>[dspace]</i>/handle-server</code> matches whatever you have in <code>dspace.cfg</code> for the <code>handle.dir</code> property.</LI>
+
+      <LI>Edit the resulting <code><i>[dspace]</i>/handle-server/config.dct</code> file to include the following lines in the <code>"server_config"</code> clause:
+
+      <pre>"storage_type" = "CUSTOM"
+"storage_class" = "org.dspace.handle.HandlePlugin"</pre>
+
+      <P>This tells the Handle server to get information about individual Handles from the DSpace code.</P></LI>
+    </UL>
+
+    <P>Whichever approach you take, start the Handle server with <code><i>[dspace]</i>/bin/start-handle-server</code>, as the DSpace user.  Once the configuration file has been generated, you will need to go to <a href="http://hdl.handle.net/4263537/5014">http://hdl.handle.net/4263537/5014</a> to upload the generated sitebndl.zip file. The upload page will ask you for your contact information. An administrator will then create the naming authority/prefix on the root service (known as the Global Handle Registry), and notify you when this has been completed. You will not be able to continue the handle server installation until you receive further information concerning your naming authority.</P>
+
+    <P>Note that since the DSpace code manages individual Handles, administrative operations such as Handle creation and modification aren't supported by DSpace's Handle server.</P>
+
+	<p>If you need to update the handle prefix on items created before the CNRI registration process you can run the <code><i>[dspace]</i>/bin/update-handle-prefix script</code>. You may need to do this if you loaded items prior to CNRI registration (e.g. setting up a demonstration system prior to migrating it to production). The script takes the current and new prefix as parameters. For example:</p>
+
+	<p><code><i>[dspace]</i>/bin/update-handle-prefix 123456789 1303</code></p>
+
+	<p>will change any handles currently assigned prefix 123456789 to prefix 1303, so for example handle 123456789/23 will be updated to 1303/23 in the database.</p>
+
+
+	<h2><a name="windows">Windows Installation</a></h2>
+
+	<h3>Pre-requisite Software</h3>
+
+	<p>You'll need to install this pre-requisite software:
+
+	<ul>
+	<li><p><a href="http://java.sun.com/">Java SDK 1.4</a> or later (standard SDK is fine, you don't need J2EE)</p></li>
+	<li><p><a href="http://www.postgresql.org/ftp/">PostgreSQL 8.x for Windows</a>. This comes with an installer application now, so Cygwin is no longer required. Make sure the ODBC + JDBC options are selected, as well as the pgAdmin III tool<p></li>
+	<li><p><a href="http://ant.apache.org/">Apache Ant 1.6.x</a>. Unzip the package in <code>C:\</code> and add <code>C:\apache-ant-1.6.2\bin</code> to the <code>PATH</code> environment variable. For Ant to work properly, you should ensure that <code>JAVA_HOME</code> is set.</p></li>
+	<li><p><a href="http://tomcat.apache.org/">Jakarta Tomcat 5.x+<p></a>
+	</ul></p>
+
+	<h3>Installation Steps</h3>
+
+	<p><ol>
+	<li><p>Download the DSpace source from <a href="http://sourceforge.net/projects/dspace">SourceForge</a> and untar it (<a href="http://www.winzip.com/">WinZip</a> will do this)</p></li>
+	<li><p>Copy the PostgreSQL JDBC driver across to the DSpace source tree. The drivers will be in <code>C:\Program Files\PostgreSQL\8.x\jdbc\</code>. The <code>postgresql-8.x-yyy.jdbc2.jar</code> is the jar file you need. Copy it to <code>[dspace-source]/lib</code>.</p></li>
+	<li><p>Ensure the PostgreSQL service is running, and then run pgAdmin III (Start -> PostgreSQL 8.0 -> pgAdmin III). Connect to the local database as the postgres user and:
+		<ul>
+		<li>Create a 'Login Role' (user) called <code>dspace</code> with the password <code>dspace</code></li>
+		<li>Create a database called <code>dspace</code> owned by the user <code>dspace</code>, with UTF-8 encoding
+		</ul></p></li>
+	<li><p>Update paths in <code>[dspace-source]\config\dspace.cfg</code>. <strong>Note:</strong> Use forward slashes / for path separators, though you can still use drive letters, e.g.:
+		<p><code>dspace.dir = C:/DSpace</code><p>
+      Make sure you change all of the parameters with file paths to suit, specifically:
+		<p><pre>
+	dspace.dir
+	config.template.log4j.properties
+	config.template.log4j-handle-plugin.properties
+	config.template.oaicat.properties
+	assetstore.dir
+	history.dir
+	log.dir
+	upload.temp.dir
+	report.dir
+	handle.dir</pre></p></p>
+	</li>
+	<li><p>Create the directory for the DSpace installation (e.g. <code>C:\DSpace</code>)</p></li>
+	<li><p>Run:<p><code>ant fresh_install</code></p></p></li>
+	<li><p>Create an administrator account, e.g. assuming <code>C:\dspace</code> is where your DSpace installation is:<p><code>C:\dspace\bin\dsrun org.dspace.administer.CreateAdministrator</code></p>
+	<p>and enter the required information</p></p></li>
+	<li><p>Copy the <code>.war</code> Web application files from <code>[dspace-source]\build</code> to Tomcat's webapps dir, which should be somewhere like <code>C:\Program Files\Apache Software Foundation\Tomcat 5.5\webapps</code></p></li>
+	<li><p>Start the Tomcat service</p></li>
+	<li><p>Browse <code>http://localhost:8080/dspace</code>. You should see the DSpace home page</p></li>
+	</ol></p>
+
+
+    <H2><A NAME="checking">Checking Your Installation</A></H2>
+    <p>TODO</p>
+
+    <H2><A NAME="knownbugs">Known Bugs</A></H2>
+
+    <P>In any software project of the scale of DSpace, there will be bugs.  Sometimes, a stable version of DSpace includes known bugs.  We do not always wait until every known bug is fixed before a release.  If the software is sufficiently stable and an improvement on the previous release, and the bugs are minor and have known workarounds, we release it to enable the community to take advantage of those improvements.</P>
+
+    <P>The known bugs in a release are documented in the <code>KNOWN_BUGS</code> file in the source package.</P>
+
+    <P>Please see the <A HREF="http://sourceforge.net/tracker/?atid=119984&amp;group_id=19984&amp;func=browse">DSpace bug tracker</A> for further information on current bugs, and to find out if the bug has subsequently been fixed.  This is also where you can report any further bugs you find.</P>
+
+
+    <H2><A NAME="problems">Common Problems</A></H2>
+
+    <P>In an ideal world everyone would follow the above steps and have a fully functioning DSpace.  Of couse, in the real world it doesn't always seem to work out that way.  This section lists common problems that people encounter when installing DSpace, and likely causes and fixes.  This is likely to grow over time as we learn about users' experiences.</P>
+
+    <DL>
+      <DT>Database errors occur when you run <code>ant fresh_install</code></DT>
+
+      <DD>
+        <P>There are two common errors that occur.  If your error looks like this--</P>
+
+        <PRE>[java] 2004-03-25 15:17:07,730 INFO  org.dspace.storage.rdbms.InitializeDatabase @ Initializing Database
+[java] 2004-03-25 15:17:08,816 FATAL org.dspace.storage.rdbms.InitializeDatabase @ Caught exception:
+[java] org.postgresql.util.PSQLException: Connection refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
+[java]     at org.postgresql.jdbc1.AbstractJdbc1Connection.openConnection(AbstractJdbc1Connection.java:204)
+[java]     at org.postgresql.Driver.connect(Driver.java:139)</PRE>
+
+        <P>it usually means you haven't yet added the relevant configuration parameter to your PostgreSQL configuration <A HREF="#enabletcpip">(see above)</A>, or perhaps you haven't restarted PostgreSQL after making the change.
+Also, make sure that the <code>db.username</code> and <code>db.password</code> properties are correctly set in
+<code><i>[dspace-source]</i>/config/dspace.cfg</code>.</P>
+
+        <P>An easy way to check that your DB is working OK over TCP/IP is to try this on the command line:</P>
+
+        <PRE>psql -U dspace -W -h localhost</PRE>
+
+        <P>Enter the <code>dspace</code> <em>database</em> password, and you should be dropped into the psql tool with a <code>dspace=&gt;</code> prompt.</P>
+
+        <P>Another common error looks like this:</P>
+
+        <PRE>[java] 2004-03-25 16:37:16,757 INFO  org.dspace.storage.rdbms.InitializeDatabase @ Initializing Database
+[java] 2004-03-25 16:37:17,139 WARN  org.dspace.storage.rdbms.DatabaseManager @ Exception initializing DB pool
+[java] java.lang.ClassNotFoundException: org.postgresql.Driver
+[java]     at java.net.URLClassLoader$1.run(URLClassLoader.java:198)
+[java]     at java.security.AccessController.doPrivileged(Native Method)
+[java]     at java.net.URLClassLoader.findClass(URLClassLoader.java:186)</PRE>
+
+        <P>This means that the PostgreSQL JDBC driver is not present in <code><i>[dspace-source]</i>/lib</code>.  <A HREF="#pgdriver">See above.</A></P>
+
+
+      <DT>Tomcat doesn't shut down</DT>
+      <DD><P>If you're trying to tweak Tomcat's configuration but nothing seems to make a difference to the error you're seeing, you might find that Tomcat hasn't been shutting down properly, perhaps because it's waiting for a stale connection to close gracefully which won't happen.  To see if this is the case, try:</P>
+
+      <PRE>ps -ef | grep java</PRE>
+
+      <P>and look for Tomcat's Java processes.  If they stay arround after running Tomcat's <code>shutdown.sh</code> script, trying <code>kill</code>ing them (with <code>-9</code> if necessary), then starting Tomcat again.</P></DD>
+
+      <DT>Database connections don't work, or accessing DSpace takes forever</DT>
+      <DD><P>If you find that when you try to access a DSpace Web page and your browser sits there connecting, or if the database connections fail, you might find that a 'zombie' database connection is hanging around preventing normal operation.  To see if this is the case, try:</P>
+
+      <PRE>ps -ef | grep postgres</PRE>
+
+      <P>You might see some processes like this</P>
+
+      <PRE>dspace 16325  1997  0  Feb 14  ?         0:00 postgres: dspace dspace 127.0.0.1 idle in transaction</PRE>
+
+      <P>This is normal--DSpace maintains a 'pool' of open database connections, which are re-used to avoid the overhead of constantly opening and closing connections.  If they're 'idle' it's OK; they're waiting to be used.  However sometimes, if something went wrong, they might be stuck in the middle of a query, which seems to prevent other connections from operating, e.g.:</P>
+
+      <PRE>dspace 16325  1997  0  Feb 14  ?         0:00 postgres: dspace dspace 127.0.0.1 SELECT</PRE>
+
+      <P>This means the connection is in the middle of a <CODE>SELECT</CODE> operation, and if you're not using DSpace right that instant, it's probably a 'zombie' connection.  If this is the case, try <code>kill</code>ing the process, and stopping and restarting Tomcat.</P></DD>
+
+      <dt>You've made changes to the code or to the JSP's and rebuilt DSpace successfully, but when you run Tomcat
+      you don't see any of your changes in DSpace.</dt>
+
+      <dd><p>After you've rebuilt DSpace and copied <code>dspace.war</code> from your <code><i>[dspace-source]</i>/build</code> directory
+    into your <code><i>[tomcat]</i>/webapps</code> directory, you must
+      also <strong>delete</strong> the existing <code><i>[tomcat]</i>/webapps/dspace</code> directory <strong>before</strong> re-starting Tomcat. Otherwise
+      Tomcat will continue to use the old code.<p></dd>
+
+    </DL>
+
+    <HR>
+
+    <ADDRESS>
+      Copyright &copy; 2002-2005 MIT and Hewlett Packard
+    </ADDRESS>
+  </BODY>
+</HTML>

dspace/docs/introduction.html

@@ -0,0 +1,57 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>DSpace System Documentation: Introduction</TITLE>
+    <LINK REL=StyleSheet HREF="style.css" TYPE="text/css">
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" >
+  </HEAD>
+  <BODY>
+    <H1>DSpace System Documentation: Introduction</H1>
+
+    <P><A HREF="index.html">Back to contents</A></P>
+
+    <P>DSpace is an open source software platform that enables organisations to:</p>
+
+    <ul>
+      <li>capture and describe digital material using a submission workflow module, or a variety of programmatic ingest options</li>
+      <li>distribute an organisation's digital assets over the web through a search and retrieval system</li>
+      <li>preserve digital assets over the long term</li>
+    </ul>
+
+    <P>This system documentation includes <A HREF="functional.html">a functional overview of the system</A>, which is a good introduction to the capabilities of the system, and should be readable by non-technical folk.  Everyone should read this section first because it introduces some terminology used throughout the rest of the documentation.</P>
+
+    <P>For people actually running a DSpace service, there is
+    <A HREF="install.html">an installation guide</A>, and sections on <A HREF="configure.html">configuration</A> and <A HREF="directories.html">the directory structure</A>.  Note that as of DSpace 1.2, the administration user interface guide is now on-line help available from within the DSpace system.</P>
+
+    <P>Finally, for those interested in the details of how DSpace works, and those potentially interested in modifying the code for their own purposes, there is <A HREF="architecture.html">a detailed architecture and design section</A>.</P>
+
+    <P>Other good sources of information are:</P>
+
+    <UL>
+      <LI>The DSpace Public API Javadocs.  Build these with the <code>public_api</code> Ant target.</LI>
+
+      <LI>The <A HREF="http://wiki.dspace.org/">DSpace Wiki</A> contains stacks of useful information about the DSpace platform and the work people are doing with it.  You are strongly encouraged to visit this site and add information about your own work.  Useful Wiki areas are:
+        <UL>
+          <LI><A HREF="http://wiki.dspace.org/DspaceResources">A list of DSpace resources</A> (Web sites, mailing lists etc.)</LI>
+          <LI><A HREF="http://wiki.dspace.org/TechnicalFaq">Technical FAQ</A></LI>
+          <LI><A HREF="http://wiki.dspace.org/DspaceProjects">A list of projects using DSpace</A></LI>
+          <LI><A HREF="http://wiki.dspace.org/ContributionGuidelines">Guidelines for contributing back to DSpace</A></LI>
+        </UL>
+      </LI>
+
+      <LI><A HREF="http://www.dspace.org/">www.dspace.org</A> has announcements and contains useful information about bringing up an instance of DSpace at your organization.</LI>
+
+      <LI>The University of Tennessee's Jason Simms has written some <A HREF="http://sunsite.utk.edu/diglib/dspace/">additional installation notes</A>.</LI>
+
+      <LI>The <A HREF="http://sourceforge.net/mailarchive/forum.php?forum_id=13580">dspace-tech e-mail list on SourceForge</A> is the recommended place to ask questions, since a growing community of DSpace developers and users is on hand on that list to help with any questions you might have.  The e-mail archive of that list is a useful resource.</LI>
+
+      <LI>The <A HREF="https://sourceforge.net/mailarchive/forum.php?forum_id=39921">dspace-devel e-mail list</A>, for those developing with the DSpace with a view to contributing to the core DSpace code.</LI>
+    </UL>
+
+    <HR>
+
+    <ADDRESS>
+     Copyright &copy; 2002-2005 MIT and Hewlett Packard
+    </ADDRESS>
+  </BODY>
+</HTML>

dspace/docs/postgres-upgrade-notes.txt

@@ -0,0 +1,117 @@
+Updating Postgres with a DSpace installation.
+
+
+
+
+1. Build new postgres.
+	Be sure to run configure with at least these options:
+	./configure --enable-multibyte --enable-unicode --with-java
+
+2. shutdown tomcat
+
+3. dump current data
+	pg_dumpall -o >dspace.out
+
+4. shut down postgres
+	pg_ctl stop -D /dspace/database/data -m fast
+
+5. back up old data directory
+	mv /dspace/database/data /dspace/database/data.old
+
+6. install new postgres
+
+7. start new postgres
+	initdb -D /dspace/database/data
+
+	edit /dspace/database/data/postgresql.conf (Add 'tcpip_socket = true')
+
+	pg_ctl start -D /dspace/database/data
+
+8. restore data
+	psql -d template1 -f dspace.out
+
+9. Install new JDBC driver
+	from the new postgres installation directory:
+	cp share/java/postgres.jar /dspace/lib
+
+10. restart tomcat
+
+
+-------------------------------------------------------------------------------
+Notes from postgres install docs:
+-------------------------------------------------------------------------------
+
+                              If You Are Upgrading
+
+The internal data storage format changes with new releases of PostgreSQL.
+Therefore, if you are upgrading an existing installation that does not have a
+version number "7.3.x", you must back up and restore your data as shown here.
+These instructions assume that your existing installation is under the "/usr/
+local/pgsql" directory, and that the data area is in "/usr/local/pgsql/data".
+Substitute your paths appropriately.
+
+    1. Make sure that your database is not updated during or after the backup.
+       This does not affect the integrity of the backup, but the changed data
+       would of course not be included. If necessary, edit the permissions in
+       the file "/usr/local/pgsql/data/pg_hba.conf" (or equivalent) to disallow
+       access from everyone except you.
+
+    2. To back up your database installation, type:
+
+         pg_dumpall > outputfile
+
+       If you need to preserve OIDs (such as when using them as foreign keys),
+       then use the "-o" option when running "pg_dumpall".
+       "pg_dumpall" does not save large objects. Check the Administrator's Guide
+       if you need to do this.
+       To make the backup, you can use the "pg_dumpall" command from the version
+       you are currently running. For best results, however, try to use the
+       "pg_dumpall" command from PostgreSQL 7.3.1, since this version contains
+       bug fixes and improvements over older versions. While this advice might
+       seem idiosyncratic since you haven't installed the new version yet, it is
+       advisable to follow it if you plan to install the new version in parallel
+       with the old version. In that case you can complete the installation
+       normally and transfer the data later. This will also decrease the
+       downtime.
+
+    3. If you are installing the new version at the same location as the old one
+       then shut down the old server, at the latest before you install the new
+       files:
+
+         kill -INT `cat /usr/local/pgsql/data/postmaster.pid`
+
+       Versions prior to 7.0 do not have this "postmaster.pid" file. If you are
+       using such a version you must find out the process id of the server
+       yourself, for example by typing "ps ax | grep postmaster", and supply it
+       to the "kill" command.
+       On systems that have PostgreSQL started at boot time, there is probably a
+       start-up file that will accomplish the same thing. For example, on a Red
+       Hat Linux system one might find that
+
+         /etc/rc.d/init.d/postgresql stop
+
+       works. Another possibility is "pg_ctl stop".
+
+    4. If you are installing in the same place as the old version then it is
+       also a good idea to move the old installation out of the way, in case you
+       have trouble and need to revert to it. Use a command like this:
+
+         mv /usr/local/pgsql /usr/local/pgsql.old
+
+After you have installed PostgreSQL 7.3.1, create a new database directory and
+start the new server. Remember that you must execute these commands while
+logged in to the special database user account (which you already have if you
+are upgrading).
+
+   /usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data
+   /usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data
+
+Finally, restore your data with
+
+   /usr/local/pgsql/bin/psql -d template1 -f outputfile
+
+using the *new* psql.
+These topics are discussed at length in the Administrator's Guide, which you
+are encouraged to read in any case.
+
+-------------------------------------------------------------------------------

dspace/docs/storage.html

@@ -0,0 +1,260 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html>
+<head>
+  <title>DSpace System Documentation: Storage Layer</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: Storage Layer</h1>
+
+  <p><a href="index.html">Back to contents</a></P>
+  <P><a href="architecture.html">Back to architecture overview</a></p>
+
+  <h2><a name="rdbms" id="rdbms">RDBMS</a></h2>
+
+  <p>DSpace uses a relational database to store all information about the organization of content, metadata about the content, information about e-people and authorization, and the state of currently-running workflows. The DSpace system also uses the relational database in order to maintain indices that users can browse.</p>
+
+  <p><A HREF="image/db-schema.gif">Graphical visualization of the relational database</A></P>
+
+  <p>Most of the functionality that DSpace uses can be offered by any standard SQL database that supports transactions.  Presently, the browse indices use some features specific to <a href="http://www.postgresql.org/">PostgreSQL</a> and <a href="http://www.oracle.com/database/">Oracle</A>, so some modification to the code would be needed before DSpace would function fully with an alternative database back-end.</p>
+
+  <p>The <code>org.dspace.storage.rdbms</code> package provides access to an SQL database in a somewhat simpler form than using JDBC directly. The main class is <code>DatabaseManager</code>, which executes SQL queries and returns <code>TableRow</code> or <code>TableRowIterator</code> objects. The <code>InitializeDatabase</code> class is used to load SQL into the database via JDBC, for example to set up the schema.</p>
+
+  <p>All calls to the <code>Database Manager</code> require a <a href="business.html#core">DSpace <code>Context</code> object</a>. Example use of the database manager API is given in the <code>org.dspace.storage.rdbms</code> package Javadoc.</p>
+
+  <p>The database schema used by DSpace (for PostgreSQL) is stored in <code><i>[dspace-source]</i>/etc/database_schema.sql</code> in the source distribution. It is stored in the form of SQL that can be fed straight into the DBMS to construct the database. The schema SQL file also directly creates two e-person groups in the database that are required for the system to function properly.</p>
+
+  <P>Also in <code><i>[dspace-source]</i>/etc</code> are various SQL files called <code>database_schema_1x_1y</code>.  These contain the necessary SQL commands to update a live DSpace database from version 1.<code>x</code> to 1.<code>y</code>.  Note that this might not be the only part of an upgrade process:  see <a href="update.html">Updating a DSpace Installation</a> for details.</P>
+
+  <p>The DSpace database code uses an SQL function <code>getnextid</code> to assign primary keys to newly created rows. This SQL function must be safe to use if several JVMs are accessing the database at once; for example, the Web UI might be creating new rows in the database at the same time as the batch item importer. The PostgreSQL-specific implementation of the method uses <code>SEQUENCES</code> for each table in order to create new IDs. If an alternative database backend were to be used, the implementation of <code>getnextid</code> could be updated to operate with that specific DBMS.</p>
+
+  <p>The <code>etc</code> directory in the source distribution contains two further SQL files. <code>clean-database.sql</code> contains the SQL necessary to completely clean out the database, so use with caution! The Ant target <code>clean_database</code> can be used to execute this. <code>update-sequences.sql</code> contains SQL to reset the primary key generation sequences to appropriate values. You'd need to do this if, for example, you're restoring a backup database dump which creates rows with specific primary keys already defined. In such a case, the sequences would allocate primary keys that were already used.</p>
+
+  <P>Versions of the <code>*.sql*</code> files for Oracle are stored in <code><i>[dspace-source]</i>/etc/oracle</code>.  These need to be copied over their PostgreSQL counterparts in <code><i>[dspace-source]</i>/etc</code> prior to installation.</P>
+
+  <h3>Maintenance and Backup</h3>
+
+  <p>When using PostgreSQL, it's a good idea to perform regular 'vacuuming' of the database to optimize performance. This is performed by the <code>vacuumdb</code> command which can be executed via a 'cron' job, for example by putting this in the system <code>crontab</code>:</p>
+  <pre>
+# clean up the database nightly
+40 2 * * * /usr/local/pgsql/bin/vacuumdb --analyze dspace &gt; /dev/null 2&gt;&amp;1
+</pre>
+
+  <p>The DSpace database can be backed up and restored using usual methods, for example with <code>pg_dump</code> and <code>psql</code>. However when restoring a database, you will need to perform these additional steps:</p>
+
+  <ul>
+    <li>
+      <p>The <code>fresh_install</code> target loads up the initial contents of the Dublin Core type and bitstream format registries, as well as two entries in the <code>epersongroup</code> table for the system anonymous and administrator groups. Before you restore a raw backup of your database you will need to remove these, since they will already exist in your backup, possibly having been modified. For example, use:</p>
+      <pre>
+DELETE FROM dctyperegistry;
+DELETE FROM bitstreamformatregistry;
+DELETE FROM epersongroup;
+</pre>
+    </li>
+
+    <li>
+      <p>After restoring a backup, you will need to reset the primary key generation sequences so that they do not produce already-used primary keys. Do this by executing the SQL in <code><i>[dspace-source]</i>/etc/update-sequences.sql</code>, for example with:</p>
+      <pre>
+psql -U dspace -f <i>[dspace-source]</i>/etc/update-sequences.sql
+</pre>
+    </li>
+  </ul>
+
+  <p>Future updates of DSpace may involve minor changes to the database schema. Specific instructions on how to update the schema whilst keeping live data will be included. The current schema also contains a few currently unused database columns, to be used for extra functionality in future releases. These unused columns have been added in advance to minimize the effort required to upgrade.</p>
+
+  <h3>Configuring the RDBMS Component</h3>
+
+  <p>The database manager is configured with the following properties in <code>dspace.cfg</code>:</p>
+
+  <table>
+    <tbody>
+      <tr>
+        <td><code>db.url</code></td>
+
+        <td>The JDBC URL to use for accessing the database. This should not point to a connection pool, since DSpace already implements a connection pool.</td>
+      </tr>
+
+      <tr>
+        <td><code>db.driver</code></td>
+
+        <td>JDBC driver class name. Since presently, DSpace uses PostgreSQL-specific features, this should be <code>org.postgresql.Driver</code>.</td>
+      </tr>
+
+      <tr>
+        <td><code>db.username</code></td>
+
+        <td>Username to use when accessing the database.</td>
+      </tr>
+
+      <tr>
+        <td><code>db.password</code></td>
+
+        <td>Corresponding password ot use when accessing the database.</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <h2><a name="bitstreams" id="bitstreams">Bitstream Store</a></h2>
+
+  <p>DSpace offers two means for storing content. The first is in the file system on the server. The second is using <a href="http://www.sdsc.edu/srb">SRB (Storage Resource Broker)</a>. Both are achieved using a simple, lightweight API.</p>
+
+  <p>SRB is purely an option but may be used in lieu of the server's file system or in addition to the file system. Without going into a full description, SRB is a very robust, sophisticated storage manager that offers essentially unlimited storage and straightforward means to replicate (in simple terms, backup) the content on other local or remote storage resources.</p>
+
+  <p>The terms "store", "retrieve", "in the system", "storage", and so forth, used below can refer to storage in the file system on the server ("traditional") or in SRB.</p>
+
+  <p>The <code>BitstreamStorageManager</code> provides low-level access to bitstreams stored in the system. In general, it should not be used directly; instead, use the <code>Bitstream</code> object in the <a href="business.html#content">content management API</a> since that encapsulated authorization and other metadata to do with a bitstream that are not maintained by the <code>BitstreamStorageManager</code>.</p>
+
+  <p>The bitstream storage manager provides three methods that store, retrieve and delete bitstreams. Bitstreams are referred to by their 'ID'; that is the primary key <code>bitstream_id</code> column of the corresponding row in the database.</p>
+
+  <p>As of DSpace version 1.1, there can be multiple bitstream stores. Each of these bitstream stores can be traditional storage or SRB storage. This means that the potential storage of a DSpace system is not bound by the maximum size of a single disk or file system and also that traditional and SRB storage can be combined in one DSpace installation. Both traditional and SRB storage are specified by <a href="configure.html">configuration parameters</a>. Also see Configuring the Bitstream Store below.</p>
+
+  <p>Stores are numbered, starting with zero, then counting upwards. Each bitstream entry in the database has a store number, used to retrieve the bitstream when required.</p>
+
+  <p>At the moment, the store in which new bitstreams are placed is decided using a configuration parameter, and there is no provision for moving bitstreams between stores. Administrative tools for manipulating bitstreams and stores will be provided in future releases. Right now you can move a whole store (e.g. you could move store number 1 from <code>/localdisk/store</code> to <code>/fs/anotherdisk/store</code> but it would still have to be store number 1 and have the exact same contents.</p>
+
+  <p>Bitstreams also have an 38-digit internal ID, different from the primary key ID of the bitstream table row. This is not visible or used outside of the bitstream storage manager. It is used to determine the exact location (relative to the relevant store directory) that the bitstream is stored in traditional or SRB storage. The first three pairs of digits are the directory path that the bitstream is stored under. The bitstream is stored in a file with the internal ID as the filename.</p>
+
+  <p>For example, a bitstream with the internal ID <code>12345678901234567890123456789012345678</code> is stored in the directory:</p>
+  <pre>
+(assetstore dir)/12/34/56/12345678901234567890123456789012345678
+</pre>
+
+  <p>The reasons for storing files this way are:</p>
+
+  <ul>
+    <li>
+      <p>Using a randomly-generated 38-digit number means that the 'number space' is less cluttered than simply using the primary keys, which are allocated sequentially and are thus close together. This means that the bitstreams in the store are distributed around the directory structure, improving access efficiency.</p>
+    </li>
+
+    <li>
+      <p>The internal ID is used as the filename partly to avoid requiring an extra lookup of the filename of the bitstream, and partly because bitstreams may be received from a variety of operating systems. The original name of a bitstream may be an illegal UNIX filename.</p>
+    </li>
+  </ul>
+
+  <p>When storing a bitstream, the <code>BitstreamStorageManager</code> DOES set the following fields in the corresponding database table row:</p>
+
+  <ul>
+    <li><code>bitstream_id</code></li>
+
+    <li><code>size</code></li>
+
+    <li><code>checksum</code></li>
+
+    <li><code>checksum_algorithm</code></li>
+
+    <li><code>internal_id</code></li>
+
+    <li><code>deleted</code></li>
+
+    <li><code>store_number</code></li>
+  </ul>
+
+  <p>The remaining fields are the responsibility of the <code>Bitstream</code> content management API class.</p>
+
+  <p>The bitstream storage manager is fully transaction-safe. In order to implement transaction-safety, the following algorithm is used to store bitstreams:</p>
+
+  <ol>
+    <li>A database connection is created, separately from the currently active connection in the <a href="business.html#core">current DSpace context</a>.</li>
+
+    <li>An unique internal identifier (separate from the database primary key) is generated.</li>
+
+    <li>The bitstream DB table row is created using this new connection, with the <code>deleted</code> column set to <code>true</code>.</li>
+
+    <li>The new connection is <code>commit</code>ted, so the 'deleted' bitstream row is written to the database</li>
+
+    <li>The bitstream itself is stored in a file in the configured 'asset store directory', with a directory path and filename derived from the internal ID</li>
+
+    <li>The <code>deleted</code> flag in the bitstream row is set to <code>false</code>. This will occur (or not) as part of the current DSpace <code>Context</code>.</li>
+  </ol>
+
+  <p>This means that should anything go wrong before, during or after the bitstream storage, only one of the following can be true:</p>
+
+  <ul>
+    <li>No bitstream table row was created, and no file was stored</li>
+
+    <li>A bitstream table row with <code>deleted=true</code> was created, no file was stored</li>
+
+    <li>A bitstream table row with <code>deleted=true</code> was created, and a file was stored</li>
+  </ul>
+
+  <p>None of these affect the integrity of the data in the database or bitstream store.</p>
+
+  <p>Similarly, when a bitstream is deleted for some reason, its <code>deleted</code> flag is set to true as part of the overall transaction, and the corresponding file in storage is <em>not</em> deleted.</p>
+
+  <p>The above techniques mean that the bitstream storage manager is transaction-safe. Over time, the bitstream database table and file store may contain a number of 'deleted' bitstreams. The <code>cleanup</code> method of <code>BitstreamStorageManager</code> goes through these deleted rows, and actually deletes them along with any corresponding files left in the storage. It only removes 'deleted' bitstreams that are more than one hour old, just in case cleanup is happening in the middle of a storage operation.</p>
+
+  <p>This cleanup can be invoked from the command line via the <code>Cleanup</code> class, which can in turn be easily executed from a shell on the server machine using <code>/dspace/bin/cleanup</code>. You might like to have this run regularly by <code>cron</code>, though since DSpace is read-lots, write-not-so-much it doesn't need to be run very often.</p>
+
+  <h3>Backup</h3>
+
+  <p>The bitstreams (files) in traditional storage may be backed up very easily by simply 'tarring' or 'zipping' the <code>assetstore</code> directory (or whichever directory is configured in <code>dspace.cfg</code>). Restoring is as simple as extracting the backed-up compressed file in the appropriate location.</p>
+
+  <p>Similar means could be used for SRB, but SRB offers many more options for managing backup.</p>
+
+  <p>It is important to note that since the bitstream storage manager holds the bitstreams in storage, and information about them in the database, that a database backup and a backup of the files in the bitstream store must be made at the same time; the bitstream data in the database must correspond to the stored files.</p>
+
+  <p>Of course, it isn't really ideal to 'freeze' the system while backing up to ensure that the database and files match up. Since DSpace uses the bitstream data in the database as the authoritative record, it's best to back up the database before the files. This is because it's better to have a bitstream in storage but not the database (effectively non-existent to DSpace) than a bitstream record in the database but not storage, since people would be able to find the bitstream but not actually get the contents.</p>
+
+  <h3>Configuring the Bitstream Store</h3>
+
+  <P>Both traditional and SRB bitstream stores are configured in <code>dspace.cfg</code>.</P>
+
+  <h4>Configuring Traditonal Storage</h4>
+
+  <P>Bitstream stores in the file system on the server are configured like this:</P>
+
+  <pre>
+assetstore.dir = <i>[dspace]</i>/assetstore
+</pre>
+
+  <p>(Remember that <i>[dspace]</i> is a placeholder for the actual name of your DSpace install directory).</p>
+
+  <p>The above example specifies a single asset store.</p>
+  <pre>
+assetstore.dir = <i>[dspace]</i>/assetstore_0
+assetstore.dir.1 = /mnt/other_filesystem/assetstore_1
+</pre>
+
+  <p>The above example specifies two asset stores. assetstore.dir specifies the asset store number 0 (zero); after that use assetstore.dir.1, assetstore.dir.2 and so on. The particular asset store a bitstream is stored in is held in the database, so don't move bitstreams between asset stores, and don't renumber them.</p>
+
+  <p>By default, newly created bitstreams are put in asset store 0 (i.e. the one specified by the assetstore.dir property.) This allows backwards compatibility with pre-DSpace 1.1 configurations. To change this, for example when asset store 0 is getting full, add a line to <code>dspace.cfg</code> like:</p>
+  <pre>
+assetstore.incoming = 1
+</pre>
+
+  <p>Then restart DSpace (Tomcat). New bitstreams will be written to the asset store specified by <code>assetstore.dir.1</code>, which is <code>/mnt/other_filesystem/assetstore_1</code> in the above example.</p>
+
+  <h4>Configuring SRB Storage</h4>
+
+  <P>The same framework is used to configure SRB storage. That is, the asset store number (0..n) can reference a file system directory as above or it can reference a <span style="font-weight: bold;">set</span> of SRB account parameters. But any particular asset store number can reference one or the other but not both. This way traditional and SRB storage can both be used but with different asset store numbers. The same cautions mentioned above apply to SRB asset stores as well: The particular asset store a bitstream is stored in is held in the database, so don't move bitstreams between asset stores, and don't renumber them.</P>
+
+  <P>For example, let's say asset store number 1 will refer to SRB. The there will be a set of SRB account parameters like this:</P>
+  <pre>
+srb.host.1 = mysrbmcathost.myu.edu
+srb.port.1 = 5544
+srb.mcatzone.1 = mysrbzone
+srb.mdasdomainname.1 = mysrbdomain
+srb.defaultstorageresource.1 = mydefaultsrbresource
+srb.username.1 = mysrbuser
+srb.password.1 = mysrbpassword
+srb.homedirectory.1 = /mysrbzone/home/mysrbuser.mysrbdomain
+srb.parentdir.1 = mysrbdspaceassetstore
+</pre>
+
+  <P>Several of the terms, such as <code>mcatzone</code>, have meaning only in the SRB context and will be familiar to SRB users. The last, <code>srb.parentdir.n</code>, can be used to used for addition (SRB) upper directory structure within an SRB account. This property value could be blank as well.</P>
+
+  <P>(If asset store 0 would refer to SRB it would be <code>srb.host =</code> ..., <code>srb.port =</code> ..., and so on (<code>.0</code> omitted) to be consistent with the traditional storage configuration above.)</P>
+
+  <P>The similar use of <code>assetstore.incoming</code> to reference asset store 0 (default) or 1..n (explicit property) means that new bitstreams will be written to traditional or SRB storage determined by whether a file system directory on the server is referenced or a set of SRB account parameters are referenced.</P>
+
+  <P>There are comments in dspace.cfg that further elaborate the configuration of traditional and SRB storage.</P>
+
+  <hr>
+
+  <address>
+    Copyright &copy; 2002-2005 MIT and Hewlett Packard
+  </address>
+</body>
+</html>

dspace/docs/style.css

@@ -0,0 +1,29 @@
+BODY { font-family: "verdana", Arial, Helvetica, sans-serif;
+       font-size: 10pt;
+       font-style: normal;
+       color: #000000;
+       background: #ffffff;
+       margin: 30px }
+
+P { text-align: justify }
+
+H1 { text-align: center }
+
+TABLE { text-align: center }
+
+TH { text-align: center;
+     font-size: 10pt;
+     font-weight: bold }
+
+TD { text-align: left;
+     font-size: 10pt;
+     padding: 4px }
+
+DT { font-weight: bold }
+
+.figure { text-align: center;
+          margin-bottom: 2px }
+
+.caption { text-align: center;
+           margin-top: 0;
+           font-size: 8pt }

dspace/docs/submission.html

@@ -0,0 +1,295 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+
+<HTML>
+<HEAD>
+  <META name="generator" content="HTML Tidy for Windows (vers 1st December 2004), see www.w3.org">
+
+  <TITLE>DSpace System Documentation: Submission Forms Customization</TITLE>
+  <LINK rel="StyleSheet" href="style.css" type="text/css">
+  <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
+</HEAD>
+
+<BODY>
+  <H1>Custom Metadata-entry Pages for Submission</H1>
+
+  <P><A href="index.html">Back to contents</A></P>
+
+  <H2>Introduction</H2>
+
+  <P>This section explains how to customize the Web forms used by submitters and editors to enter and modify the metadata for a new item.</P>
+
+  <P>You can customize the "default" metadata forms used by all collections, and also create alternate sets of metadata forms and assign them to specific collections. In creating custom metadata forms, you can choose:</P>
+
+  <UL>
+    <LI>The number of metadata-entry pages.</LI>
+
+    <LI>Which fields appear on each page, and their sequence.</LI>
+
+    <LI>Labels, prompts, and other text associated with each field.</LI>
+
+    <LI>List of available choices for each menu-driven field.</LI>
+  </UL>
+
+  <P><STRONG>N.B.</STRONG>The cosmetic and ergonomic details of metadata entry fields remain the same as the fixed metadata pages in previous DSpace releases, and can only be altered by modifying the appropriate stylesheet and JSP pages.</P>
+
+  <P>All of the custom metadata-entry forms for a DSpace instance are controlled by a single XML file, <CODE>input-forms.xml</CODE>, in the <CODE>config</CODE> subdirectory under the DSpace home. DSpace comes with a sample configuration that implements the traditional metadata-entry forms, which also serves as a well-documented example. The rest of this section explains how to create your own sets of custom forms.</P>
+
+  <H2>Describing Custom Metadata Forms</H2>
+
+  <P>The description of a set of pages through which submitters enter their metadata is called a <EM>form</EM> (although it is actually a set of forms, in the HTML sense of the term). A form is identified by a unique symbolic <EM>name</EM>. In the XML structure, the <EM>form</EM> is broken down into a series of <EM>pages</EM>: each of these represents a separate Web page for collecting metadata elements.</P>
+
+  <P>To set up one of your DSpace collections with customized submission forms, first you make an entry in the <EM>form-map</EM>. This is effectively a table that relates a collection to a form set, by connecting the collection's <EM>Handle</EM> to the form name. Collections are identified by handle because their names are mutable and not necessarily unique, while handles are unique and persistent.</P>
+
+  <P>A special map entry, for the collection handle "default", defines the <EM>default</EM> form set. It applies to all collections which are not explicitly mentioned in the map. In the example XML this form set is named <CODE>traditional</CODE> (for the "traditional" DSpace user interface) but it could be named anything.</P>
+
+  <H2>The Structure of <CODE>input-forms.xml</CODE></H2>
+
+  <P>The XML configuration file has a single top-level element, <CODE>input-forms</CODE>, which contains three elements in a specific order. The outline is as follows:</P>
+  <PRE>
+&lt;input-forms&gt;
+
+  &lt;-- <EM>Map of Collections to Form Sets</EM> --&gt;
+  &lt;form-map&gt;
+    &lt;name-map collection-handle="default" form-name="traditional" /&gt;
+    ...
+  &lt;/form-map&gt;
+
+  &lt;-- <EM>Form Set Definitions</EM> --&gt;
+  &lt;form-definitions&gt;
+    &lt;form name="traditional"&gt;
+    ...
+  &lt;/form-definitions&gt;
+
+  &lt;-- <EM>Name/Value Pairs used within Multiple Choice Widgets</EM> --&gt;
+  &lt;form-value-pairs&gt;
+    &lt;value-pairs value-pairs-name="common_iso_languages" dc-term="language_iso"&gt;
+    ...
+  &lt;/form-value-pairs&gt;
+&lt;/input-forms&gt;
+</PRE>
+
+  <H3>Adding a Collection Map</H3>
+
+  <P>Each <CODE>name-map</CODE> element within <CODE>form-map</CODE> associates a collection with the name of a form set. Its <CODE>collection-handle</CODE> attribute is the Handle of the collection, and its <CODE>form-name</CODE> attribute is the form set name, which must match the <CODE>name</CODE> attribute of a <CODE>form</CODE> element.</P>
+
+  <P>For example, the following fragment shows how the collection with handle "12345.6789/42" is attached to the "TechRpt" form set:</P>
+  <PRE>
+  &lt;form-map&gt;
+    &lt;name-map collection-handle="<STRONG>12345.6789/42</STRONG>" form-name="<STRONG>TechRpt</STRONG>" /&gt;
+    ...
+  &lt;/form-map&gt;
+
+  &lt;form-definitions&gt;
+    &lt;form name="<STRONG>TechRept</STRONG>"&gt;
+    ...
+  &lt;/form-definitions&gt;
+</PRE>
+
+  <P>It's a good idea to keep the definition of the <CODE><STRONG>default</STRONG></CODE> name-map from the example <CODE>input-forms.xml</CODE> so there is always a default for collections which do not have a custom form set.</P>
+
+  <H4>Getting A Collection's Handle</H4>
+
+  <P>You will need the <EM>handle</EM> of a collection in order to assign it a custom form set. To discover the handle, go to the "Communities &amp; Collections" page under "<STRONG>Browse</STRONG>" in the left-hand menu on your DSpace home page. Then, find the link to your collection. It should look something like:</P>
+  <PRE>
+    http://myhost.my.edu/dspace/handle/<U><STRONG>12345.6789/42</STRONG></U>
+</PRE>
+
+  <P>The underlined part of the URL is the handle. It should look familiar to any DSpace administrator. That is what goes in the <CODE>collection-handle</CODE> attribute of your <CODE>name-map</CODE> element.</P>
+
+  <H3>Adding a Form Set</H3>
+
+  <P>You can add a new form set by creating a new <CODE>form</CODE> element within the <CODE>form-definitions</CODE> element. It has one attribute, <CODE>name</CODE>, which as seen above must match the value of the <CODE>name-map</CODE> for the collections it is to be used for.</P>
+
+  <H4>Forms and Pages</H4>
+
+  <P>The content of the <CODE>form</CODE> is a sequence of <CODE>page</CODE> elements. Each of these corresponds to a Web page of forms for entering metadata elements, presented in sequence between the initial "Describe" page and the final "Verify" page (which presents a summary of all the metadata collected).</P>
+
+  <P>A <CODE>form</CODE> must contain at least one and at most six pages. They are presented in the order they appear in the XML. Each <CODE>page</CODE> element must include a <CODE>number</CODE> attribute, that should be its sequence number, e.g.</P>
+  <PRE>
+&lt;page number="1"&gt;
+</PRE>
+
+  <P>The <CODE>page</CODE> element, in turn, contains a sequence of <CODE>field</CODE> elements. Each field defines an interactive dialog where the submitter enters one of the Dublin Core metadata items.</P>
+
+  <H4>Composition of a Field</H4>
+
+  <P>Each <CODE>field</CODE> contains the following elements, in the order indicated. The required sub-elements are so marked:</P>
+
+  <DL>
+    <DT><STRONG><CODE>dc-schema</CODE></STRONG> <EM>(Required)</EM></DT>
+
+    <DD>Name of metadata schema employed, e.g. <CODE>dc</CODE> for Dublin Core. This value must match the value of the <CODE>schema</CODE> element defined in <CODE>dublin-core-types.xml<CODE></DD>
+
+    <DT><STRONG><CODE>dc-element</CODE></STRONG> <EM>(Required)</EM></DT>
+
+    <DD>Name of the Dublin Core element entered in this field, e.g. <CODE>contributor</CODE>.</DD>
+
+    <DT><STRONG><CODE>dc-qualifier</CODE></STRONG></DT>
+
+    <DD>Qualifier of the Dublin Core element entered in this field, e.g. when the field is <CODE>contributor.advisor</CODE> the value of this element would be <CODE>advisor</CODE>. Leaving this out means the input is for an unqualified DC element.</DD>
+
+    <DT><STRONG><CODE>repeatable</CODE></STRONG></DT>
+
+    <DD>Value is <CODE>true</CODE> when multiple values of this field are allowed, <CODE>false</CODE> otherwise. When you mark a field repeatable, the UI servlet will add a control to let the user ask for more fields to enter additional values. Intended to be used for arbitrarily-repeating fields such as subject keywords, when it is impossible to know in advance how many input boxes to provide.</DD>
+
+    <DT><STRONG><CODE>label</CODE></STRONG> <EM>(Required)</EM></DT>
+
+    <DD>Text to display as the label of this field, describing what to enter, e.g. "<CODE>Your Advisor's Name</CODE>".</DD>
+
+    <DT><STRONG><CODE>input-type</CODE></STRONG> <EM>(Required)</EM></DT>
+
+    <DD>
+      Defines the kind of interactive widget to put in the form to collect the Dublin Core value. Content must be one of the following keywords:
+
+      <UL>
+        <LI><STRONG>onebox</STRONG> -- A single text-entry box.</LI>
+
+        <LI><STRONG>twobox</STRONG> -- A pair of simple text-entry boxes, used for <EM>repeatable</EM> values such as the DC <CODE>subject</CODE> item.</LI>
+
+        <LI><STRONG>textarea</STRONG> -- Large block of text that can be entered on multiple lines, e.g. for an abstract.</LI>
+
+        <LI><STRONG>name</STRONG> -- Personal name, with separate fields for family name and first name.</LI>
+
+        <LI><STRONG>date</STRONG> -- Calendar date. when required, demands that at least the year be entered.</LI>
+
+        <LI><STRONG>dropdown</STRONG> -- Choose value(s) from a "drop-down" menu list. <STRONG>Note:</STRONG> You must also include a value for the <CODE>value-pairs-name</CODE> attribute to specify a list of menu entries, from which to choose, for this item. Use this to make a choice from a restricted set of options, such as for the <CODE>language</CODE> item.</LI>
+
+        <LI><STRONG>qualdrop_value</STRONG> -- Enter a "qualified value", which includes <EM>both</EM> a qualifier from a drop-down menu and a free-text value. Used to enter items like alternate identifers and codes for a submitted item, e.g. the DC <CODE>identifier</CODE> field. <STRONG>Note:</STRONG> As for the <CODE>dropdown</CODE> type, you must include the <CODE>value-pairs-name</CODE> attribute to specify a menu choice list.</LI>
+      </UL>
+    </DD>
+
+    <DT><STRONG><CODE>hint</CODE></STRONG> <EM>(Required)</EM></DT>
+
+    <DD>Content is the text that will appear as a "hint", or instructions, next to the input fields. Can be left empty, but it must be present.</DD>
+
+    <DT><STRONG><CODE>required</CODE></STRONG></DT>
+
+    <DD>When this element is included with any content, it marks the field as a required input. If the user tries to leave the page without entering a value for this field, that text is displayed as a warning message. For example,<BR>
+    <CODE>&lt;required&gt;You must enter a title.&lt;/required&gt;<BR>
+    Note that leaving the</CODE> required element empty will <EM>not</EM> mark a field as required, e.g.:<BR>
+    <CODE>&lt;required&gt;&lt;/required&gt;</CODE></DD>
+
+    <DT><STRONG><CODE>visibility</CODE></STRONG></DT>
+
+    <DD>When this optional element is included with a value, it restricts the visibility of the field to the 
+    scope defined by that value. If the element is missing or empty, the field is visible in all scopes.
+    Currently supported scopes are:
+    <ul>
+       <li><strong>workflow</strong>: the field will only be visible in the workflow stages of submission. This
+           is good for hiding difficult fields for users, such as subject classifications, thereby easing the
+           use of the submission system.</li>
+       <li><strong>submit</strong>: the field will only be visible in the initial submission, and not in the
+           workflow stages.</li>
+    </ul>
+    For example:<br/>
+    <CODE>&lt;visibility&gt;workflow&lt;/visibility&gt;</CODE><br/>
+    Note that it is considered a configuration error to limit a field's scope while also requiring it -
+    an exception will be generated when this combination is detected.</DD>
+  </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:
+
+  <OL>
+    <LI><STRONG>The item has more than one title, e.g. a translated title</STRONG><BR>
+    Controls <CODE>title.alternative</CODE> field.</LI>
+
+    <LI>
+      <STRONG>The item has been published or publicly distributed before</STRONG><BR>
+      Controls DC fields:
+
+      <UL>
+        <LI><CODE>date.issued</CODE></LI>
+
+        <LI><CODE>publisher</CODE></LI>
+
+        <LI><CODE>identifier.citation</CODE></LI>
+      </UL>
+    </LI>
+
+    <LI><STRONG>The item consists of more than one file</STRONG><BR>
+    <EM>Does not affect any metadata input fields.</EM></LI>
+  </OL>The answers to the first two questions control whether inputs for certain of the DC metadata fields will displayed, even if they are defined as fields in a custom page.
+
+  <P>Conversely, if the metadata fields controlled by a checkbox are not mentioned in the custom form, the checkbox is elided from the initial page to avoid confusing or misleading the user.</P>
+
+  <P>The two relevant checkbox entries are "The item has more than one title, e.g. a translated title", and "The item has been published or publicly distributed before". The checkbox for multiple titles trigger the display of the field with dc-element equal to 'title' and dc-qualifier equal to 'alternative'. If the controlling collection's form set does not contain this field, then the multiple titles question will not appear on the initial questions page.</P>
+
+  <H3>Adding <CODE>Value-Pairs</CODE></H3>Finally, your custom form description needs to define the "value pairs" for any fields with input types that refer to them. Do this by adding a <CODE>value-pairs</CODE> element to the contents of <CODE>form-value-pairs</CODE>. It has the following required attributes:
+
+  <UL>
+    <LI><STRONG><CODE>value-pairs-name</CODE></STRONG> -- Name by which an <CODE>input-type</CODE> refers to this list.</LI>
+
+    <LI><STRONG><CODE>dc-term</CODE></STRONG> -- Qualified Dublin Core field for which this choice list is selecting a value.</LI>
+  </UL>Each <CODE>value-pairs</CODE> element contains a sequence of <CODE>pair</CODE> sub-elements, each of which in turn contains two elements:
+
+  <UL>
+    <LI><STRONG><CODE>displayed-value</CODE></STRONG> -- Name shown (on the web page) for the menu entry.</LI>
+
+    <LI><STRONG><CODE>stored-value</CODE></STRONG> -- Value stored in the DC element when this entry is chosen.</LI>
+  </UL>
+
+  <P>Unlike the HTML <CODE>select</CODE> tag, there is no way to indicate one of the entries should be the default, so the first entry is always the default choice.</P>
+
+  <H4>Example</H4>
+
+  <P>Here is a menu of types of common identifiers:</P>
+  <PRE>
+   &lt;value-pairs value-pairs-name="common_identifiers" dc-term="identifier"&gt;
+     &lt;pair&gt;
+       &lt;displayed-value&gt;Gov't Doc #&lt;/displayed-value&gt;
+       &lt;stored-value&gt;govdoc&lt;/stored-value&gt;
+     &lt;/pair&gt;
+     &lt;pair&gt;
+       &lt;displayed-value&gt;URI&lt;/displayed-value&gt;
+       &lt;stored-value&gt;uri&lt;/stored-value&gt;
+     &lt;/pair&gt;
+     &lt;pair&gt;
+       &lt;displayed-value&gt;ISBN&lt;/displayed-value&gt;
+       &lt;stored-value&gt;isbn&lt;/stored-value&gt;
+     &lt;/pair&gt;
+   &lt;/value-pairs&gt;
+</PRE>It generates the following HTML, which results in the menu widget below. (Note that there is no way to indicate a default choice in the custom input XML, so it cannot generate the HTML <CODE>SELECTED</CODE> attribute to mark one of the options as a pre-selected default.)
+  <PRE>
+&lt;select name="identifier_qualifier_0"&gt;
+&lt;option VALUE="govdoc"&gt;Gov't Doc #&lt;/option&gt;
+&lt;option VALUE="uri"&gt;URI&lt;/option&gt;
+&lt;option VALUE="isbn"&gt;ISBN&lt;/option&gt;
+&lt;/select&gt;
+</PRE>
+
+  <FORM ACTION="submission.html">
+    <STRONG>Identifiers:</STRONG> <SELECT name="identifier_qualifier_0">
+      <OPTION value="govdoc">
+        Gov't Doc #
+      </OPTION>
+
+      <OPTION value="uri">
+        URI
+      </OPTION>
+
+      <OPTION value="isbn">
+        ISBN
+      </OPTION>
+    </SELECT>
+  </FORM>
+
+  <H2>Deploying Your Custom Forms</H2>The DSpace web application only reads your custom form definitions when it starts up, so it is important to remember:
+
+  <BLOCKQUOTE>
+    <EM><STRONG>You must always restart Tomcat</STRONG> (or whatever servlet container you are using) for changes made to the <CODE>input-forms.xml</CODE> file take effect.</EM>
+  </BLOCKQUOTE>
+
+  <P>Any mistake in the syntax or semantics of the form definitions, such as poorly formed XML or a reference to a nonexistent field name, will cause a fatal error in the DSpace UI. The exception message (at the top of the stack trace in the <CODE>dspace.log</CODE> file) usually has a concise and helpful explanation of what went wrong. Don't forget to stop and restart the servlet container before testing your fix to a bug.</P>
+
+  <HR>
+
+  <ADDRESS>
+    Copyright &copy; 2002-2005 MIT and Hewlett Packard
+  </ADDRESS>
+</BODY>
+</HTML>

dspace/docs/update.html

@@ -0,0 +1,681 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<HTML>
+  <HEAD>
+    <TITLE>DSpace System Documentation: Updating a DSpace Installation</TITLE>
+    <LINK REL=StyleSheet HREF="style.css" TYPE="text/css">
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" >
+  </HEAD>
+  <BODY>
+    <H1>DSpace System Documentation: Updating a DSpace Installation</H1>
+
+    <P><A HREF="index.html">Back to contents</A></P>
+
+    <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>
+      <li>
+        <p>First and foremost, <strong>make a complete backup</strong> of your system, including:</P>
+        <ul>
+          <li>A snapshot of the database</li>
+          <li>The asset store (<code><i>[dspace]</i>/assetstore</code> by default)</li>
+          <li>Your configuration files and localized JSPs</li>
+        </ul>
+      </li>
+
+      <li>
+        <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.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>
+
+      <li><p>Your DSpace configuration will need some updating:</p>
+
+        <ul>
+          <li><p>In <code>dspace.cfg</code>, paste in the following lines for the new stackable authentication feature, the new method for managing Media Filters, and the Checksum Checker.</p>
+
+<pre>#### Stackable Authentication Methods #####
+# Stack of authentication methods
+#  (See org.dspace.eperson.AuthenticationManager)
+plugin.sequence.org.dspace.eperson.AuthenticationMethod = \
+	  org.dspace.eperson.PasswordAuthentication
+
+#### Example of configuring X.509 authentication
+#### (to use it, add org.dspace.eperson.X509Authentication to stack)
+
+## method 1, using keystore
+#authentication.x509.keystore.path = /var/local/tomcat/conf/keystore
+#authentication.x509.keystore.password = changeit
+
+## method 2, using CA certificate
+#authentication.x509.ca.cert = ${dspace.dir}/config/mitClientCA.der
+
+## Create e-persons for unknown names in valid certificates?
+#authentication.x509.autoregister = true
+
+
+#### Media Filter plugins (through PluginManager) ####
+
+plugin.sequence.org.dspace.app.mediafilter.MediaFilter = \
+    org.dspace.app.mediafilter.PDFFilter, org.dspace.app.mediafilter.HTMLFilter, \
+    org.dspace.app.mediafilter.WordFilter, org.dspace.app.mediafilter.JPEGFilter
+# to enable branded preview: remove last line above, and uncomment 2 lines below
+#   org.dspace.app.mediafilter.WordFilter, org.dspace.app.mediafilter.JPEGFilter, \
+#   org.dspace.app.mediafilter.BrandedPreviewJPEGFilter
+
+filter.org.dspace.app.mediafilter.PDFFilter.inputFormats = Adobe PDF
+filter.org.dspace.app.mediafilter.HTMLFilter.inputFormats = HTML, Text
+filter.org.dspace.app.mediafilter.WordFilter.inputFormats = Microsoft Word
+filter.org.dspace.app.mediafilter.JPEGFilter.inputFormats = GIF, JPEG, image/png
+filter.org.dspace.app.mediafilter.BrandedPreviewJPEGFilter.inputFormats = GIF, JPEG, image/png
+
+
+#### Settings for Item Preview ####
+webui.preview.enabled = false
+# max dimensions of the preview image
+webui.preview.maxwidth = 600
+webui.preview.maxheight = 600
+# the brand text
+webui.preview.brand = My Institution Name
+# an abbreviated form of the above text, this will be used
+# when the preview image cannot fit the normal text
+webui.preview.brand.abbrev = MyOrg
+# the height of the brand
+webui.preview.brand.height = 20
+# font settings for the brand text
+webui.preview.brand.font = SansSerif
+webui.preview.brand.fontpoint = 12
+#webui.preview.dc = rights
+
+
+#### Checksum Checker Settings ####
+# Default dispatcher in case none specified
+plugin.single.org.dspace.checker.BitstreamDispatcher=org.dspace.checker.SimpleDispatcher
+# Standard interface implementations. You shouldn't need to tinker with these.
+plugin.single.org.dspace.checker.ReporterDAO=org.dspace.checker.ReporterDAOImpl
+
+# check history retention
+checker.retention.default=10y
+checker.retention.CHECKSUM_MATCH=8w</pre></li>
+
+          <li><p>If you have customised advanced search fields (<code>search.index.<i>n</i></code> fields, note that you now need to include the schema in the values.  Dublin Core is specifed as <code>dc</code>.  So for example, if in 1.3.2 you had:</p>
+
+            <pre>search.index.1 = title:title.alternative</pre>
+
+            <p>That needs to be changed to:</p>
+
+            <pre>search.index.1 = title:dc.title.alternative</pre>
+          </li>
+
+          <li><p>If you use LDAP or X509 authentication, you'll need to add <code>org.dspace.eperson.LDAPAuthentication</code> or <code>org.dspace.eperson.X509Authentication</code> respectively.  See also <A HREF="configure.html#authenticate">configuring custom authentication code</A>.</p></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.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.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.x-source]</i></code> run:</p>
+
+      <pre>ant -Dconfig=<i>[dspace]</i>/config/dspace.cfg update</pre></li>
+
+      <li><P>The database schema needs updating.  SQL files containing the relevant file are provided.  If you've modified the schema locally, you may need to check over this and make alterations.</p>
+
+        <dl>
+          <dt>For PostgreSQL</dt>
+          <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.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>
+
+      <li><p>Rebuild the search indices:</p>
+            <p><code><i>[dspace]</i>/bin/index-all</code></p>
+	  </li>
+
+      <li><p>Copy the <code>.war</code> Web application files in <code><i>[dspace-1.4-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-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="131_132">Updating From 1.3.1 to 1.3.2</a></h2>
+
+     <p>The changes in 1.3.2 are only code changes so the update is simply a matter of rebuilding the wars.</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.3.2-source]</i></code> to the source directory for DSpace 1.3.2. 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.3.2 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.3.2-source]</i>/lib</pre></li>
+
+      <li><p>Take down Tomcat (or whichever servlet container you're using).</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.3.2 versions into your locally modified ones.  You can use the <code>diff</code> command to compare the 1.3.1 and 1.3.2 versions to do this.</p></li>
+
+
+      <li><p>In <code><i>[dspace-1.3.2-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.3.2-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.3.2-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="12_13">Updating From 1.2.x to 1.3.x</A></H2>
+
+    <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.3.x-source]</i></code> to the source directory for DSpace 1.3.x. Whenever you see these path references, be sure to replace them with the actual path names on your local system.</p>
+
+    <ol>
+        <LI><P>Step one is, of course, to <strong>back up all your data</strong> before proceeding!!  Include all of the contents of <code><i>[dspace]</i></code> and the PostgreSQL database in your backup.</P></LI>
+        <LI><P>Get the new DSpace 1.3.x 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>
+            <p><code>cd <i>[dspace]</i>/lib</code></p>
+            <p><code>cp postgresql.jar <i>[dspace-1.2.2-source]</i>/lib</code></p>
+        <LI><P>Take down Tomcat (or whichever servlet container you're using).</P></LI>
+
+        <li><p>Remove the old version of <code>xerces.jar</code> from your installation, so it is not inadvertently later used:</p>
+
+        <p><code>rm <i>[dspace]</i>/lib/xerces.jar</code></P>
+
+        <li><p>Install the new config files by moving <code>dstat.cfg</code> and <code>dstat.map</code> from <code>[dspace-1.3.x-source]/config/</code> to <code>[dspace]/config</code></p>
+        <LI><P>You need to add new parameters to your <code><i>[dspace]/</i>dspace.cfg</code>:</P>
+        <pre>
+###### Statistical Report Configuration Settings ######
+
+# should the stats be publicly available?  should be set to false if you only
+# want administrators to access the stats, or you do not intend to generate
+# any
+report.public = false
+
+# directory where live reports are stored
+report.dir = /dspace/reports/
+        </pre>
+        <LI><P>Build and install the updated DSpace 1.3.x code.  Go to the <code>[dspace-1.3.x-source]</code> directory, and run:</P>
+            <p><code>ant -Dconfig=<i>[dspace]</i>/config/dspace.cfg update</code></p>
+        <LI><P>You'll need to make some changes to the database schema in your PostgreSQL database.  <code><i>[dspace-1.3.x-source]</i>/etc/database_schema_12-13.sql</code> contains the SQL commands to achieve this.  If you've modified the schema locally, you may need to check over this and make alterations.</P>
+            <P>To apply the changes, go to the source directory, and run:</P>
+            <p><code>psql -f etc/database_schema_12-13.sql [DSpace database name] -h localhost</code></p>
+        <li><p>Customise the stat generating statistics as per the instructions in <a href="configure.html#statistics">System Statistical Reports</a></p>
+        <li><p>Initialise the statistics using:</p>
+            <p><code>[dspace]/bin/stat-initial</code></p>
+            <p><code>[dspace]/bin/stat-general</code></p>
+            <p><code>[dspace]/bin/stat-report-initial</code></p>
+            <p><code>[dspace]/bin/stat-report-general</code></p>
+        <LI><P>Rebuild the search indices:</P>
+            <p><code><i>[dspace]</i>/bin/index-all</code></p>
+      <LI><P>Copy the <code>.war</code> Web application files in <code><i>[dspace-1.3.x-source]</i>/build</code> to the <code>webapps</code> sub-directory of your servlet container (e.g. Tomcat).  e.g.:</P>
+          <p><code>cp <i>[dspace-1.3.x-source]</i>/build/*.war <i>[tomcat]</i>/webapps</code></p>
+      <LI><P>Restart Tomcat.</P></LI>
+    </ol>
+
+    <H2><A NAME="121_122">Updating From 1.2.1 to 1.2.2</A></H2>
+
+     <P>The changes in 1.2.2 are only code and config changes so the update should be fairly simple.</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.2.2-source]</i></code> to the source directory for DSpace 1.2.2. 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.2.2 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.2.2-source]</i>/lib</PRE></LI>
+
+      <LI><P>Take down Tomcat (or whichever servlet container you're using).</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 might like to merge the changes in the new 1.2.2 versions into your locally modified ones.  You can use the <code>diff</code> command to compare the 1.2.1 and 1.2.2 versions to do this. Also see <A HREF="history.html#jsp-changes-1_2_1-1_2_2">the version history</A> for a list of modified JSPs.</P></LI>
+
+      <LI>
+       <P>You need to add a new parameter to your <code><i>[dspace]/</i>dspace.cfg</code> for configurable fulltext indexing </P>
+
+
+<PRE>##### Fulltext Indexing settings #####
+# Maximum number of terms indexed for a single field in Lucene.
+# Default is 10,000 words - often not enough for full-text indexing.
+# If you change this, you'll need to re-index for the change
+# to take effect on previously added items.
+# -1 = unlimited (Integer.MAX_VALUE)
+search.maxfieldlength = 10000
+</PRE></LI>
+
+      <LI><P>In <code><i>[dspace-1.2.2-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.2.2-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.2.2-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>To finialise the install of the new configurable submission forms you need to copy the file <code><em>[dspace-1.2.2-source]</em>/config/input-forms.xml</code> into <code><em>[dspace]</em>/config</code>. </P></LI>
+
+      <LI><P>Restart Tomcat.</P></LI>
+    </OL>
+
+
+    <H2><A NAME="12_121">Updating From 1.2 to 1.2.1</A></H2>
+
+     <P>The changes in 1.2.1 are only code changes so the update should be fairly simple.</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.2.1-source]</i></code> to the source directory for DSpace 1.2.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.2.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.2.1-source]</i>/lib</PRE></LI>
+
+      <LI><P>Take down Tomcat (or whichever servlet container you're using).</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 might like to merge the changes in the new 1.2.1 versions into your locally modified ones.  You can use the <code>diff</code> command to compare the 1.2 and 1.2.1 versions to do this. Also see <A HREF="history.html#jsp-changes-1_2-1_2_1">the version history</A> for a list of modified JSPs.</P></LI>
+
+      <LI>
+       <P>You need to add a few new parameters to your <code><i>[dspace]/</i>dspace.cfg</code> for browse/search and item thumbnails display, and for configurable DC metadata fields to be indexed. </P>
+
+
+<PRE># whether to display thumbnails on browse and search results pages (1.2+)
+webui.browse.thumbnail.show = false
+
+# max dimensions of the browse/search thumbs. Must be <= thumbnail.maxwidth
+# and thumbnail.maxheight. Only need to be set if required to be smaller than
+# dimension of thumbnails generated by mediafilter (1.2+)
+#webui.browse.thumbnail.maxheight = 80
+#webui.browse.thumbnail.maxwidth = 80
+
+# whether to display the thumb against each bitstream (1.2+)
+webui.item.thumbnail.show = true
+
+# where should clicking on a thumbnail from browse/search take the user
+# Only values currently supported are "item" and "bitstream"
+#webui.browse.thumbnail.linkbehaviour = item
+
+
+ ##### Fields to Index for Search #####
+
+# DC metadata elements.qualifiers to be indexed for search
+# format: - search.index.[number] = [search field]:element.qualifier
+#         - * used as wildcard
+
+###      changing these will change your search results,     ###
+###  but will NOT automatically change your search displays  ###
+
+search.index.1 = author:contributor.*
+search.index.2 = author:creator.*
+search.index.3 = title:title.*
+search.index.4 = keyword:subject.*
+search.index.5 = abstract:description.abstract
+search.index.6 = author:description.statementofresponsibility
+search.index.7 = series:relation.ispartofseries
+search.index.8 = abstract:description.tableofcontents
+search.index.9 = mime:format.mimetype
+search.index.10 = sponsor:description.sponsorship
+search.index.11 = id:identifier.* </PRE></LI>
+
+      <LI><P>In <code><i>[dspace-1.2.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.2.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.2.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="11_12">Updating From 1.1 (or 1.1.1) to 1.2</A></H2>
+
+    <P>The process for upgrading to 1.2 from either 1.1 or 1.1.1 is the same.  If you are running DSpace 1.0 or 1.0.1, you need to follow the <A HREF="#101_11">instructions for upgrading from 1.0.1 to 1.1</A> to before following these instructions.</P>
+
+    <P>Note also that if you've substantially modified DSpace, these instructions apply to an unmodified 1.1.1 DSpace instance, and you'll need to adapt the process to any modifications you've made.</P>
+
+    <p>This document refers to the install directory for your existing DSpace installation as <code><i>[dspace]</i></code>, and to the source directory for
+    DSpace 1.2 as <code><i>[dspace-1.2-source]</i></code>. Whenever you see these path references below, be sure to replace them with the actual path names on your local system.
+
+    <OL>
+      <LI><P>Step one is, of course, to <strong>back up all your data</strong> before proceeding!!  Include all of the contents of <code><i>[dspace]</i></code> and the PostgreSQL database in your backup.</P></LI>
+
+      <LI><P>Get the new DSpace 1.2 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 <A HREF="install.html#javalibs">required Java libraries</A> that we couldn't include in the bundle to the source tree.  For example:</P>
+
+      <PRE>cd <i>[dspace]</i>/lib
+cp activation.jar servlet.jar mail.jar <i>[dspace-1.2-source]</i>/lib</PRE></LI>
+
+      <LI><P>Stop Tomcat (or other servlet container.)</P></LI>
+
+      <LI>
+        <P>It's a good idea to upgrade all of the various third-party tools that DSpace uses to their latest versions:</P>
+        <UL>
+          <LI><P>Java (note that now version 1.4.0 or later is <em>required</em>)</P></LI>
+          <LI><P>Tomcat (Any version after 4.0 will work; symbolic links are no longer an issue)</P></LI>
+          <LI><P>PostgreSQL (don't forget to build/download an updated JDBC driver .jar file! Also, <strong>back up the database</strong> first.)</P></LI>
+          <LI><P>Ant</P></LI>
+        </UL>
+      </LI>
+
+      <LI>
+        <P>You need to add the following new parameters to your <code><i>[dspace]/</i>dspace.cfg</code>:</P>
+
+        <PRE>##### Media Filter settings #####
+# maximum width and height of generated thumbnails
+thumbnail.maxwidth  80
+thumbnail.maxheight 80</PRE>
+
+        <P>There are one or two other, optional extra parameters (for controlling the pool of database connections).  See <A HREF="history.html">the version history</A> for details.  If you leave them out, defaults will be used.</P>
+
+        <P>Also, to avoid future confusion, you might like to <strong>remove</strong> the following property, which is no longer required:</P>
+
+        <PRE>config.template.oai-web.xml = <em>[dspace]</em>/oai/WEB-INF/web.xml</PRE>
+      </LI>
+
+      <LI><P>The layout of the installation directory (i.e. the structure of the contents of <code><i>[dspace]</i></code>) has changed somewhat since 1.1.1.  First up, your 'localized' JSPs (those in jsp/local) now need to be maintained in the <em>source</em> directory.  So make a copy of them now!</P>
+
+      <P>Once you've done that, you can remove <code><i>[dspace]/</i>jsp</code> and <code><i>[dspace]</i>/oai</code>, these are no longer used.  (.war Web application archive files are used instead).</P>
+
+      <P>Also, if you're using the same version of Tomcat as before, you need to <strong>remove the lines from Tomcat's conf/server.xml file that enable symbolic links for DSpace.</strong>  These are the <code>&lt;Context&gt;</code> elements you added to get DSpace 1.1.1 working, looking something like this:</P>
+
+      <pre>&lt;Context path="/dspace" docBase="dspace" debug="0" reloadable="true" crossContext="true"&gt;
+  &lt;Resources className="org.apache.naming.resources.FileDirContext" allowLinking="true" /&gt;
+&lt;/Context&gt;</pre>
+
+      <P>Be sure to remove the &lt;Context&gt; elements for both the Web UI and the OAI Web applications.</P>
+      </LI>
+
+      <LI><P>Build and install the updated DSpace 1.2 code.  Go to the DSpace 1.2 source directory, and run:</P>
+
+      <PRE>ant -Dconfig=<i>[dspace]</i>/config/dspace.cfg update</PRE></LI>
+
+      <LI><P>Copy the new config files in <code>config</code> to your installation, e.g.:</P>
+
+      <PRE>cp <i>[dspace-1.2-source]</i>/config/news-* <i>[dspace-1.2-source]</i>/config/mediafilter.cfg <i>[dspace-1.2-source]</i>/config/dc2mods.cfg <i>[dspace]</i>/config</PRE></LI>
+
+      <LI>
+        <P>You'll need to make some changes to the database schema in your PostgreSQL database.  <code><i>[dspace-1.2-source]</i>/etc/database_schema_11-12.sql</code> contains the SQL commands to achieve this.  If you've modified the schema locally, you may need to check over this and make alterations.</P>
+
+        <P>To apply the changes, go to the source directory, and run:</P>
+
+        <pre>psql -f etc/database_schema_11-12.sql [DSpace database name] -h localhost</pre>
+      </LI>
+
+      <LI><P>A tool supplied with the DSpace 1.2 codebase will then update the actual data in the relational database.  Run it using:</P>
+
+      <PRE><i>[dspace]</i>/bin/dsrun org.dspace.administer.Upgrade11To12</PRE></LI>
+
+      <LI><P>Then rebuild the search indices:</P>
+
+      <PRE><i>[dspace]</i>/bin/index-all</PRE></LI>
+
+      <LI><P>Delete the existing symlinks from your servlet container's (e.g. Tomcat's) <code>webapp</code> sub-directory.</P>
+
+      <P>Copy the <code>.war</code> Web application files in <code><i>[dspace-1.2-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.2-source]</i>/build/*.war <i>[tomcat]</i>/webapps</PRE></LI>
+
+      <LI><P>Restart Tomcat.</P></LI>
+
+      <LI><P>To get image thumbnails generated and full-text extracted for indexing automatically, you need to set up a 'cron' job, for example one like this:</P>
+
+      <PRE># Run the media filter at 02:00 every day
+0 2 * * * <i>[dspace]</i>/bin/filter-media</PRE>
+
+      <P>You might also wish to run it now to generate thumbnails and index full text for the content already in your system.</P></LI>
+
+      <LI>
+        <P><strong>Note 1</strong>:  This update process has effectively 'touched' all of your items.  Although the dates in the Dublin Core metadata won't have changed (accession date and so forth), the 'last modified' date in the database for each will have been changed.</P>
+
+        <P>This means the e-mail subscription tool may be confused, thinking that all items in the archive have been deposited that day, and could thus send a rather long email to lots of subscribers.  So, it is recommended that you <strong>turn off the e-mail subscription feature for the next day</strong>, by commenting out the relevant line in DSpace's cron job, and then re-activating it the next day.</P>
+
+        <P>Say you performed the update on 08-June-2004 (UTC), and your e-mail subscription cron job runs at 4am (UTC).  When the subscription tool runs at 4am on 09-June-2004, it will find that everything in the system has a modification date in 08-June-2004, and accordingly send out huge emails.  So, immediately after the update, you would edit DSpace's 'crontab' and comment out the <code>/dspace/bin/subs-daily</code> line.  Then, after 4am on 09-June-2004 you'd 'un-comment' it out, so that things proceed normally.</P>
+
+        <P>Of course this means, any <em>real</em> new deposits on 08-June-2004 won't get e-mailed, however if you're updating the system it's likely to be down for some time so this shouldn't be a big problem.</P>
+      </LI>
+
+      <LI>
+        <P><strong>Note 2:</strong> After consulation with the OAI community, various OAI-PMH changes have occurred:</P>
+
+        <UL>
+          <LI><P>The OAI-PMH identifiers have changed (they're now of the form <code>oai:<em>hostname</em>:<em>handle</em></code> as opposed to just Handles)<P></LI>
+
+          <LI><P>The set structure has changed, due to the new sub-communities feature.</P></LI>
+
+          <LI><P>The default base URL has changed</P></LI>
+
+          <LI><P>As noted in note 1, every item has been 'touched' and will need re-harvesting.</P></LI>
+        </UL>
+
+        <P>The above means that, if already registered and harvested, you will need to re-register your repository, effectively as a 'new' OAI-PMH data provider.  You should also consider posting an announcement to the <A HREF="http://www.openarchives.org/mailman/listinfo/OAI-implementers">OAI implementers e-mail list</A> so that harvesters know to update their systems.</P>
+
+        <P>Also note that your site may, over the next few days, take quite a big hit from OAI-PMH harvesters.  The resumption token support should alleviate this a little, but you might want to temporarily whack up the database connection pool parameters in <code><em>[dspace]</em>/config/dspace.cfg</code>.  See the <code>dspace.cfg</code> distributed with the source code to see what these parameters are and how to use them.  (You need to stop and restart Tomcat after changing them.)</P>
+
+        <P>I realize this is not ideal; for discussion as to the reasons behind this please see relevant posts to the OAI community: <A HREF="http://openarchives.org/pipermail/oai-implementers/2004-June/001214.html">post one</A>, <A HREF="http://openarchives.org/pipermail/oai-implementers/2004-June/001224.html">post two</A>, as well as <A HREF="http://sourceforge.net/mailarchive/forum.php?thread_id=4961727&amp;forum_id=13580">this post to the dspace-tech mailing list</A>.</P>
+
+        <P>If you really can't live with updating the base URL like this, you can fairly easily have thing proceed more-or-less as they are, by doing the following:</P>
+
+        <UL>
+          <LI><P>Change the value of <code>OAI_ID_PREFIX</code> at the top of the <code>org.dspace.app.oai.DSpaceOAICatalog</code> class to <code>hdl:</code></P></LI>
+          <LI><P>Change the servlet mapping for the <code>OAIHandler</code> servlet back to <code>/</code> (from <code>/request</code>)</P></LI>
+          <LI><P>Rebuild and deploy <code>dspace-oai.war</code></LI>
+        </UL>
+
+        <P>However, note that in this case, all the records will be re-harvested by harvesters anyway, so you still need to brace for the associated DB activity; also note that the set spec changes may not be picked up by some harvesters.  It's recommended you read the above-linked mailing list posts to understand why the change was made.</P>
+      </LI>
+    </OL>
+
+    <P>Now, you should be finished!</P>
+
+
+    <H2><A NAME="11_111">Updating From 1.1 to 1.1.1</A></H2>
+
+    <P>Fortunately the changes in 1.1.1 are only code changes so the update is fairly simple.</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.1.1-source]</i></code> to the source directory for DSpace 1.1.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>Take down Tomcat.</P></LI>
+
+      <LI><P>It would be a good idea to update any of the third-party tools used by DSpace at this point (e.g. PostgreSQL), following the instructions provided with the relevant tools.</P></LI>
+
+      <LI><P>In <code><i>[dspace-1.1.1-source]</i></code> run:</P>
+
+      <pre>ant -Dconfig=<i>[dspace]</i>/config/dspace.cfg update</pre></LI>
+
+      <LI><P>If you have locally modified JSPs of the following JSPs in your <code><i>[dspace]</i>/jsp/local</code> directory, you might like to merge the changes in the new 1.1.1 versions into your locally modified ones.  You can use the <code>diff</code> command to compare the 1.1 and 1.1.1 versions to do this.  The changes are quite minor.</P>
+
+    <PRE>collection-home.jsp
+admin/authorize-collection-edit.jsp
+admin/authorize-community-edit.jsp
+admin/authorize-item-edit.jsp
+admin/eperson-edit.jsp</PRE></LI>
+
+      <LI><P>Restart Tomcat.</P></LI>
+    </OL>
+
+    <H2><A NAME="101_11">Updating From 1.0.1 to 1.1</A></H2>
+
+    <P>To upgrade from DSpace 1.0.1 to 1.1, follow the steps below.  Your <code>dspace.cfg</code> does not need to be changed.
+ In the notes below <code><i>[dspace]</i></code> refers to the install directory for your existing DSpace installation,
+    and <code><i>[dspace-1.1-source]</i></code> to the source directory for DSpace 1.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>Take down Tomcat (or whichever servlet container you're using).</P></LI>
+
+      <LI><P>We recommend that you upgrage to the latest version of PostgreSQL (7.3.2).  Included are some <A HREF="postgres-upgrade-notes.txt">notes to help you do this</A>.  Note you will also have to upgrade Ant to version 1.5 if you do this.</P></LI>
+
+      <LI><P>Make the necessary changes to the DSpace database.  These include a couple of minor schema changes, and some new indices which should improve performance.  Also, the names of a couple of database views have been changed since the old names were so long they were causing problems.  First run <code>psql</code> to access your database (e.g. <code>psql -U dspace -W</code> and then enter the password), and enter these SQL commands:</P>
+
+      <PRE>ALTER TABLE bitstream ADD store_number INTEGER;
+UPDATE bitstream SET store_number = 0;
+
+ALTER TABLE item ADD last_modified TIMESTAMP;
+CREATE INDEX last_modified_idx ON Item(last_modified);
+
+CREATE INDEX eperson_email_idx ON EPerson(email);
+CREATE INDEX item2bundle_item_idx on Item2Bundle(item_id);
+REATE INDEX bundle2bitstream_bundle_idx ON Bundle2Bitstream(bundle_id);
+CREATE INDEX dcvalue_item_idx on DCValue(item_id);
+CREATE INDEX collection2item_collection_idx ON Collection2Item(collection_id);
+CREATE INDEX resourcepolicy_type_id_idx ON ResourcePolicy (resource_type_id,resource_id);
+CREATE INDEX epersongroup2eperson_group_idx on EPersonGroup2EPerson(eperson_group_id);
+CREATE INDEX handle_handle_idx ON Handle(handle);
+CREATE INDEX sort_author_idx on ItemsByAuthor(sort_author);
+CREATE INDEX sort_title_idx on ItemsByTitle(sort_title);
+CREATE INDEX date_issued_idx on ItemsByDate(date_issued);
+
+DROP VIEW CollectionItemsByDateAccessioned;
+
+DROP VIEW CommunityItemsByDateAccessioned;
+CREATE VIEW CommunityItemsByDateAccession as SELECT Community2Item.community_id, ItemsByDateAccessioned.*  FROM ItemsByDateAccessioned, Community2Item WHERE ItemsByDateAccessioned.item_id = Community2Item.item_id;
+CREATE VIEW CollectionItemsByDateAccession AS SELECT collection2item.collection_id, itemsbydateaccessioned.items_by_date_accessioned_id, itemsbydateaccessioned.item_id, itemsbydateaccessioned.date_accessioned FROM itemsbydateaccessioned, collection2item WHERE (itemsbydateaccessioned.item_id = collection2item.item_id);</PRE></LI>
+
+      <LI><P>Fix your JSPs for Unicode.  If you've modified the site 'skin' (<code>jsp/local/layout/header-default.jsp</code>) you'll need to add the Unicode header, i.e.:</P>
+
+      <PRE>&lt;meta http-equiv="Content-Type" content="text/html; charset=UTF-8"&gt;</PRE>
+
+      <P>to the &lt;HEAD&gt; element.  If you have any locally-edited JSPs, you need to add this page directive to the top of all of them:</P>
+
+      <PRE>&lt;%@ page contentType="text/html;charset=UTF-8" %&gt;</PRE>
+
+      <P>(If you haven't modified any JSPs, you don't have to do anything.)</P></LI>
+
+
+      <LI><P>Copy the <A HREF="install.html#javalibs">required Java libraries</A> that we couldn't include in the bundle to the source tree.  For example:</P>
+
+      <PRE>cd <i>[dspace]</i>/lib
+cp *.policy activation.jar servlet.jar mail.jar <i>[dspace-1.1-source]</i>/lib</PRE></LI>
+
+
+      <LI><P>Compile up the new DSpace code, replacing <code><i>[dspace]</i>/config/dspace.cfg</code> with the path to your current, LIVE configuration.  (The second line, <code>touch `find .`</code>, is a precaution, which ensures that the new code has a current datestamp and will overwrite the old code.  Note that those are back quotes.)</P>
+
+      <PRE>cd <i>[dspace-1.1-source]</i>
+touch `find .`
+ant
+ant -Dconfig=<i>[dspace]</i>/config/dspace.cfg update</PRE></LI>
+
+
+      <LI><P>Update the database tables using the upgrader tool, which sets up the new ><code>last_modified</code> date in the item table:</P>
+
+      <PRE>Run <i>[dspace]</i>/bin/dsrun org.dspace.administer.Upgrade101To11</PRE></LI>
+
+
+      <LI><P>Run the collection default authorisation policy tool:</P>
+
+      <PRE><i>[dspace]</i>/bin/dsrun org.dspace.authorize.FixDefaultPolicies</PRE></LI>
+
+
+      <LI><P>Fix the OAICat properties file.  Edit <code><i>[dspace]</i>/config/templates/oaicat.properties</code>.  Change the line that says</P>
+
+      <PRE>Identify.deletedRecord=yes</PRE>
+
+      <P>To:</P>
+
+      <PRE>Identify.deletedRecord=persistent</PRE>
+
+      <P>This is needed to fix the OAI-PMH 'Identity' verb response.  Then run <code><i>[dspace]</i>/bin/install-configs</code>.</P></LI>
+
+
+      <LI><P>Re-run the indexing to index abstracts and fill out the renamed database views:</P>
+
+      <PRE><i>[dspace]</i>/bin/index-all</PRE>
+
+
+      <LI><P>Restart Tomcat.  Tomcat should be run with the following environment variable set, to ensure that Unicode is handled properly.  Also, the default JVM memory heap sizes are rather small.  Adjust <code>-Xmx512M</code> (512Mb maximum heap size) and <code>-Xms64M</code> (64Mb Java thread stack size) to suit your hardware.</P>
+
+      <PRE>JAVA_OPTS="-Xmx512M -Xms64M -Dfile.encoding=UTF-8"</PRE></LI>
+    </OL>
+
+
+    <HR>
+
+    <ADDRESS>
+      Copyright &copy; 2002-2004 MIT and Hewlett Packard
+    </ADDRESS>
+  </BODY>
+</HTML>

dspace/etc/clean-database.sql

@@ -44,17 +44,12 @@
 --    all tables etc. so the database is completely empty and ready for a
 --    fresh installation.  Of course, this means all data is lost.
 --
---    Caution: THIS IS POSTGRESQL-SPECIFC
---    * The sequences dropped below are automatically created by PostgreSQL
---      for the SERIAL typed fields.
---
 --    This should be kept in sync if database_schema.sql is updated.
 
 
--- Drop indices
-DROP INDEX dcvalue_dc_type_id_idx;
-
 -- Drop the views
+DROP VIEW CommunityItemsBySubject;
+DROP VIEW CollectionItemsBySubject;
 DROP VIEW CommunityItemsByDateAccession;
 DROP VIEW CollectionItemsByDateAccession;
 DROP VIEW CommunityItemsByDate;
@@ -64,12 +59,19 @@ DROP VIEW CollectionItemsByTitle;
 DROP VIEW CommunityItemsByAuthor;
 DROP VIEW CollectionItemsByAuthor;
 DROP VIEW Community2Item;
+DROP VIEW DCValue;
 
 -- Then the tables
+DROP TABLE checksum_history;
+DROP TABLE most_recent_checksum;
+DROP TABLE checksum_results;
+DROP TABLE ItemsBySubject;
 DROP TABLE ItemsByDateAccessioned;
 DROP TABLE ItemsByDate;
 DROP TABLE ItemsByTitle;
 DROP TABLE ItemsByAuthor;
+DROP TABLE Communities2Item;
+DROP TABLE EPersonGroup2WorkspaceItem;
 DROP TABLE HistoryState;
 DROP TABLE History;
 DROP TABLE Subscription;
@@ -82,14 +84,21 @@ DROP TABLE EPersonGroup2EPerson;
 DROP TABLE ResourcePolicy;
 DROP TABLE Collection2Item;
 DROP TABLE Community2Collection;
+DROP TABLE Community2Community;
 DROP TABLE Collection;
 DROP TABLE Community;
-DROP TABLE DCValue;
-DROP TABLE DCTypeRegistry;
+DROP TABLE MetadataValue;
+DROP TABLE MetadataFieldRegistry;
+DROP TABLE MetadataSchemaRegistry;
 DROP TABLE Bundle2Bitstream;
 DROP TABLE Item2Bundle;
 DROP TABLE Bundle;
+DROP TABLE most_recent_checksum;
+DROP TABLE checksum_history;
+DROP TABLE checksum_results;
 DROP TABLE Item;
+DROP TABLE Group2GroupCache;
+DROP TABLE Group2Group;
 DROP TABLE EPersonGroup;
 DROP TABLE EPerson;
 DROP TABLE Bitstream;
@@ -109,6 +118,7 @@ DROP SEQUENCE bundle2bitstream_seq;
 DROP SEQUENCE dctyperegistry_seq;
 DROP SEQUENCE dcvalue_seq;
 DROP SEQUENCE community_seq;
+DROP SEQUENCE community2community_seq;
 DROP SEQUENCE collection_seq;
 DROP SEQUENCE community2collection_seq;
 DROP SEQUENCE collection2item_seq;
@@ -122,10 +132,18 @@ DROP SEQUENCE registrationdata_seq;
 DROP SEQUENCE subscription_seq;
 DROP SEQUENCE history_seq;
 DROP SEQUENCE historystate_seq;
+DROP SEQUENCE communities2item_seq;
 DROP SEQUENCE itemsbyauthor_seq;
 DROP SEQUENCE itemsbytitle_seq;
 DROP SEQUENCE itemsbydate_seq;
 DROP SEQUENCE itemsbydateaccessioned_seq;
+DROP SEQUENCE itemsbysubject_seq;
+DROP SEQUENCE epersongroup2workspaceitem_seq;
+DROP SEQUENCE metadataschemaregistry_seq;
+DROP SEQUENCE metadatafieldregistry_seq;
+DROP SEQUENCE metadatavalue_seq;
+DROP SEQUENCE group2group_seq;
+DROP SEQUENCE group2groupcache_seq;
 
 -- Drop the getnextid() function
 DROP FUNCTION getnextid(VARCHAR(40));

dspace/etc/database_schema.sql

@@ -42,7 +42,8 @@
 --
 --   DSpace SQL schema
 --
---   Authors:   Peter Breton, Robert Tansley, David Stuve, Daniel Chudnov
+--   Authors:   Peter Breton, Robert Tansley, David Stuve, Daniel Chudnov,
+--              Richard Jones
 --
 --   This file is used as-is to initialize a database. Therefore,
 --   table and view definitions must be ordered correctly.
@@ -58,8 +59,6 @@
 --   argument, will return a safe new ID to use to create a new
 --   row in that table.
 
-
-
 -------------------------------------------------------
 -- Function for obtaining new IDs.
 --
@@ -91,6 +90,7 @@ CREATE SEQUENCE dctyperegistry_seq;
 CREATE SEQUENCE dcvalue_seq;
 CREATE SEQUENCE community_seq;
 CREATE SEQUENCE collection_seq;
+CREATE SEQUENCE community2community_seq;
 CREATE SEQUENCE community2collection_seq;
 CREATE SEQUENCE collection2item_seq;
 CREATE SEQUENCE resourcepolicy_seq;
@@ -103,11 +103,19 @@ CREATE SEQUENCE registrationdata_seq;
 CREATE SEQUENCE subscription_seq;
 CREATE SEQUENCE history_seq;
 CREATE SEQUENCE historystate_seq;
+CREATE SEQUENCE communities2item_seq;
 CREATE SEQUENCE itemsbyauthor_seq;
 CREATE SEQUENCE itemsbytitle_seq;
 CREATE SEQUENCE itemsbydate_seq;
 CREATE SEQUENCE itemsbydateaccessioned_seq;
+CREATE SEQUENCE itemsbysubject_seq;
+CREATE SEQUENCE epersongroup2workspaceitem_seq;
+CREATE SEQUENCE metadataschemaregistry_seq;
+CREATE SEQUENCE metadatafieldregistry_seq;
+CREATE SEQUENCE metadatavalue_seq;
 
+CREATE SEQUENCE group2group_seq;
+CREATE SEQUENCE group2groupcache_seq;
 
 -------------------------------------------------------
 -- BitstreamFormatRegistry table
@@ -141,7 +149,7 @@ CREATE TABLE Bitstream
    bitstream_id            INTEGER PRIMARY KEY,
    bitstream_format_id     INTEGER REFERENCES BitstreamFormatRegistry(bitstream_format_id),
    name                    VARCHAR(256),
-   size                    INTEGER,
+   size_bytes              BIGINT,
    checksum                VARCHAR(64),
    checksum_algorithm      VARCHAR(32),
    description             TEXT,
@@ -149,7 +157,8 @@ CREATE TABLE Bitstream
    source                  VARCHAR(256),
    internal_id             VARCHAR(256),
    deleted                 BOOL,
-   store_number            INTEGER
+   store_number            INTEGER,
+   sequence_id             INTEGER
 );
 
 -------------------------------------------------------
@@ -167,12 +176,16 @@ CREATE TABLE EPerson
   self_registered     BOOL,
   last_active         TIMESTAMP,
   sub_frequency       INTEGER,
-  phone	              VARCHAR(32)
+  phone	              VARCHAR(32),
+  netid               VARCHAR(64)
 );
 
 -- index by email
 CREATE INDEX eperson_email_idx ON EPerson(email);
 
+-- index by netid
+CREATE INDEX eperson_netid_idx ON EPerson(netid);
+
 -------------------------------------------------------
 -- EPersonGroup table
 -------------------------------------------------------
@@ -182,6 +195,32 @@ CREATE TABLE EPersonGroup
   name             VARCHAR(256) UNIQUE
 );
 
+------------------------------------------------------
+-- Group2Group table, records group membership in other groups
+------------------------------------------------------
+CREATE TABLE Group2Group
+(
+  id        INTEGER PRIMARY KEY,
+  parent_id INTEGER REFERENCES EPersonGroup(eperson_group_id),
+  child_id  INTEGER REFERENCES EPersonGroup(eperson_group_id)
+);
+
+------------------------------------------------------
+-- Group2GroupCache table, is the 'unwound' hierarchy in
+-- Group2Group.  It explicitly names every parent child
+-- relationship, even with nested groups.  For example,
+-- If Group2Group lists B is a child of A and C is a child of B,
+-- this table will have entries for parent(A,B), and parent(B,C)
+-- AND parent(A,C) so that all of the child groups of A can be
+-- looked up in a single simple query
+------------------------------------------------------
+CREATE TABLE Group2GroupCache
+(
+  id        INTEGER PRIMARY KEY,
+  parent_id INTEGER REFERENCES EPersonGroup(eperson_group_id),
+  child_id  INTEGER REFERENCES EPersonGroup(eperson_group_id)
+);
+
 -------------------------------------------------------
 -- Item table
 -------------------------------------------------------
@@ -191,7 +230,8 @@ CREATE TABLE Item
   submitter_id    INTEGER REFERENCES EPerson(eperson_id),
   in_archive      BOOL,
   withdrawn       BOOL,
-  last_modified   TIMESTAMP
+  last_modified   TIMESTAMP WITH TIME ZONE,
+  owning_collection INTEGER
 );
 
 -------------------------------------------------------
@@ -200,7 +240,9 @@ CREATE TABLE Item
 CREATE TABLE Bundle
 (
   bundle_id          INTEGER PRIMARY KEY,
-  mets_bitstream_id  INTEGER REFERENCES Bitstream(bitstream_id)
+  mets_bitstream_id  INTEGER REFERENCES Bitstream(bitstream_id),
+  name               VARCHAR(16),  -- ORIGINAL | THUMBNAIL | TEXT 
+  primary_bitstream_id	INTEGER REFERENCES Bitstream(bitstream_id)
 );
 
 -------------------------------------------------------
@@ -230,43 +272,60 @@ CREATE TABLE Bundle2Bitstream
 CREATE INDEX bundle2bitstream_bundle_idx ON Bundle2Bitstream(bundle_id);
 
 -------------------------------------------------------
--- DCTypeRegistry table
+-- Metadata Tables and Sequences
 -------------------------------------------------------
-CREATE TABLE DCTypeRegistry
+CREATE TABLE MetadataSchemaRegistry
 (
-  dc_type_id INTEGER PRIMARY KEY,
-  element    VARCHAR(64),
-  qualifier  VARCHAR(64),
-  scope_note TEXT,
-  UNIQUE(element, qualifier)
+  metadata_schema_id INTEGER PRIMARY KEY DEFAULT NEXTVAL('metadataschemaregistry_seq'),
+  namespace          VARCHAR(256) UNIQUE,
+  short_id           VARCHAR(32) UNIQUE
 );
 
--------------------------------------------------------
--- DCValue table
--------------------------------------------------------
-CREATE TABLE DCValue
+CREATE TABLE MetadataFieldRegistry
 (
-  dc_value_id   INTEGER PRIMARY KEY,
-  item_id       INTEGER REFERENCES Item(item_id),
-  dc_type_id    INTEGER REFERENCES DCTypeRegistry(dc_type_id),
-  text_value TEXT,
-  text_lang  VARCHAR(24),
-  place      INTEGER,
-  source_id  INTEGER
+  metadata_field_id   INTEGER PRIMARY KEY DEFAULT NEXTVAL('metadatafieldregistry_seq'),
+  metadata_schema_id  INTEGER NOT NULL REFERENCES MetadataSchemaRegistry(metadata_schema_id),
+  element             VARCHAR(64),
+  qualifier           VARCHAR(64),
+  scope_note          TEXT
 );
 
+CREATE TABLE MetadataValue
+(
+  metadata_value_id  INTEGER PRIMARY KEY DEFAULT NEXTVAL('metadatavalue_seq'),
+  item_id            INTEGER REFERENCES Item(item_id),
+  metadata_field_id  INTEGER REFERENCES MetadataFieldRegistry(metadata_field_id),
+  text_value         TEXT,
+  text_lang          VARCHAR(24),
+  place              INTEGER
+);
+
+-- Create the DC schema
+INSERT INTO MetadataSchemaRegistry VALUES (getnextid('metadataschemaregistry'),'http://dublincore.org/documents/dcmi-terms/','dc');
+
+-- Create a dcvalue view for backwards compatibilty
+CREATE VIEW dcvalue AS
+  SELECT MetadataValue.metadata_value_id AS "dc_value_id", MetadataValue.item_id,
+    MetadataValue.metadata_field_id AS "dc_type_id", MetadataValue.text_value,
+    MetadataValue.text_lang, MetadataValue.place
+  FROM MetadataValue, MetadataFieldRegistry
+  WHERE MetadataValue.metadata_field_id = MetadataFieldRegistry.metadata_field_id
+  AND MetadataFieldRegistry.metadata_schema_id = 1;
+
 -- An index for item_id - almost all access is based on
--- instantiating the item object, which grabs all dcvalues
+-- instantiating the item object, which grabs all values
 -- related to that item
-CREATE INDEX dcvalue_item_idx on DCValue(item_id);
-
+CREATE INDEX metadatavalue_item_idx ON MetadataValue(item_id);
+CREATE INDEX metadatavalue_item_idx2 ON MetadataValue(item_id,metadata_field_id);
+CREATE INDEX metadatafield_schema_idx ON MetadataFieldRegistry(metadata_schema_id);
+  
 -------------------------------------------------------
 -- Community table
 -------------------------------------------------------
 CREATE TABLE Community
 (
   community_id      INTEGER PRIMARY KEY,
-  name              VARCHAR(128) UNIQUE,
+  name              VARCHAR(128),
   short_description VARCHAR(512),
   introductory_text TEXT,
   logo_bitstream_id INTEGER REFERENCES Bitstream(bitstream_id),
@@ -291,7 +350,19 @@ CREATE TABLE Collection
   side_bar_text     TEXT,
   workflow_step_1   INTEGER REFERENCES EPersonGroup( eperson_group_id ),
   workflow_step_2   INTEGER REFERENCES EPersonGroup( eperson_group_id ),
-  workflow_step_3   INTEGER REFERENCES EPersonGroup( eperson_group_id )
+  workflow_step_3   INTEGER REFERENCES EPersonGroup( eperson_group_id ),
+  submitter         INTEGER REFERENCES EPersonGroup( eperson_group_id ),
+  admin             INTEGER REFERENCES EPersonGroup( eperson_group_id)
+);
+
+-------------------------------------------------------
+-- Community2Community table
+-------------------------------------------------------
+CREATE TABLE Community2Community
+(
+  id             INTEGER PRIMARY KEY,
+  parent_comm_id INTEGER REFERENCES Community(community_id),
+  child_comm_id  INTEGER REFERENCES Community(community_id)
 );
 
 -------------------------------------------------------
@@ -304,6 +375,11 @@ CREATE TABLE Community2Collection
   collection_id  INTEGER REFERENCES Collection(collection_id)
 );
 
+-- Index on community ID
+CREATE INDEX Community2Collection_community_id_idx ON Community2Collection(community_id);
+-- Index on collection ID
+CREATE INDEX Community2Collection_collection_id_idx ON Community2Collection(collection_id);
+
 -------------------------------------------------------
 -- Collection2Item table
 -------------------------------------------------------
@@ -316,6 +392,8 @@ CREATE TABLE Collection2Item
 
 -- index by collection_id
 CREATE INDEX collection2item_collection_idx ON Collection2Item(collection_id);
+-- and item_id
+CREATE INDEX Collection2Item_item_id_idx ON Collection2Item( item_id );
 
 -------------------------------------------------------
 -- ResourcePolicy table
@@ -363,6 +441,8 @@ CREATE TABLE Handle
 
 -- index by handle, commonly looked up
 CREATE INDEX handle_handle_idx ON Handle(handle);
+-- index by resource id and resource type id
+CREATE INDEX handle_resource_id_and_type_idx ON handle(resource_id, resource_type_id);
 
 -------------------------------------------------------
 --  WorkspaceItem table
@@ -455,13 +535,39 @@ CREATE TABLE HistoryState
   object_id                  VARCHAR(64)
 );
 
+-------------------------------------------------------------------------------
+-- EPersonGroup2WorkspaceItem table
+-------------------------------------------------------------------------------
+
+CREATE TABLE epersongroup2workspaceitem 
+(
+  id integer DEFAULT nextval('epersongroup2workspaceitem_seq'),
+  eperson_group_id integer REFERENCES EPersonGroup(eperson_group_id),
+  workspace_item_id integer REFERENCES WorkspaceItem(workspace_item_id),
+  CONSTRAINT epersongroup2item_pkey PRIMARY KEY (id)
+);
+
+
 ------------------------------------------------------------
 -- Browse subsystem tables and views
 ------------------------------------------------------------
 
 -------------------------------------------------------
---  Community2Item view
+--  Communities2Item table
 -------------------------------------------------------
+CREATE TABLE Communities2Item
+(
+   id                      INTEGER PRIMARY KEY,
+   community_id            INTEGER REFERENCES Community(community_id),
+   item_id                 INTEGER REFERENCES Item(item_id)
+);
+
+-- Index by item_id for update/re-index
+CREATE INDEX Communities2Item_item_id_idx ON Communities2Item( item_id );
+
+-------------------------------------------------------
+-- Community2Item view
+------------------------------------------------------
 CREATE VIEW Community2Item as
 SELECT Community2Collection.community_id, Collection2Item.item_id 
 FROM Community2Collection, Collection2Item
@@ -481,6 +587,8 @@ CREATE TABLE ItemsByAuthor
 
 -- index by sort_author, of course!
 CREATE INDEX sort_author_idx on ItemsByAuthor(sort_author);
+-- And by item ID for updates/re-indexing
+CREATE INDEX ItemsByAuthor_item_id_idx ON ItemsByAuthor(item_id);
 
 -------------------------------------------------------
 --  CollectionItemsByAuthor view
@@ -495,9 +603,9 @@ WHERE ItemsByAuthor.item_id = Collection2Item.item_id
 --  CommunityItemsByAuthor view
 -------------------------------------------------------
 CREATE VIEW CommunityItemsByAuthor as
-SELECT Community2Item.community_id, ItemsByAuthor.* 
-FROM ItemsByAuthor, Community2Item
-WHERE ItemsByAuthor.item_id = Community2Item.item_id
+SELECT Communities2Item.community_id, ItemsByAuthor.* 
+FROM ItemsByAuthor, Communities2Item
+WHERE ItemsByAuthor.item_id = Communities2Item.item_id
 ;
 
 ----------------------------------------
@@ -513,7 +621,8 @@ CREATE TABLE ItemsByTitle
 
 -- index by the sort_title
 CREATE INDEX sort_title_idx on ItemsByTitle(sort_title);
-
+-- And by item ID for updates/re-indexing
+CREATE INDEX ItemsByTitle_item_id_idx ON ItemsByTitle(item_id);
 
 -------------------------------------------------------
 --  CollectionItemsByTitle view
@@ -528,9 +637,9 @@ WHERE ItemsByTitle.item_id = Collection2Item.item_id
 --  CommunityItemsByTitle view
 -------------------------------------------------------
 CREATE VIEW CommunityItemsByTitle as
-SELECT Community2Item.community_id, ItemsByTitle.* 
-FROM ItemsByTitle, Community2Item
-WHERE ItemsByTitle.item_id = Community2Item.item_id
+SELECT Communities2Item.community_id, ItemsByTitle.* 
+FROM ItemsByTitle, Communities2Item
+WHERE ItemsByTitle.item_id = Communities2Item.item_id
 ;
 
 -------------------------------------------------------
@@ -545,6 +654,8 @@ CREATE TABLE ItemsByDate
 
 -- sort by date
 CREATE INDEX date_issued_idx on ItemsByDate(date_issued);
+-- And by item ID for updates/re-indexing
+CREATE INDEX ItemsByDate_item_id_idx ON ItemsByDate(item_id);
 
 -------------------------------------------------------
 --  CollectionItemsByDate view
@@ -559,9 +670,9 @@ WHERE ItemsByDate.item_id = Collection2Item.item_id
 --  CommunityItemsByDate view
 -------------------------------------------------------
 CREATE VIEW CommunityItemsByDate as
-SELECT Community2Item.community_id, ItemsByDate.* 
-FROM ItemsByDate, Community2Item
-WHERE ItemsByDate.item_id = Community2Item.item_id
+SELECT Communities2Item.community_id, ItemsByDate.* 
+FROM ItemsByDate, Communities2Item
+WHERE ItemsByDate.item_id = Communities2Item.item_id
 ;
 
 -------------------------------------------------------
@@ -574,6 +685,9 @@ CREATE TABLE ItemsByDateAccessioned
    date_accessioned              TEXT
 );
 
+-- Index on item_id for update/re-indexing
+CREATE INDEX ItemsByDateAccessioned_item_id_idx ON ItemsByDateAccessioned(item_id);
+
 -------------------------------------------------------
 --  CollectionItemsByDateAccession view
 -------------------------------------------------------
@@ -587,9 +701,41 @@ WHERE ItemsByDateAccessioned.item_id = Collection2Item.item_id
 --  CommunityItemsByDateAccession view
 -------------------------------------------------------
 CREATE VIEW CommunityItemsByDateAccession as
-SELECT Community2Item.community_id, ItemsByDateAccessioned.* 
-FROM ItemsByDateAccessioned, Community2Item
-WHERE ItemsByDateAccessioned.item_id = Community2Item.item_id
+SELECT Communities2Item.community_id, ItemsByDateAccessioned.* 
+FROM ItemsByDateAccessioned, Communities2Item
+WHERE ItemsByDateAccessioned.item_id = Communities2Item.item_id
+;
+
+-------------------------------------------------------
+--  ItemsBySubject table
+-------------------------------------------------------
+CREATE TABLE ItemsBySubject
+(
+   items_by_subject_id INTEGER PRIMARY KEY,
+   item_id             INTEGER REFERENCES Item(item_id),
+   subject             TEXT,
+   sort_subject        TEXT
+);
+
+-- index by sort_subject
+CREATE INDEX sort_subject_idx on ItemsBySubject(sort_subject);
+
+-------------------------------------------------------
+--  CollectionItemsBySubject view
+-------------------------------------------------------
+CREATE VIEW CollectionItemsBySubject as
+SELECT Collection2Item.collection_id, ItemsBySubject.* 
+FROM ItemsBySubject, Collection2Item
+WHERE ItemsBySubject.item_id = Collection2Item.item_id
+;
+
+-------------------------------------------------------
+--  CommunityItemsBySubject view
+-------------------------------------------------------
+CREATE VIEW CommunityItemsBySubject as
+SELECT Communities2Item.community_id, ItemsBySubject.* 
+FROM ItemsBySubject, Communities2Item
+WHERE ItemsBySubject.item_id = Communities2Item.item_id
 ;
 
 
@@ -600,3 +746,120 @@ WHERE ItemsByDateAccessioned.item_id = Community2Item.item_id
 -- We don't use getnextid() for 'anonymous' since the sequences start at '1'
 INSERT INTO epersongroup VALUES(0, 'Anonymous');
 INSERT INTO epersongroup VALUES(getnextid('epersongroup'), 'Administrator');
+
+
+-------------------------------------------------------
+-- Create the checksum checker tables
+-------------------------------------------------------
+-- list of the possible results as determined
+-- by the system or an administrator
+
+CREATE TABLE checksum_results
+(
+    result_code VARCHAR PRIMARY KEY,
+    result_description VARCHAR
+);
+
+
+-- This table has a one-to-one relationship
+-- with the bitstream table. A row will be inserted
+-- every time a row is inserted into the bitstream table, and
+-- that row will be updated every time the checksum is
+-- re-calculated.
+
+CREATE TABLE most_recent_checksum 
+(
+    bitstream_id INTEGER PRIMARY KEY REFERENCES bitstream(bitstream_id),
+    to_be_processed BOOLEAN NOT NULL,
+    expected_checksum VARCHAR NOT NULL,
+    current_checksum VARCHAR NOT NULL,
+    last_process_start_date TIMESTAMP NOT NULL,
+    last_process_end_date TIMESTAMP NOT NULL,
+    checksum_algorithm VARCHAR NOT NULL,
+    matched_prev_checksum BOOLEAN NOT NULL,
+    result VARCHAR REFERENCES checksum_results(result_code)
+);
+
+-- A row will be inserted into this table every
+-- time a checksum is re-calculated.
+
+CREATE TABLE checksum_history 
+(
+    check_id BIGSERIAL PRIMARY KEY,  
+    bitstream_id INTEGER,
+    process_start_date TIMESTAMP,
+    process_end_date TIMESTAMP,
+    checksum_expected VARCHAR,
+    checksum_calculated VARCHAR,
+    result VARCHAR REFERENCES checksum_results(result_code)
+);
+
+
+-- this will insert into the result code
+-- the initial results that should be 
+-- possible
+
+insert into checksum_results
+values
+( 
+    'INVALID_HISTORY',
+    'Install of the cheksum checking code do not consider this history as valid' 
+);
+
+insert into checksum_results
+values
+( 
+    'BITSTREAM_NOT_FOUND',
+    'The bitstream could not be found' 
+);
+
+insert into checksum_results
+values
+( 
+    'CHECKSUM_MATCH',
+    'Current checksum matched previous checksum' 
+);
+
+insert into checksum_results
+values
+(
+    'CHECKSUM_NO_MATCH',
+    'Current checksum does not match previous checksum' 
+);
+
+insert into checksum_results
+values
+( 
+    'CHECKSUM_PREV_NOT_FOUND',
+    'Previous checksum was not found: no comparison possible' 
+);
+
+insert into checksum_results
+values
+( 
+    'BITSTREAM_INFO_NOT_FOUND',
+    'Bitstream info not found' 
+);
+
+insert into checksum_results
+values
+( 
+    'CHECKSUM_ALGORITHM_INVALID',
+    'Invalid checksum algorithm' 
+);
+insert into checksum_results
+values
+( 
+    'BITSTREAM_NOT_PROCESSED',
+    'Bitstream marked to_be_processed=false' 
+);
+insert into checksum_results
+values
+( 
+    'BITSTREAM_MARKED_DELETED',
+    'Bitstream marked deleted in bitstream table' 
+);
+
+
+
+

dspace/etc/database_schema_11-12.sql

@@ -0,0 +1,114 @@
+--
+-- database_schema_11-12.sql
+--
+-- Version: $Revision$
+--
+-- Date:    $Date$
+--
+-- Copyright (c) 2002, 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.
+
+--
+-- SQL commands to upgrade the database schema of a live DSpace 1.1 or 1.1.1
+-- to the DSpace 1.2 database schema
+-- 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+
+CREATE SEQUENCE community2community_seq;
+CREATE SEQUENCE communities2item_seq;
+
+ALTER TABLE Bitstream ADD sequence_id INTEGER;
+
+ALTER TABLE Item ADD owning_collection INTEGER;
+
+-- The following changes the last_modified column from a TIMESTAMP to a
+-- TIMESTAMP WITH TIME ZONE.  It copies over existing values of last_modified.
+-- 
+-- CAUTION:  This assumes that the values of the original 'last_modified'
+-- column were in the *local time zone*.
+--
+-- If you find that the original values in 'last_modified' are in *UTC*,
+-- (and this is not your local time zone), you will need to convert the
+-- values of your last_modified column to your local time zone in order
+-- for the following code to work.
+
+ALTER TABLE Item ADD COLUMN last_modified2 TIMESTAMP WITH TIME ZONE;
+UPDATE Item SET last_modified2 = last_modified;
+ALTER TABLE Item DROP COLUMN last_modified;
+ALTER TABLE Item RENAME last_modified2 TO last_modified;
+
+ALTER TABLE Bundle ADD name VARCHAR(16);
+ALTER TABLE Bundle ADD primary_bitstream_id INTEGER;
+ALTER TABLE Bundle ADD CONSTRAINT primary_bitstream_id_fk FOREIGN KEY (primary_bitstream_id) REFERENCES Bitstream(bitstream_id);
+CREATE TABLE Community2Community
+(
+  id             INTEGER PRIMARY KEY,
+  parent_comm_id INTEGER REFERENCES Community(community_id),
+  child_comm_id  INTEGER REFERENCES Community(community_id)
+);
+
+CREATE TABLE Communities2Item
+(
+   id                      INTEGER PRIMARY KEY,
+   community_id            INTEGER REFERENCES Community(community_id),
+   item_id                 INTEGER REFERENCES Item(item_id)
+);
+
+DROP VIEW CommunityItemsByAuthor;
+CREATE VIEW CommunityItemsByAuthor as
+SELECT Communities2Item.community_id, ItemsByAuthor.* 
+FROM ItemsByAuthor, Communities2Item
+WHERE ItemsByAuthor.item_id = Communities2Item.item_id
+;
+
+DROP VIEW CommunityItemsByTitle;
+CREATE VIEW CommunityItemsByTitle as
+SELECT Communities2Item.community_id, ItemsByTitle.* 
+FROM ItemsByTitle, Communities2Item
+WHERE ItemsByTitle.item_id = Communities2Item.item_id
+;
+
+DROP VIEW CommunityItemsByDate;
+CREATE VIEW CommunityItemsByDate as
+SELECT Communities2Item.community_id, ItemsByDate.* 
+FROM ItemsByDate, Communities2Item
+WHERE ItemsByDate.item_id = Communities2Item.item_id
+;
+
+DROP VIEW CommunityItemsByDateAccession;
+CREATE VIEW CommunityItemsByDateAccession as
+SELECT Communities2Item.community_id, ItemsByDateAccessioned.* 
+FROM ItemsByDateAccessioned, Communities2Item
+WHERE ItemsByDateAccessioned.item_id = Communities2Item.item_id
+;

dspace/etc/database_schema_12-13.sql

@@ -0,0 +1,89 @@
+--
+-- database_schema_12-13.sql
+--
+-- Version: $Revision$
+--
+-- Date:    $Date$
+--
+-- Copyright (c) 2002, 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.
+
+--
+-- SQL commands to upgrade the database schema of a live DSpace 1.2 or 1.2.x
+-- to the DSpace 1.3 database schema
+-- 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+
+CREATE SEQUENCE epersongroup2workspaceitem_seq;
+
+-------------------------------------------------------------------------------
+-- create the new EPersonGroup2WorkspaceItem table
+-------------------------------------------------------------------------------
+
+CREATE TABLE epersongroup2workspaceitem 
+(
+  id integer DEFAULT nextval('epersongroup2workspaceitem_seq'),
+  eperson_group_id integer REFERENCES EPersonGroup(eperson_group_id),
+  workspace_item_id integer REFERENCES WorkspaceItem(workspace_item_id),
+  CONSTRAINT epersongroup2item_pkey PRIMARY KEY (id)
+);
+
+-------------------------------------------------------------------------------
+-- modification to collection table to support being able to change the
+-- submitter and collection admin group names
+-------------------------------------------------------------------------------
+ALTER TABLE collection ADD submitter INTEGER REFERENCES EPersonGroup( eperson_group_id );
+
+ALTER TABLE collection ADD admin INTEGER REFERENCES EPersonGroup( eperson_group_id );
+
+ALTER TABLE eperson ADD netid varchar(64) UNIQUE;
+
+-------------------------------------------------------------------------------
+-- Additional indices for performance
+-------------------------------------------------------------------------------
+
+-- index by resource id and resource type id
+CREATE INDEX handle_resource_id_and_type_idx ON handle(resource_id, resource_type_id);
+
+-- Indexing browse tables update/re-index performance
+CREATE INDEX Communities2Item_item_id_idx ON Communities2Item( item_id );
+CREATE INDEX ItemsByAuthor_item_id_idx ON ItemsByAuthor(item_id);
+CREATE INDEX ItemsByTitle_item_id_idx ON ItemsByTitle(item_id);
+CREATE INDEX ItemsByDate_item_id_idx ON ItemsByDate(item_id);
+CREATE INDEX ItemsByDateAccessioned_item_id_idx ON ItemsByDateAccessioned(item_id);
+
+-- Improve mapping tables
+CREATE INDEX Community2Collection_community_id_idx ON Community2Collection(community_id);
+CREATE INDEX Community2Collection_collection_id_idx ON Community2Collection(collection_id);
+CREATE INDEX Collection2Item_item_id_idx ON Collection2Item( item_id );

dspace/etc/database_schema_13-14.sql

@@ -0,0 +1,376 @@
+--
+-- database_schema_13-14.sql
+--
+-- Version: $Revision$
+--
+-- Date:    $Date$
+--
+-- Copyright (c) 2002, 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.
+
+--
+-- SQL commands to upgrade the database schema of a live DSpace 1.3 or 1.3.x
+-- to the DSpace 1.4 database schema
+-- 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-------------------------------------------------------------------------------
+-- Sequences for Group within Group feature
+-------------------------------------------------------------------------------
+CREATE SEQUENCE group2group_seq;
+CREATE SEQUENCE group2groupcache_seq;
+
+------------------------------------------------------
+-- Group2Group table, records group membership in other groups
+------------------------------------------------------
+CREATE TABLE Group2Group
+(
+  id        INTEGER PRIMARY KEY,
+  parent_id INTEGER REFERENCES EPersonGroup(eperson_group_id),
+  child_id  INTEGER REFERENCES EPersonGroup(eperson_group_id)
+);
+
+------------------------------------------------------
+-- Group2GroupCache table, is the 'unwound' hierarchy in
+-- Group2Group.  It explicitly names every parent child
+-- relationship, even with nested groups.  For example,
+-- If Group2Group lists B is a child of A and C is a child of B,
+-- this table will have entries for parent(A,B), and parent(B,C)
+-- AND parent(A,C) so that all of the child groups of A can be
+-- looked up in a single simple query
+------------------------------------------------------
+CREATE TABLE Group2GroupCache
+(
+  id        INTEGER PRIMARY KEY,
+  parent_id INTEGER REFERENCES EPersonGroup(eperson_group_id),
+  child_id  INTEGER REFERENCES EPersonGroup(eperson_group_id)
+);
+
+
+-------------------------------------------------------
+-- New Metadata Tables and Sequences
+-------------------------------------------------------
+CREATE SEQUENCE metadataschemaregistry_seq;
+CREATE SEQUENCE metadatafieldregistry_seq;
+CREATE SEQUENCE metadatavalue_seq;
+
+-- MetadataSchemaRegistry table
+CREATE TABLE MetadataSchemaRegistry
+(
+  metadata_schema_id INTEGER PRIMARY KEY DEFAULT NEXTVAL('metadataschemaregistry_seq'),
+  namespace          VARCHAR(256) UNIQUE,
+  short_id           VARCHAR(32)
+);
+
+-- MetadataFieldRegistry table
+CREATE TABLE MetadataFieldRegistry
+(
+  metadata_field_id   INTEGER PRIMARY KEY DEFAULT NEXTVAL('metadatafieldregistry_seq'),
+  metadata_schema_id  INTEGER NOT NULL REFERENCES MetadataSchemaRegistry(metadata_schema_id),
+  element             VARCHAR(64),
+  qualifier           VARCHAR(64),
+  scope_note          TEXT
+);
+
+-- MetadataValue table
+CREATE TABLE MetadataValue
+(
+  metadata_value_id  INTEGER PRIMARY KEY DEFAULT NEXTVAL('metadatavalue_seq'),
+  item_id            INTEGER REFERENCES Item(item_id),
+  metadata_field_id  INTEGER REFERENCES MetadataFieldRegistry(metadata_field_id),
+  text_value         TEXT,
+  text_lang          VARCHAR(24),
+  place              INTEGER
+);
+
+-- Create the Metadata table indexes
+CREATE INDEX metadatavalue_item_idx ON MetadataValue(item_id);
+CREATE INDEX metadatavalue_item_idx2 ON MetadataValue(item_id,metadata_field_id);
+CREATE INDEX metadatafield_schema_idx ON MetadataFieldRegistry(metadata_schema_id);
+
+-- Create the DC schema
+INSERT INTO MetadataSchemaRegistry VALUES (1,'http://dublincore.org/documents/dcmi-terms/','dc');
+
+-- Migrate the existing DCTypes into the new metadata field registry
+INSERT INTO MetadataFieldRegistry
+  (metadata_schema_id, metadata_field_id, element, qualifier, scope_note)
+  SELECT '1' AS metadata_schema_id, dc_type_id, element, 
+     qualifier, scope_note FROM dctyperegistry;
+
+-- Copy the DCValues into the new MetadataValue table
+INSERT INTO MetadataValue (item_id, metadata_field_id, text_value, text_lang, place)
+  SELECT item_id, dc_type_id, text_value, text_lang, place FROM dcvalue;
+  
+DROP TABLE dcvalue;
+CREATE VIEW dcvalue AS
+  SELECT MetadataValue.metadata_value_id AS "dc_value_id", MetadataValue.item_id, 
+    MetadataValue.metadata_field_id AS "dc_type_id", MetadataValue.text_value, 
+    MetadataValue.text_lang, MetadataValue.place  
+  FROM MetadataValue, MetadataFieldRegistry
+  WHERE MetadataValue.metadata_field_id = MetadataFieldRegistry.metadata_field_id
+  AND MetadataFieldRegistry.metadata_schema_id = 1;
+
+SELECT setval('metadatafieldregistry_seq', max(metadata_field_id)) FROM metadatafieldregistry;
+SELECT setval('metadatavalue_seq', max(metadata_value_id)) FROM metadatavalue;
+SELECT setval('metadataschemaregistry_seq', max(metadata_schema_id)) FROM metadataschemaregistry;
+
+DROP TABLE dctyperegistry;
+
+------------------------------------------------------
+-- Bitstream table -- increase capacity of file size
+-- column, and bring in line with Oracle schema
+------------------------------------------------------
+ALTER TABLE bitstream ADD COLUMN size_bytes BIGINT;
+UPDATE bitstream SET size_bytes = size;
+ALTER TABLE bitstream DROP COLUMN size;
+
+-------------------------------------------------------
+-- Create the checksum checker tables
+-------------------------------------------------------
+-- list of the possible results as determined
+-- by the system or an administrator
+
+CREATE TABLE checksum_results
+(
+    result_code VARCHAR PRIMARY KEY,
+    result_description VARCHAR
+);
+
+
+-- This table has a one-to-one relationship
+-- with the bitstream table. A row will be inserted
+-- every time a row is inserted into the bitstream table, and
+-- that row will be updated every time the checksum is
+-- re-calculated.
+
+CREATE TABLE most_recent_checksum 
+(
+    bitstream_id INTEGER PRIMARY KEY REFERENCES bitstream(bitstream_id),
+    to_be_processed BOOLEAN NOT NULL,
+    expected_checksum VARCHAR NOT NULL,
+    current_checksum VARCHAR NOT NULL,
+    last_process_start_date TIMESTAMP NOT NULL,
+    last_process_end_date TIMESTAMP NOT NULL,
+    checksum_algorithm VARCHAR NOT NULL,
+    matched_prev_checksum BOOLEAN NOT NULL,
+    result VARCHAR REFERENCES checksum_results(result_code)
+);
+
+
+-- A row will be inserted into this table every
+-- time a checksum is re-calculated.
+
+CREATE TABLE checksum_history 
+(
+    check_id BIGSERIAL PRIMARY KEY,  
+    bitstream_id INTEGER,
+    process_start_date TIMESTAMP,
+    process_end_date TIMESTAMP,
+    checksum_expected VARCHAR,
+    checksum_calculated VARCHAR,
+    result VARCHAR REFERENCES checksum_results(result_code)
+);
+
+-- this will insert into the result code
+-- the initial results 
+
+insert into checksum_results
+values
+( 
+    'INVALID_HISTORY',
+    'Install of the cheksum checking code do not consider this history as valid' 
+);
+
+insert into checksum_results
+values
+( 
+    'BITSTREAM_NOT_FOUND',
+    'The bitstream could not be found' 
+);
+
+insert into checksum_results
+values
+( 
+    'CHECKSUM_MATCH',
+    'Current checksum matched previous checksum' 
+);
+
+insert into checksum_results
+values
+(
+    'CHECKSUM_NO_MATCH',
+    'Current checksum does not match previous checksum' 
+);
+
+insert into checksum_results
+values
+( 
+    'CHECKSUM_PREV_NOT_FOUND',
+    'Previous checksum was not found: no comparison possible' 
+);
+
+insert into checksum_results
+values
+( 
+    'BITSTREAM_INFO_NOT_FOUND',
+    'Bitstream info not found' 
+);
+
+insert into checksum_results
+values
+( 
+    'CHECKSUM_ALGORITHM_INVALID',
+    'Invalid checksum algorithm' 
+);
+insert into checksum_results
+values
+( 
+    'BITSTREAM_NOT_PROCESSED',
+    'Bitstream marked to_be_processed=false' 
+);
+insert into checksum_results
+values
+( 
+    'BITSTREAM_MARKED_DELETED',
+    'Bitstream marked deleted in bitstream table' 
+);
+
+-- this will insert into the most recent checksum
+-- on install all existing bitstreams
+-- setting all bitstreams already set as 
+-- deleted to not be processed
+
+insert into most_recent_checksum 
+(
+    bitstream_id,  
+    to_be_processed,
+    expected_checksum,
+    current_checksum,
+    last_process_start_date,
+    last_process_end_date,
+    checksum_algorithm,
+    matched_prev_checksum
+)
+select 
+    bitstream.bitstream_id, 
+    true, 
+    CASE WHEN bitstream.checksum IS NULL THEN '' ELSE bitstream.checksum END, 
+    CASE WHEN bitstream.checksum IS NULL THEN '' ELSE bitstream.checksum END, 
+    date_trunc('milliseconds', now()),
+    date_trunc('milliseconds', now()),
+    CASE WHEN bitstream.checksum_algorithm IS NULL THEN 'MD5' ELSE bitstream.checksum_algorithm END,
+    true
+from bitstream; 
+
+-- Update all the deleted checksums
+-- to not be checked
+-- because they have since been
+-- deleted from the system
+
+update most_recent_checksum
+set to_be_processed = false
+where most_recent_checksum.bitstream_id in (
+select bitstream_id
+from bitstream where deleted = true );
+
+-- this will insert into history table
+-- for the initial start 
+-- we want to tell the users to disregard the initial
+-- inserts into the checksum history table
+
+insert into checksum_history
+(
+    bitstream_id,
+    process_start_date,
+    process_end_date,
+    checksum_expected,
+    checksum_calculated
+)
+select most_recent_checksum.bitstream_id,
+     most_recent_checksum.last_process_end_date,
+     date_trunc('milliseconds', now()),
+      most_recent_checksum.expected_checksum,
+      most_recent_checksum.expected_checksum
+from most_recent_checksum;
+
+-- update the history to indicate that this was 
+-- the first time the software was installed
+update checksum_history 
+set result = 'INVALID_HISTORY';  
+
+------------------------------------------------------
+-- Drop unique community name constraint
+-- 
+-- FIXME:  Needs testing; the constraint name is not 
+-- guaranteed to be the same as below.  This step may
+-- need to be performed by hand.
+------------------------------------------------------
+ALTER TABLE community DROP CONSTRAINT community_name_key;
+
+
+-------------------------------------------------------
+-- Table and views for 'browse by subject' functionality
+-------------------------------------------------------
+CREATE SEQUENCE itemsbysubject_seq;
+
+-------------------------------------------------------
+--  ItemsBySubject table
+-------------------------------------------------------
+CREATE TABLE ItemsBySubject
+(
+   items_by_subject_id INTEGER PRIMARY KEY,
+   item_id             INTEGER REFERENCES Item(item_id),
+   subject             TEXT,
+   sort_subject        TEXT
+);
+
+-- index by sort_subject
+CREATE INDEX sort_subject_idx on ItemsBySubject(sort_subject);
+
+-------------------------------------------------------
+--  CollectionItemsBySubject view
+-------------------------------------------------------
+CREATE VIEW CollectionItemsBySubject as
+SELECT Collection2Item.collection_id, ItemsBySubject.* 
+FROM ItemsBySubject, Collection2Item
+WHERE ItemsBySubject.item_id = Collection2Item.item_id
+;
+
+-------------------------------------------------------
+--  CommunityItemsBySubject view
+-------------------------------------------------------
+CREATE VIEW CommunityItemsBySubject as
+SELECT Communities2Item.community_id, ItemsBySubject.* 
+FROM ItemsBySubject, Communities2Item
+WHERE ItemsBySubject.item_id = Communities2Item.item_id
+;

dspace/etc/dspace-web.xml

@@ -44,6 +44,8 @@
 <!--
   - The is the servlet deployment descriptor for Tomcat 4.0 for the DSpace
   - Web user interface
+  -
+  - '@@dspace.dir@@' will be replaced with the directory where DSpace is installed
   -->
 
 <web-app>
@@ -51,6 +53,22 @@
   <display-name>DSpace Web UI</display-name>
 
 
+  <!-- Configuration Information -->
+
+  <context-param>
+    <param-name>dspace-config</param-name>
+    <param-value>@@dspace.dir@@/config/dspace.cfg</param-value>
+    <description>
+      The location of the main DSpace configuration file
+    </description>
+  </context-param>
+
+  <context-param>
+    <param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+    <param-value>Messages</param-value>
+  </context-param>
+
+
   <!-- Filters -->
 
   <filter>
@@ -68,13 +86,18 @@
   
   <filter-mapping>
     <filter-name>admin-only</filter-name>
-    <url-pattern>/admin/*</url-pattern>
+    <url-pattern>/dspace-admin/*</url-pattern>
   </filter-mapping>
 
   <filter-mapping>
     <filter-name>registered-only</filter-name>
     <url-pattern>/mydspace</url-pattern>
   </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>registered-only</filter-name>
+    <url-pattern>/tools/*</url-pattern>
+  </filter-mapping>
     
   <filter-mapping>
     <filter-name>registered-only</filter-name>
@@ -91,10 +114,26 @@
     <url-pattern>/subscribe</url-pattern>
   </filter-mapping>
 
+  <filter-mapping>
+    <filter-name>registered-only</filter-name>
+    <url-pattern>/workspace</url-pattern>
+  </filter-mapping>
 
+  <filter-mapping>
+    <filter-name>registered-only</filter-name>
+    <url-pattern>/view-workspaceitem</url-pattern>
+  </filter-mapping>
 
   <!-- Servlets -->
 
+  <!-- DSpace configuration initialisation.  This needs to be loaded before
+       other servlets. -->
+  <servlet>
+    <servlet-name>load-dspace-config</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.LoadDSpaceConfig</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
   <servlet>
     <servlet-name>authorize</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.admin.AuthorizeAdminServlet</servlet-class>
@@ -105,6 +144,16 @@
     <servlet-class>org.dspace.app.webui.servlet.AdvancedSearchServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>itemmap</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.admin.ItemMapServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>bitstream</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.BitstreamServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>browse-author</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.BrowseServlet</servlet-class>
@@ -123,6 +172,15 @@
     </init-param>
   </servlet>
 
+  <servlet>
+    <servlet-name>browse-subject</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.BrowseServlet</servlet-class>
+    <init-param>
+      <param-name>browse</param-name>
+      <param-value>subjects</param-value>
+    </init-param>
+  </servlet>
+
   <servlet>
     <servlet-name>browse-title</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.BrowseServlet</servlet-class>
@@ -133,8 +191,8 @@
   </servlet>
 
   <servlet>
-    <servlet-name>certificate-login</servlet-name>
-    <servlet-class>org.dspace.app.webui.servlet.X509CertificateServlet</servlet-class>
+    <servlet-name>collection-wizard</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.admin.CollectionWizardServlet</servlet-class>
   </servlet>
 
   <servlet>
@@ -142,11 +200,6 @@
     <servlet-class>org.dspace.app.webui.servlet.CommunityListServlet</servlet-class>
   </servlet>
 
-  <servlet>
-    <servlet-name>dc-registry</servlet-name>
-    <servlet-class>org.dspace.app.webui.servlet.admin.DCTypeRegistryServlet</servlet-class>
-  </servlet>
-
   <servlet>
     <servlet-name>edit-communities</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.admin.EditCommunitiesServlet</servlet-class>
@@ -166,6 +219,31 @@
     <servlet-name>edit-item</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.admin.EditItemServlet</servlet-class>
   </servlet>
+  
+  <servlet>
+    <servlet-name>edit-news</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.admin.NewsEditServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>edit-license</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.admin.LicenseEditServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>eperson-list</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.admin.EPersonListServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>group-select-list</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.admin.GroupListServlet</servlet-class>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>feed</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.FeedServlet</servlet-class>
+  </servlet>
 
   <servlet>
     <servlet-name>feedback</servlet-name>
@@ -191,6 +269,11 @@
     <servlet-class>org.dspace.app.webui.servlet.HandleServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>html</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.HTMLServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>internal-error</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.InternalErrorServlet</servlet-class>
@@ -201,11 +284,26 @@
     <servlet-class>org.dspace.app.webui.servlet.ItemsByAuthorServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>items-by-subject</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.ItemsBySubjectServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>logout</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.LogoutServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>metadata-field-registry</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>metadata-schema-registry</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.admin.MetadataSchemaRegistryServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>mydspace</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.MyDSpaceServlet</servlet-class>
@@ -221,6 +319,11 @@
     <servlet-class>org.dspace.app.webui.servlet.PasswordServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>ldap-login</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.LDAPServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>profile</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.EditProfileServlet</servlet-class>
@@ -239,12 +342,17 @@
     <servlet-name>retrieve</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.RetrieveServlet</servlet-class>
   </servlet>
-
+  
   <servlet>
     <servlet-name>simple-search</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.SimpleSearchServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>statistics</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.StatisticsServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>submit</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.SubmitServlet</servlet-class>
@@ -254,18 +362,49 @@
     <servlet-name>subscribe</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.SubscribeServlet</servlet-class>
   </servlet>
+  
+  <servlet>
+    <servlet-name>suggest</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.SuggestServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>supervise</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.admin.SuperviseServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>view-workspaceitem</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.ViewWorkspaceItemServlet</servlet-class>
+  </servlet>
 
   <servlet>
     <servlet-name>workflow</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.admin.WorkflowAbortServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>workspace</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.WorkspaceServlet</servlet-class>
+  </servlet>
+  
+    
+  <servlet>
+    <servlet-name>controlledvocabulary</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.ControlledVocabularyServlet</servlet-class>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>subject-search</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.ControlledVocabularySearchServlet</servlet-class>
+  </servlet>  
+  
 
   <!-- Servlet Mappings -->
 
   <servlet-mapping>
     <servlet-name>authorize</servlet-name>
-    <url-pattern>/admin/authorize</url-pattern>
+    <url-pattern>/dspace-admin/authorize</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -273,6 +412,11 @@
     <url-pattern>/advanced-search</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>bitstream</servlet-name>
+    <url-pattern>/bitstream/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>browse-author</servlet-name>
     <url-pattern>/browse-author</url-pattern>
@@ -284,13 +428,13 @@
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>browse-title</servlet-name>
-    <url-pattern>/browse-title</url-pattern>
+    <servlet-name>browse-subject</servlet-name>
+    <url-pattern>/browse-subject</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>certificate-login</servlet-name>
-    <url-pattern>/certificate-login</url-pattern>
+    <servlet-name>browse-title</servlet-name>
+    <url-pattern>/browse-title</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -299,23 +443,58 @@
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>dc-registry</servlet-name>
-    <url-pattern>/admin/dc-registry</url-pattern>
+    <servlet-name>collection-wizard</servlet-name>
+    <url-pattern>/tools/collection-wizard</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
     <servlet-name>edit-communities</servlet-name>
-    <url-pattern>/admin/edit-communities</url-pattern>
+    <url-pattern>/tools/edit-communities</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>edit-communities</servlet-name>
+    <url-pattern>/dspace-admin/edit-communities</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
     <servlet-name>edit-epeople</servlet-name>
-    <url-pattern>/admin/edit-epeople</url-pattern>
+    <url-pattern>/dspace-admin/edit-epeople</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
     <servlet-name>edit-item</servlet-name>
-    <url-pattern>/admin/edit-item</url-pattern>
+    <url-pattern>/tools/edit-item</url-pattern>
+  </servlet-mapping>
+  
+  <servlet-mapping>
+    <servlet-name>edit-news</servlet-name>
+    <url-pattern>/dspace-admin/news-edit</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>edit-license</servlet-name>
+    <url-pattern>/dspace-admin/license-edit</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>eperson-list</servlet-name>
+    <url-pattern>/tools/eperson-list</url-pattern>
+  </servlet-mapping>
+  
+  <servlet-mapping>
+    <servlet-name>group-select-list</servlet-name>
+    <url-pattern>/tools/group-select-list</url-pattern>
+  </servlet-mapping>
+  
+ <servlet-mapping>
+    <servlet-name>itemmap</servlet-name>
+    <url-pattern>/tools/itemmap</url-pattern>
+  </servlet-mapping>
+  
+  <servlet-mapping>
+    <servlet-name>feed</servlet-name>
+    <url-pattern>/feed/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -330,12 +509,12 @@
 
   <servlet-mapping>
     <servlet-name>format-registry</servlet-name>
-    <url-pattern>/admin/format-registry</url-pattern>
+    <url-pattern>/dspace-admin/format-registry</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
     <servlet-name>groups</servlet-name>
-    <url-pattern>/admin/groups</url-pattern>
+    <url-pattern>/tools/group-edit</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -343,6 +522,11 @@
     <url-pattern>/handle/*</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>html</servlet-name>
+    <url-pattern>/html/*</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>internal-error</servlet-name>
     <url-pattern>/internal-error</url-pattern>
@@ -353,11 +537,26 @@
     <url-pattern>/items-by-author</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>items-by-subject</servlet-name>
+    <url-pattern>/items-by-subject</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>logout</servlet-name>
     <url-pattern>/logout</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>metadata-field-registry</servlet-name>
+    <url-pattern>/dspace-admin/metadata-field-registry</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>metadata-schema-registry</servlet-name>
+    <url-pattern>/dspace-admin/metadata-schema-registry</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>mydspace</servlet-name>
     <url-pattern>/mydspace</url-pattern>
@@ -373,6 +572,11 @@
     <url-pattern>/password-login</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>ldap-login</servlet-name>
+    <url-pattern>/ldap-login</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>profile</servlet-name>
     <url-pattern>/profile</url-pattern>
@@ -393,6 +597,11 @@
     <url-pattern>/simple-search</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>statistics</servlet-name>
+    <url-pattern>/statistics</url-pattern>
+  </servlet-mapping>
+
   <servlet-mapping>
     <servlet-name>submit</servlet-name>
     <url-pattern>/submit</url-pattern>
@@ -402,13 +611,42 @@
     <servlet-name>subscribe</servlet-name>
     <url-pattern>/subscribe</url-pattern>
   </servlet-mapping>
+  
+  <servlet-mapping>
+    <servlet-name>suggest</servlet-name>
+    <url-pattern>/suggest</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>supervise</servlet-name>
+    <url-pattern>/dspace-admin/supervise</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>view-workspaceitem</servlet-name>
+    <url-pattern>/view-workspaceitem</url-pattern>
+  </servlet-mapping>
 
   <servlet-mapping>
     <servlet-name>workflow</servlet-name>
-    <url-pattern>/admin/workflow</url-pattern>
+    <url-pattern>/dspace-admin/workflow</url-pattern>
   </servlet-mapping>
 
-
+  <servlet-mapping>
+    <servlet-name>workspace</servlet-name>
+    <url-pattern>/workspace</url-pattern>
+  </servlet-mapping>
+  
+    
+  <servlet-mapping>
+    <servlet-name>controlledvocabulary</servlet-name>
+    <url-pattern>/controlledvocabulary</url-pattern>
+  </servlet-mapping>  
+  
+  <servlet-mapping>
+    <servlet-name>subject-search</servlet-name>
+    <url-pattern>/subject-search</url-pattern>
+  </servlet-mapping> 
 
   <!-- Icon MIME type -->
   <mime-mapping>
@@ -434,6 +672,12 @@
   </error-page>
 
 
+  <!-- JSTL Format tag, for i18n -->
+  <taglib>
+    <taglib-uri>http://java.sun.com/jsp/jstl/fmt</taglib-uri>
+    <taglib-location>/WEB-INF/fmt.tld</taglib-location>
+  </taglib>
+  
   <!-- DSpace JSP Tag Library -->
   <taglib>
     <taglib-uri>http://www.dspace.org/dspace-tags.tld</taglib-uri>

dspace/etc/input-forms.dtd

@@ -0,0 +1,48 @@
+<!-- DSpace Custom Submit input form definition language -->
+
+
+ <!ELEMENT input-forms (form-map, form-definitions, form-value-pairs) >
+
+ <!ELEMENT form-map (name-map)* >
+ <!ELEMENT name-map EMPTY >
+ <!ATTLIST name-map 
+           collection-handle CDATA #REQUIRED
+           form-name NMTOKEN #REQUIRED>
+
+ <!ELEMENT form-definitions (form)+ >
+ <!ELEMENT form (page)+ >
+ <!ATTLIST form name NMTOKEN #REQUIRED>
+ <!ELEMENT page (field)+ >
+ <!ATTLIST page number NMTOKEN #REQUIRED>
+ <!ELEMENT field (dc-element, dc-qualifier?, repeatable?, label, input-type, hint, required?) >
+ <!ELEMENT dc-element (#PCDATA) >
+ <!ELEMENT dc-qualifier (#PCDATA) >
+ 
+ <!ELEMENT repeatable (#PCDATA) >
+ <!ELEMENT label (#PCDATA) >
+ <!ELEMENT input-type (#PCDATA)>
+  
+ <!ELEMENT hint (#PCDATA) >
+ <!ELEMENT required (#PCDATA)>
+
+ <!ELEMENT form-value-pairs (value-pairs)* >
+ <!ELEMENT value-pairs (pair)+ >
+
+ <!-- ***
+        To assign a particular 'value-pairs' list to a particular dropdown 'input-type'
+        field, as found on a particular form, put:
+        - value-pairs/@value-pairs-name string into
+           form/page/field/input-type/@value-pairs-name
+        - form/page/field/@DCelement + '_' + form/field/DCqualifier into
+           value-pairs/@dc-term
+             (e.g. 'language_iso')
+  -->
+ <!ATTLIST value-pairs value-pairs-name CDATA #REQUIRED
+                            dc-term   CDATA #REQUIRED
+ >
+  
+ <!ELEMENT pair (displayed-value,stored-value) >
+ <!ELEMENT displayed-value (#PCDATA)>
+ <!ELEMENT stored-value (#PCDATA)>
+
+<!ATTLIST input-type value-pairs-name CDATA  #IMPLIED>

dspace/etc/oai-web.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 
-<!--
-  - REMEMBER: ONLY UPDATE THE VERSION IN dspace/config/templates
-  - AND THEN RUN dspace/bin/install-configs!
-  - DO NOT EDIT THE 'LIVE' VERSION!
-  -->
-
 <!--
  - web.xml
  -
@@ -52,19 +46,21 @@
   - Web application.
   - OAICat Configuration file - see OAICat documentation for details
   -
-  - Text surrounded by two '@' symbols is replaced with the corresponding
-  - property from dspace.cfg.  For example:
-  -
-  - @@dspace.url@@
-  -
-  - would be replaced with the dspace.url property in dspace.cfg.
-  - When /dspace/bin/install-configs is run, this file will be installed in the
-  - location specified by the property: config.template.oai-web.xml
+  - '@@dspace.dir@@' will be replaced with the directory where DSpace is installed
   -->
 
 <web-app>
   <display-name>DSpace OAI-PMH 2.0</display-name>
 
+  <!-- DSpace configuration information -->
+  <context-param>
+    <param-name>dspace-config</param-name>
+    <param-value>@@dspace.dir@@/config/dspace.cfg</param-value>
+    <description>
+      The location of the main DSpace configuration file
+    </description>
+  </context-param>
+
   <context-param>
     <param-name>properties</param-name>
     <param-value>@@dspace.dir@@/config/oaicat.properties</param-value>
@@ -74,6 +70,14 @@
     </description>
   </context-param>
 
+  <!-- DSpace configuration initialisation.  This needs to be loaded before
+       other servlets. -->
+  <servlet>
+    <servlet-name>load-dspace-config</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.LoadDSpaceConfig</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
   <servlet>
     <servlet-name>oai-handler</servlet-name>
     <servlet-class>ORG.oclc.oai.server.OAIHandler</servlet-class>
@@ -81,6 +85,6 @@
 
   <servlet-mapping>
     <servlet-name>oai-handler</servlet-name>
-    <url-pattern>/</url-pattern>
+    <url-pattern>/request</url-pattern>
   </servlet-mapping>
 </web-app>

dspace/etc/oracle/ORACLE_README.txt

@@ -0,0 +1,51 @@
+DSpace on Oracle
+Revision: 11-sep-04 dstuve
+
+(Installation notes moved to main DSpace documentation)
+
+
+Oracle Porting Notes for the Curious
+
+Oracle is missing quite a number of cool features found in Postgres, so
+workarounds had to be found, most of which are hidden behind tests of
+the db.name configuration parameter in dspace.cfg.  If the db.name is
+set to Oracle the workarounds are activated:
+
+Oracle doesn't like ';' characters in JDBC SQL - they have all been removed
+from the DSpace source, including code in the .sql file reader to strip ;'s.
+
+browse code - LIMIT and OFFSET is used to limit browse results, and an
+Oracle-hack is used to limit the result set to a given size
+
+Oracle has no boolean data type, so a new schema file was created that
+uses INTEGERs and code is inserted everywhere to use 0 for false
+and 1 for true if the db.name is Oracle
+
+Oracle doesn't have a TEXT data type either, so TEXT columns are defined
+as VARCHAR2 in the Oracle-specific schema.
+
+Oracle doesn't allow dynamic naming for objects, so our cute trick to
+derive the name of the sequence by appending _seq to the table name
+in a function doesn't work in Oracle - workaround is to insert Oracle
+code to generate the name of the sequence and then place that into
+our SQL calls to generate a new ID.
+
+Oracle doesn't let you directly set the value of sequences, so
+update-sequences.sql is forced to use a special script sequpdate.sql
+to update the sequences.
+
+Bitstream had a column 'size' which is a reserved word in Oracle,
+so this had to be changed to 'size_bytes' with corresponding code changes.
+
+VARCHAR2 has a limit of 4000 characters, so DSpace text data is limited to 4k. 
+Going to the CLOB data type can get around that, but seemed like too much effort
+for now.  Note that with UTF-8 encoding that 4k could translate to 1300
+characters worst-case (every character taking up 3 bytes is the worst case
+scenario.)
+
+DatabaseManager had to have some of the type checking changed, because Oracle's
+JDBC driver is reporting INTEGERS as type DECIMAL.
+
+Oracle doesn't like it when you reference table names in lower case when
+getting JDBC metadata for the tables, so they are converted in TableRow
+to upper case.

dspace/etc/oracle/database_schema.sql

@@ -0,0 +1,818 @@
+--
+-- database_schema.sql (ORACLE version!)
+--
+-- Version: $Revision$
+--
+-- Date:    $Date$
+--
+-- Copyright (c) 2002, 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.
+
+
+CREATE SEQUENCE bitstreamformatregistry_seq;
+CREATE SEQUENCE fileextension_seq;
+CREATE SEQUENCE bitstream_seq;
+CREATE SEQUENCE eperson_seq;
+CREATE SEQUENCE epersongroup_seq START WITH 2;
+-- we reserve 0 and 1
+CREATE SEQUENCE item_seq;
+CREATE SEQUENCE bundle_seq;
+CREATE SEQUENCE item2bundle_seq;
+CREATE SEQUENCE bundle2bitstream_seq;
+CREATE SEQUENCE dctyperegistry_seq;
+CREATE SEQUENCE dcvalue_seq;
+CREATE SEQUENCE community_seq;
+CREATE SEQUENCE collection_seq;
+CREATE SEQUENCE community2community_seq;
+CREATE SEQUENCE community2collection_seq;
+CREATE SEQUENCE collection2item_seq;
+CREATE SEQUENCE resourcepolicy_seq;
+CREATE SEQUENCE epersongroup2eperson_seq;
+CREATE SEQUENCE handle_seq;
+CREATE SEQUENCE workspaceitem_seq;
+CREATE SEQUENCE workflowitem_seq;
+CREATE SEQUENCE tasklistitem_seq;
+CREATE SEQUENCE registrationdata_seq;
+CREATE SEQUENCE subscription_seq;
+CREATE SEQUENCE history_seq;
+CREATE SEQUENCE historystate_seq;
+CREATE SEQUENCE communities2item_seq;
+CREATE SEQUENCE itemsbyauthor_seq;
+CREATE SEQUENCE itemsbytitle_seq;
+CREATE SEQUENCE itemsbydate_seq;
+CREATE SEQUENCE itemsbydateaccessioned_seq;
+CREATE SEQUENCE itemsbysubject_seq;
+CREATE SEQUENCE epersongroup2workspaceitem_seq;
+CREATE SEQUENCE metadataschemaregistry_seq;
+CREATE SEQUENCE metadatafieldregistry_seq;
+CREATE SEQUENCE metadatavalue_seq;
+CREATE SEQUENCE group2group_seq;
+CREATE SEQUENCE group2groupcache_seq;
+
+-------------------------------------------------------
+-- BitstreamFormatRegistry table
+-------------------------------------------------------
+CREATE TABLE BitstreamFormatRegistry
+(
+  bitstream_format_id INTEGER PRIMARY KEY,
+  mimetype            VARCHAR2(48),
+  short_description   VARCHAR2(128) UNIQUE,
+  description         VARCHAR2(2000),
+  support_level       INTEGER,
+  -- Identifies internal types
+  internal             NUMBER(1)
+);
+
+-------------------------------------------------------
+-- FileExtension table
+-------------------------------------------------------
+CREATE TABLE FileExtension
+(
+  file_extension_id    INTEGER PRIMARY KEY,
+  bitstream_format_id  INTEGER REFERENCES BitstreamFormatRegistry(bitstream_format_id),
+  extension            VARCHAR2(16)
+);
+
+-------------------------------------------------------
+-- Bitstream table
+-------------------------------------------------------
+CREATE TABLE Bitstream
+(
+   bitstream_id            INTEGER PRIMARY KEY,
+   bitstream_format_id     INTEGER REFERENCES BitstreamFormatRegistry(bitstream_format_id),
+   name                    VARCHAR2(256),
+   size_bytes              INTEGER,
+   checksum                VARCHAR2(64),
+   checksum_algorithm      VARCHAR2(32),
+   description             VARCHAR2(2000),
+   user_format_description VARCHAR2(2000),
+   source                  VARCHAR2(256),
+   internal_id             VARCHAR2(256),
+   deleted                 NUMBER(1),
+   store_number            INTEGER,
+   sequence_id             INTEGER
+);
+
+-------------------------------------------------------
+-- EPerson table
+-------------------------------------------------------
+CREATE TABLE EPerson
+(
+  eperson_id          INTEGER PRIMARY KEY,
+  email               VARCHAR2(64) UNIQUE,
+  password            VARCHAR2(64),
+  firstname           VARCHAR2(64),
+  lastname            VARCHAR2(64),
+  can_log_in          NUMBER(1),
+  require_certificate NUMBER(1),
+  self_registered     NUMBER(1),
+  last_active         TIMESTAMP,
+  sub_frequency       INTEGER,
+  phone	              VARCHAR2(32),
+  netid               VARCHAR2(64) UNIQUE
+);
+
+
+-------------------------------------------------------
+-- EPersonGroup table
+-------------------------------------------------------
+CREATE TABLE EPersonGroup
+(
+  eperson_group_id INTEGER PRIMARY KEY,
+  name             VARCHAR2(256) UNIQUE
+);
+
+------------------------------------------------------
+-- Group2Group table, records group membership in other groups
+------------------------------------------------------
+CREATE TABLE Group2Group
+(
+  id        INTEGER PRIMARY KEY,
+  parent_id INTEGER REFERENCES EPersonGroup(eperson_group_id),
+  child_id  INTEGER REFERENCES EPersonGroup(eperson_group_id)
+);
+
+------------------------------------------------------
+-- Group2GroupCache table, is the 'unwound' hierarchy in
+-- Group2Group.  It explicitly names every parent child
+-- relationship, even with nested groups.  For example,
+-- If Group2Group lists B is a child of A and C is a child of B,
+-- this table will have entries for parent(A,B), and parent(B,C)
+-- AND parent(A,C) so that all of the child groups of A can be
+-- looked up in a single simple query
+------------------------------------------------------
+CREATE TABLE Group2GroupCache
+(
+  id        INTEGER PRIMARY KEY,
+  parent_id INTEGER REFERENCES EPersonGroup(eperson_group_id),
+  child_id  INTEGER REFERENCES EPersonGroup(eperson_group_id)
+);
+
+-------------------------------------------------------
+-- Item table
+-------------------------------------------------------
+CREATE TABLE Item
+(
+  item_id         INTEGER PRIMARY KEY,
+  submitter_id    INTEGER REFERENCES EPerson(eperson_id),
+  in_archive      NUMBER(1),
+  withdrawn       NUMBER(1),
+  last_modified   TIMESTAMP,
+  owning_collection INTEGER
+);
+
+-------------------------------------------------------
+-- Bundle table
+-------------------------------------------------------
+CREATE TABLE Bundle
+(
+  bundle_id          INTEGER PRIMARY KEY,
+  mets_bitstream_id  INTEGER REFERENCES Bitstream(bitstream_id),
+  name               VARCHAR2(16),  -- ORIGINAL | THUMBNAIL | TEXT 
+  primary_bitstream_id	INTEGER REFERENCES Bitstream(bitstream_id)
+);
+
+-------------------------------------------------------
+-- Item2Bundle table
+-------------------------------------------------------
+CREATE TABLE Item2Bundle
+(
+  id        INTEGER PRIMARY KEY,
+  item_id   INTEGER REFERENCES Item(item_id),
+  bundle_id INTEGER REFERENCES Bundle(bundle_id)
+);
+
+-- index by item_id
+CREATE INDEX item2bundle_item_idx on Item2Bundle(item_id);
+
+-------------------------------------------------------
+-- Bundle2Bitstream table
+-------------------------------------------------------
+CREATE TABLE Bundle2Bitstream
+(
+  id           INTEGER PRIMARY KEY,
+  bundle_id    INTEGER REFERENCES Bundle(bundle_id),
+  bitstream_id INTEGER REFERENCES Bitstream(bitstream_id)
+);
+
+-- index by bundle_id
+CREATE INDEX bundle2bitstream_bundle_idx ON Bundle2Bitstream(bundle_id);
+
+-------------------------------------------------------
+-- Metadata Tables and Sequences
+-------------------------------------------------------
+CREATE TABLE MetadataSchemaRegistry
+(
+  metadata_schema_id INTEGER PRIMARY KEY,
+  namespace          VARCHAR(256) UNIQUE,
+  short_id           VARCHAR(32) UNIQUE
+);
+
+CREATE TABLE MetadataFieldRegistry
+(
+  metadata_field_id   INTEGER PRIMARY KEY,
+  metadata_schema_id  INTEGER NOT NULL REFERENCES MetadataSchemaRegistry(metadata_schema_id),
+  element    VARCHAR(64),
+  qualifier  VARCHAR(64),
+  scope_note VARCHAR2(2000)
+);
+
+CREATE TABLE MetadataValue
+(
+  metadata_value_id  INTEGER PRIMARY KEY,
+  item_id       INTEGER REFERENCES Item(item_id),
+  metadata_field_id  INTEGER REFERENCES MetadataFieldRegistry(metadata_field_id),
+  text_value VARCHAR2(4000),
+  text_lang  VARCHAR(64),
+  place              INTEGER
+);
+
+-- Create the DC schema
+INSERT INTO MetadataSchemaRegistry VALUES (1,'http://dublincore.org/documents/dcmi-terms/','dc');
+
+-- Create a dcvalue view for backwards compatibilty
+CREATE VIEW dcvalue AS
+  SELECT MetadataValue.metadata_value_id AS "dc_value_id", MetadataValue.item_id,
+    MetadataValue.metadata_field_id AS "dc_type_id", MetadataValue.text_value,
+    MetadataValue.text_lang, MetadataValue.place
+  FROM MetadataValue, MetadataFieldRegistry
+  WHERE MetadataValue.metadata_field_id = MetadataFieldRegistry.metadata_field_id
+  AND MetadataFieldRegistry.metadata_schema_id = 1;
+
+-- An index for item_id - almost all access is based on
+-- instantiating the item object, which grabs all values
+-- related to that item
+CREATE INDEX metadatavalue_item_idx ON MetadataValue(item_id);
+CREATE INDEX metadatavalue_item_idx2 ON MetadataValue(item_id,metadata_field_id);
+CREATE INDEX metadatafield_schema_idx ON MetadataFieldRegistry(metadata_schema_id);
+
+-------------------------------------------------------
+-- Community table
+-------------------------------------------------------
+CREATE TABLE Community
+(
+  community_id      INTEGER PRIMARY KEY,
+  name              VARCHAR2(128),
+  short_description VARCHAR2(512),
+  introductory_text VARCHAR2(2000),
+  logo_bitstream_id INTEGER REFERENCES Bitstream(bitstream_id),
+  copyright_text    VARCHAR2(2000),
+  side_bar_text     VARCHAR2(2000)
+);
+
+-------------------------------------------------------
+-- Collection table
+-------------------------------------------------------
+CREATE TABLE Collection
+(
+  collection_id     INTEGER PRIMARY KEY,
+  name              VARCHAR2(128),
+  short_description VARCHAR2(512),
+  introductory_text VARCHAR2(2000),
+  logo_bitstream_id INTEGER REFERENCES Bitstream(bitstream_id),
+  template_item_id  INTEGER REFERENCES Item(item_id),
+  provenance_description  VARCHAR2(2000),
+  license           VARCHAR2(2000),
+  copyright_text    VARCHAR2(2000),
+  side_bar_text     VARCHAR2(2000),
+  workflow_step_1   INTEGER REFERENCES EPersonGroup( eperson_group_id ),
+  workflow_step_2   INTEGER REFERENCES EPersonGroup( eperson_group_id ),
+  workflow_step_3   INTEGER REFERENCES EPersonGroup( eperson_group_id ),
+  submitter         INTEGER REFERENCES EPersonGroup( eperson_group_id ),
+  admin             INTEGER REFERENCES EPersonGroup( eperson_group_id )
+);
+
+-------------------------------------------------------
+-- Community2Community table
+-------------------------------------------------------
+CREATE TABLE Community2Community
+(
+  id             INTEGER PRIMARY KEY,
+  parent_comm_id INTEGER REFERENCES Community(community_id),
+  child_comm_id  INTEGER REFERENCES Community(community_id)
+);
+
+-------------------------------------------------------
+-- Community2Collection table
+-------------------------------------------------------
+CREATE TABLE Community2Collection
+(
+  id             INTEGER PRIMARY KEY,
+  community_id   INTEGER REFERENCES Community(community_id),
+  collection_id  INTEGER REFERENCES Collection(collection_id)
+);
+
+-- Improve mapping tables
+CREATE INDEX Comm2Coll_community_id_idx ON Community2Collection(community_id);
+CREATE INDEX Comm2Coll_collection_id_idx ON Community2Collection(collection_id);
+
+-------------------------------------------------------
+-- Collection2Item table
+-------------------------------------------------------
+CREATE TABLE Collection2Item
+(
+  id            INTEGER PRIMARY KEY,
+  collection_id INTEGER REFERENCES Collection(collection_id),
+  item_id       INTEGER REFERENCES Item(item_id)
+);
+
+-- index by collection_id
+CREATE INDEX collection2item_collection_idx ON Collection2Item(collection_id);
+
+-- Improve mapping tables
+CREATE INDEX Collection2Item_item_id_idx ON Collection2Item( item_id );
+
+-------------------------------------------------------
+-- ResourcePolicy table
+-------------------------------------------------------
+CREATE TABLE ResourcePolicy
+(
+  policy_id            INTEGER PRIMARY KEY,
+  resource_type_id     INTEGER,
+  resource_id          INTEGER,
+  action_id            INTEGER,
+  eperson_id           INTEGER REFERENCES EPerson(eperson_id),
+  epersongroup_id      INTEGER REFERENCES EPersonGroup(eperson_group_id),
+  start_date           DATE,
+  end_date             DATE
+);
+
+-- index by resource_type,resource_id - all queries by
+-- authorization manager are select type=x, id=y, action=z
+CREATE INDEX resourcepolicy_type_id_idx ON ResourcePolicy(resource_type_id,resource_id); 
+
+-------------------------------------------------------
+-- EPersonGroup2EPerson table
+-------------------------------------------------------
+CREATE TABLE EPersonGroup2EPerson
+(
+  id               INTEGER PRIMARY KEY,
+  eperson_group_id INTEGER REFERENCES EPersonGroup(eperson_group_id),
+  eperson_id       INTEGER REFERENCES EPerson(eperson_id)
+);
+
+-- Index by group ID (used heavily by AuthorizeManager)
+CREATE INDEX epersongroup2eperson_group_idx on EPersonGroup2EPerson(eperson_group_id);
+
+
+-------------------------------------------------------
+-- Handle table
+-------------------------------------------------------
+CREATE TABLE Handle
+(
+  handle_id        INTEGER PRIMARY KEY,
+  handle           VARCHAR2(256) UNIQUE,
+  resource_type_id INTEGER,
+  resource_id      INTEGER
+);
+
+-- index by resource id and resource type id
+CREATE INDEX handle_resource_id_type_idx ON handle(resource_id, resource_type_id);
+
+-------------------------------------------------------
+--  WorkspaceItem table
+-------------------------------------------------------
+CREATE TABLE WorkspaceItem
+(
+  workspace_item_id INTEGER PRIMARY KEY,
+  item_id           INTEGER REFERENCES Item(item_id),
+  collection_id     INTEGER REFERENCES Collection(collection_id),
+  -- Answers to questions on first page of submit UI
+  multiple_titles   NUMBER(1),  -- boolean
+  published_before  NUMBER(1),
+  multiple_files    NUMBER(1),
+  -- How for the user has got in the submit process
+  stage_reached     INTEGER
+);
+
+-------------------------------------------------------
+--  WorkflowItem table
+-------------------------------------------------------
+CREATE TABLE WorkflowItem
+(
+  workflow_id    INTEGER PRIMARY KEY,
+  item_id        INTEGER REFERENCES Item(item_id) UNIQUE,
+  collection_id  INTEGER REFERENCES Collection(collection_id),
+  state          INTEGER,
+  owner          INTEGER REFERENCES EPerson(eperson_id),
+
+  -- Answers to questions on first page of submit UI
+  multiple_titles       NUMBER(1),
+  published_before      NUMBER(1),
+  multiple_files        NUMBER(1)
+  -- Note: stage reached not applicable here - people involved in workflow
+  -- can always jump around submission UI
+
+);
+
+-------------------------------------------------------
+--  TasklistItem table
+-------------------------------------------------------
+CREATE TABLE TasklistItem
+(
+  tasklist_id	INTEGER PRIMARY KEY,
+  eperson_id	INTEGER REFERENCES EPerson(eperson_id),
+  workflow_id	INTEGER REFERENCES WorkflowItem(workflow_id)
+);
+
+
+-------------------------------------------------------
+--  RegistrationData table
+-------------------------------------------------------
+CREATE TABLE RegistrationData
+(
+  registrationdata_id   INTEGER PRIMARY KEY,
+  email                 VARCHAR2(64) UNIQUE,
+  token                 VARCHAR2(48),
+  expires		TIMESTAMP
+);
+
+
+-------------------------------------------------------
+--  Subscription table
+-------------------------------------------------------
+CREATE TABLE Subscription
+(
+  subscription_id   INTEGER PRIMARY KEY,
+  eperson_id        INTEGER REFERENCES EPerson(eperson_id),
+  collection_id     INTEGER REFERENCES Collection(collection_id)
+);
+
+
+-------------------------------------------------------
+--  History table
+-------------------------------------------------------
+CREATE TABLE History
+(
+  history_id           INTEGER PRIMARY KEY,
+  -- When it was stored
+  creation_date        TIMESTAMP,
+  -- A checksum to keep INTEGERizations from being stored more than once
+  checksum             VARCHAR2(32) UNIQUE
+);
+
+-------------------------------------------------------
+--  HistoryState table
+-------------------------------------------------------
+CREATE TABLE HistoryState
+(
+  history_state_id           INTEGER PRIMARY KEY,
+  object_id                  VARCHAR2(64)
+);
+
+-------------------------------------------------------------------------------
+-- EPersonGroup2WorkspaceItem table
+-------------------------------------------------------------------------------
+
+CREATE TABLE EPersonGroup2WorkspaceItem 
+(
+  id INTEGER PRIMARY KEY,
+  eperson_group_id INTEGER REFERENCES EPersonGroup(eperson_group_id),
+  workspace_item_id INTEGER REFERENCES WorkspaceItem(workspace_item_id)
+);
+
+------------------------------------------------------------
+-- Browse subsystem tables and views
+------------------------------------------------------------
+
+-------------------------------------------------------
+--  Communities2Item table
+-------------------------------------------------------
+CREATE TABLE Communities2Item
+(
+   id                      INTEGER PRIMARY KEY,
+   community_id            INTEGER REFERENCES Community(community_id),
+   item_id                 INTEGER REFERENCES Item(item_id)
+);
+
+-------------------------------------------------------
+-- Community2Item view
+------------------------------------------------------
+CREATE VIEW Community2Item as
+SELECT Community2Collection.community_id, Collection2Item.item_id 
+FROM Community2Collection, Collection2Item
+WHERE Collection2Item.collection_id   = Community2Collection.collection_id
+;
+
+-- Indexing browse tables update/re-index performance
+CREATE INDEX Communities2Item_item_id_idx ON Communities2Item( item_id );
+
+-------------------------------------------------------
+--  ItemsByAuthor table
+-------------------------------------------------------
+CREATE TABLE ItemsByAuthor
+(
+   items_by_author_id INTEGER PRIMARY KEY,
+   item_id            INTEGER REFERENCES Item(item_id),
+   author             VARCHAR2(2000),
+   sort_author        VARCHAR2(2000)
+);
+
+-- index by sort_author, of course!
+CREATE INDEX sort_author_idx on ItemsByAuthor(sort_author);
+
+-- Indexing browse tables update/re-index performance
+CREATE INDEX ItemsByAuthor_item_id_idx ON ItemsByAuthor(item_id);
+
+-------------------------------------------------------
+--  CollectionItemsByAuthor view
+-------------------------------------------------------
+CREATE VIEW CollectionItemsByAuthor as
+SELECT Collection2Item.collection_id, ItemsByAuthor.* 
+FROM ItemsByAuthor, Collection2Item
+WHERE ItemsByAuthor.item_id = Collection2Item.item_id
+;
+
+-------------------------------------------------------
+--  CommunityItemsByAuthor view
+-------------------------------------------------------
+CREATE VIEW CommunityItemsByAuthor as
+SELECT Communities2Item.community_id, ItemsByAuthor.* 
+FROM ItemsByAuthor, Communities2Item
+WHERE ItemsByAuthor.item_id = Communities2Item.item_id
+;
+
+----------------------------------------
+-- ItemsByTitle table
+----------------------------------------
+CREATE TABLE ItemsByTitle
+(
+   items_by_title_id  INTEGER PRIMARY KEY,
+   item_id            INTEGER REFERENCES Item(item_id),
+   title              VARCHAR2(2000),
+   sort_title         VARCHAR2(2000)
+);
+
+-- index by the sort_title
+CREATE INDEX sort_title_idx on ItemsByTitle(sort_title);
+
+-- Indexing browse tables update/re-index performance
+CREATE INDEX ItemsByTitle_item_id_idx ON ItemsByTitle(item_id);
+
+-------------------------------------------------------
+--  CollectionItemsByTitle view
+-------------------------------------------------------
+CREATE VIEW CollectionItemsByTitle as
+SELECT Collection2Item.collection_id, ItemsByTitle.* 
+FROM ItemsByTitle, Collection2Item
+WHERE ItemsByTitle.item_id = Collection2Item.item_id
+;
+
+-------------------------------------------------------
+--  CommunityItemsByTitle view
+-------------------------------------------------------
+CREATE VIEW CommunityItemsByTitle as
+SELECT Communities2Item.community_id, ItemsByTitle.* 
+FROM ItemsByTitle, Communities2Item
+WHERE ItemsByTitle.item_id = Communities2Item.item_id
+;
+
+-------------------------------------------------------
+--  ItemsByDate table
+-------------------------------------------------------
+CREATE TABLE ItemsByDate
+(
+   items_by_date_id   INTEGER PRIMARY KEY,
+   item_id            INTEGER REFERENCES Item(item_id),
+   date_issued        VARCHAR2(2000)
+);
+
+-- sort by date
+CREATE INDEX date_issued_idx on ItemsByDate(date_issued);
+
+-- Indexing browse tables update/re-index performance
+CREATE INDEX ItemsByDate_item_id_idx ON ItemsByDate(item_id);
+
+-------------------------------------------------------
+--  CollectionItemsByDate view
+-------------------------------------------------------
+CREATE VIEW CollectionItemsByDate as
+SELECT Collection2Item.collection_id, ItemsByDate.* 
+FROM ItemsByDate, Collection2Item
+WHERE ItemsByDate.item_id = Collection2Item.item_id
+;
+
+-------------------------------------------------------
+--  CommunityItemsByDate view
+-------------------------------------------------------
+CREATE VIEW CommunityItemsByDate as
+SELECT Communities2Item.community_id, ItemsByDate.* 
+FROM ItemsByDate, Communities2Item
+WHERE ItemsByDate.item_id = Communities2Item.item_id
+;
+
+-------------------------------------------------------
+--  ItemsByDateAccessioned table
+-------------------------------------------------------
+CREATE TABLE ItemsByDateAccessioned
+(
+   items_by_date_accessioned_id  INTEGER PRIMARY KEY,
+   item_id                       INTEGER REFERENCES Item(item_id),
+   date_accessioned              VARCHAR2(2000)
+);
+
+-- Indexing browse tables update/re-index performance
+CREATE INDEX ItemsByDateAcc_item_id_idx ON ItemsByDateAccessioned(item_id);
+
+-------------------------------------------------------
+--  CollectionItemsByDateAccession view
+-------------------------------------------------------
+CREATE VIEW CollectionItemsByDateAccession as
+SELECT Collection2Item.collection_id, ItemsByDateAccessioned.* 
+FROM ItemsByDateAccessioned, Collection2Item
+WHERE ItemsByDateAccessioned.item_id = Collection2Item.item_id
+;
+
+-------------------------------------------------------
+--  CommunityItemsByDateAccession view
+-------------------------------------------------------
+CREATE VIEW CommunityItemsByDateAccession as
+SELECT Communities2Item.community_id, ItemsByDateAccessioned.* 
+FROM ItemsByDateAccessioned, Communities2Item
+WHERE ItemsByDateAccessioned.item_id = Communities2Item.item_id
+;
+
+
+-------------------------------------------------------
+--  ItemsBySubject table
+-------------------------------------------------------
+CREATE TABLE ItemsBySubject
+(
+   items_by_subject_id INTEGER PRIMARY KEY,
+   item_id             INTEGER REFERENCES Item(item_id),
+   subject             VARCHAR2(2000),
+   sort_subject        VARCHAR2(2000)
+);
+
+-- index by sort_subject
+CREATE INDEX sort_subject_idx on ItemsBySubject(sort_subject);
+
+-------------------------------------------------------
+--  CollectionItemsBySubject view
+-------------------------------------------------------
+CREATE VIEW CollectionItemsBySubject as
+SELECT Collection2Item.collection_id, ItemsBySubject.* 
+FROM ItemsBySubject, Collection2Item
+WHERE ItemsBySubject.item_id = Collection2Item.item_id
+;
+
+-------------------------------------------------------
+--  CommunityItemsBySubject view
+-------------------------------------------------------
+CREATE VIEW CommunityItemsBySubject as
+SELECT Communities2Item.community_id, ItemsBySubject.* 
+FROM ItemsBySubject, Communities2Item
+WHERE ItemsBySubject.item_id = Communities2Item.item_id
+;
+
+-------------------------------------------------------
+--  Create 'special' groups, for anonymous access
+--  and administrators
+-------------------------------------------------------
+-- We don't use getnextid() for 'anonymous' since the sequences start at '1'
+INSERT INTO epersongroup VALUES(0, 'Anonymous');
+INSERT INTO epersongroup VALUES(1, 'Administrator');
+
+
+-------------------------------------------------------
+-- Create the checksum checker tables
+-------------------------------------------------------
+-- list of the possible results as determined
+-- by the system or an administrator
+
+CREATE TABLE checksum_results
+(
+    result_code VARCHAR(64) PRIMARY KEY,
+    result_description VARCHAR2(2000)
+);
+
+
+-- This table has a one-to-one relationship
+-- with the bitstream table. A row will be inserted
+-- every time a row is inserted into the bitstream table, and
+-- that row will be updated every time the checksum is
+-- re-calculated.
+
+CREATE TABLE most_recent_checksum 
+(
+    bitstream_id INTEGER PRIMARY KEY REFERENCES bitstream(bitstream_id),
+    to_be_processed NUMBER(1) NOT NULL,
+    expected_checksum VARCHAR(64) NOT NULL,
+    current_checksum VARCHAR(64) NOT NULL,
+    last_process_start_date TIMESTAMP NOT NULL,
+    last_process_end_date TIMESTAMP NOT NULL,
+    checksum_algorithm VARCHAR(64) NOT NULL,
+    matched_prev_checksum NUMBER(1) NOT NULL,
+    result VARCHAR(64) REFERENCES checksum_results(result_code)
+);
+
+-- A row will be inserted into this table every
+-- time a checksum is re-calculated.
+
+CREATE SEQUENCE checksum_history_seq;
+
+CREATE TABLE checksum_history 
+(
+    check_id INTEGER PRIMARY KEY,
+    bitstream_id INTEGER,
+    process_start_date TIMESTAMP,
+    process_end_date TIMESTAMP,
+    checksum_expected VARCHAR(64),
+    checksum_calculated VARCHAR(64),
+    result VARCHAR(64) REFERENCES checksum_results(result_code)
+);
+
+
+-- this will insert into the result code
+-- the initial results that should be 
+-- possible
+
+insert into checksum_results
+values
+( 
+    'INVALID_HISTORY',
+    'Install of the cheksum checking code do not consider this history as valid' 
+);
+
+insert into checksum_results
+values
+( 
+    'BITSTREAM_NOT_FOUND',
+    'The bitstream could not be found' 
+);
+
+insert into checksum_results
+values
+( 
+    'CHECKSUM_MATCH',
+    'Current checksum matched previous checksum' 
+);
+
+insert into checksum_results
+values
+(
+    'CHECKSUM_NO_MATCH',
+    'Current checksum does not match previous checksum' 
+);
+
+insert into checksum_results
+values
+( 
+    'CHECKSUM_PREV_NOT_FOUND',
+    'Previous checksum was not found: no comparison possible' 
+);
+
+insert into checksum_results
+values
+( 
+    'BITSTREAM_INFO_NOT_FOUND',
+    'Bitstream info not found' 
+);
+
+insert into checksum_results
+values
+( 
+    'CHECKSUM_ALGORITHM_INVALID',
+    'Invalid checksum algorithm' 
+);
+insert into checksum_results
+values
+( 
+    'BITSTREAM_NOT_PROCESSED',
+    'Bitstream marked to_be_processed=false' 
+);
+insert into checksum_results
+values
+( 
+    'BITSTREAM_MARKED_DELETED',
+    'Bitstream marked deleted in bitstream table' 
+);

dspace/etc/oracle/database_schema_12-13.sql

@@ -0,0 +1,88 @@
+--
+-- database_schema_12-13.sql
+--
+-- Version: $Revision$
+--
+-- Date:    $Date$
+--
+-- Copyright (c) 2002, 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.
+
+--
+-- SQL commands to upgrade the database schema of a live DSpace 1.2 or 1.2.x
+-- to the DSpace 1.3 database schema
+-- 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+
+CREATE SEQUENCE epersongroup2workspaceitem_seq;
+
+-------------------------------------------------------------------------------
+-- create the new EPersonGroup2WorkspaceItem table
+-------------------------------------------------------------------------------
+
+CREATE TABLE EPersonGroup2WorkspaceItem 
+(
+  id INTEGER PRIMARY KEY,
+  eperson_group_id INTEGER REFERENCES EPersonGroup(eperson_group_id),
+  workspace_item_id INTEGER REFERENCES WorkspaceItem(workspace_item_id)
+);
+
+-------------------------------------------------------------------------------
+-- modification to collection table to support being able to change the
+-- submitter and collection admin group names
+-------------------------------------------------------------------------------
+ALTER TABLE collection ADD submitter INTEGER REFERENCES EPersonGroup(eperson_group_id);
+
+ALTER TABLE collection ADD admin INTEGER REFERENCES EPersonGroup(eperson_group_id);
+
+ALTER TABLE eperson ADD netid VARCHAR2(64) UNIQUE;
+
+-------------------------------------------------------------------------------
+-- Additional indices for performance
+-------------------------------------------------------------------------------
+
+-- index by resource id and resource type id
+CREATE INDEX handle_resource_id_and_type_idx ON handle(resource_id, resource_type_id);
+
+-- Indexing browse tables update/re-index performance
+CREATE INDEX Communities2Item_item_id_idx ON Communities2Item( item_id );
+CREATE INDEX ItemsByAuthor_item_id_idx ON ItemsByAuthor(item_id);
+CREATE INDEX ItemsByTitle_item_id_idx ON ItemsByTitle(item_id);
+CREATE INDEX ItemsByDate_item_id_idx ON ItemsByDate(item_id);
+CREATE INDEX ItemsByDateAccessioned_item_id_idx ON ItemsByDateAccessioned(item_id);
+
+-- Improve mapping tables
+CREATE INDEX Community2Collection_community_id_idx ON Community2Collection(community_id);
+CREATE INDEX Community2Collection_collection_id_idx ON Community2Collection(collection_id);
+CREATE INDEX Collection2Item_item_id_idx ON Collection2Item( item_id );

dspace/etc/oracle/database_schema_13-14.sql

@@ -0,0 +1,381 @@
+--
+-- database_schema_13-14.sql
+--
+-- Version: $Revision$
+--
+-- Date:    $Date$
+--
+-- Copyright (c) 2002, 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.
+
+--
+-- SQL commands to upgrade the database schema of a live DSpace 1.3 or 1.3.x
+-- to the DSpace 1.4 database schema
+-- 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-------------------------------------------------------------------------------
+-- Sequences for Group within Group feature
+-------------------------------------------------------------------------------
+CREATE SEQUENCE group2group_seq;
+CREATE SEQUENCE group2groupcache_seq;
+CREATE SEQUENCE tasklistitem_seq;
+
+------------------------------------------------------
+-- Group2Group table, records group membership in other groups
+------------------------------------------------------
+CREATE TABLE Group2Group
+(
+  id        INTEGER PRIMARY KEY,
+  parent_id INTEGER REFERENCES EPersonGroup(eperson_group_id),
+  child_id  INTEGER REFERENCES EPersonGroup(eperson_group_id)
+);
+
+------------------------------------------------------
+-- Group2GroupCache table, is the 'unwound' hierarchy in
+-- Group2Group.  It explicitly names every parent child
+-- relationship, even with nested groups.  For example,
+-- If Group2Group lists B is a child of A and C is a child of B,
+-- this table will have entries for parent(A,B), and parent(B,C)
+-- AND parent(A,C) so that all of the child groups of A can be
+-- looked up in a single simple query
+------------------------------------------------------
+CREATE TABLE Group2GroupCache
+(
+  id        INTEGER PRIMARY KEY,
+  parent_id INTEGER REFERENCES EPersonGroup(eperson_group_id),
+  child_id  INTEGER REFERENCES EPersonGroup(eperson_group_id)
+);
+
+
+-------------------------------------------------------
+-- New Metadata Tables and Sequences
+-------------------------------------------------------
+CREATE SEQUENCE metadataschemaregistry_seq;
+CREATE SEQUENCE metadatafieldregistry_seq;
+CREATE SEQUENCE metadatavalue_seq;
+
+-- MetadataSchemaRegistry table
+CREATE TABLE MetadataSchemaRegistry
+(
+  metadata_schema_id INTEGER PRIMARY KEY,
+  namespace          VARCHAR(256) UNIQUE,
+  short_id           VARCHAR(32)
+);
+
+-- MetadataFieldRegistry table
+CREATE TABLE MetadataFieldRegistry
+(
+  metadata_field_id   INTEGER PRIMARY KEY,
+  metadata_schema_id  INTEGER NOT NULL REFERENCES MetadataSchemaRegistry(metadata_schema_id),
+  element             VARCHAR(64),
+  qualifier           VARCHAR(64),
+  scope_note          VARCHAR2(2000)
+);
+
+-- MetadataValue table
+CREATE TABLE MetadataValue
+(
+  metadata_value_id  INTEGER PRIMARY KEY,
+  item_id            INTEGER REFERENCES Item(item_id),
+  metadata_field_id  INTEGER REFERENCES MetadataFieldRegistry(metadata_field_id),
+  text_value         VARCHAR2(2000),
+  text_lang          VARCHAR(24),
+  place              INTEGER
+);
+
+-- Create the DC schema
+INSERT INTO MetadataSchemaRegistry VALUES (1,'http://dublincore.org/documents/dcmi-terms/','dc');
+
+-- Migrate the existing DCTypes into the new metadata field registry
+INSERT INTO MetadataFieldRegistry
+  (metadata_schema_id, metadata_field_id, element, qualifier, scope_note)
+  SELECT '1' AS metadata_schema_id, dc_type_id, element, 
+     qualifier, scope_note FROM dctyperegistry;
+
+-- Copy the DCValues into the new MetadataValue table
+INSERT INTO MetadataValue (item_id, metadata_field_id, text_value, text_lang, place)
+  SELECT item_id, dc_type_id, text_value, text_lang, place FROM dcvalue;
+  
+DROP TABLE dcvalue;
+CREATE VIEW dcvalue AS
+  SELECT MetadataValue.metadata_value_id AS "dc_value_id", MetadataValue.item_id, 
+    MetadataValue.metadata_field_id AS "dc_type_id", MetadataValue.text_value, 
+    MetadataValue.text_lang, MetadataValue.place  
+  FROM MetadataValue, MetadataFieldRegistry
+  WHERE MetadataValue.metadata_field_id = MetadataFieldRegistry.metadata_field_id
+  AND MetadataFieldRegistry.metadata_schema_id = 1;
+
+SELECT setval('metadatafieldregistry_seq', max(metadata_field_id)) FROM metadatafieldregistry;
+SELECT setval('metadatavalue_seq', max(metadata_value_id)) FROM metadatavalue;
+SELECT setval('metadataschemaregistry_seq', max(metadata_schema_id)) FROM metadataschemaregistry;
+
+DROP TABLE dctyperegistry;
+
+-- create indexes for the metadata tables
+CREATE INDEX metadatavalue_item_idx ON MetadataValue(item_id);
+CREATE INDEX metadatavalue_item_idx2 ON MetadataValue(item_id,metadata_field_id);
+CREATE INDEX metadatafield_schema_idx ON MetadataFieldRegistry(metadata_schema_id);
+
+
+-------------------------------------------------------
+-- Create the checksum checker tables
+-------------------------------------------------------
+-- list of the possible results as determined
+-- by the system or an administrator
+
+CREATE TABLE checksum_results
+(
+    result_code VARCHAR PRIMARY KEY,
+    result_description VARCHAR2(2000)
+);
+
+
+-- This table has a one-to-one relationship
+-- with the bitstream table. A row will be inserted
+-- every time a row is inserted into the bitstream table, and
+-- that row will be updated every time the checksum is
+-- re-calculated.
+
+CREATE TABLE most_recent_checksum 
+(
+    bitstream_id INTEGER PRIMARY KEY,
+    to_be_processed NUMBER(1) NOT NULL,
+    expected_checksum VARCHAR(64) NOT NULL,
+    current_checksum VARCHAR(64) NOT NULL,
+    last_process_start_date TIMESTAMP NOT NULL,
+    last_process_end_date TIMESTAMP NOT NULL,
+    checksum_algorithm VARCHAR(64) NOT NULL,
+    matched_prev_checksum NUMBER(1) NOT NULL,
+    result VARCHAR(64) REFERENCES checksum_results(result_code)
+);
+
+
+-- A row will be inserted into this table every
+-- time a checksum is re-calculated.
+
+CREATE SEQUENCE checksum_history_seq;
+
+CREATE TABLE checksum_history 
+(
+    check_id INTEGER PRIMARY KEY,
+    bitstream_id INTEGER,
+    process_start_date TIMESTAMP,
+    process_end_date TIMESTAMP,
+    checksum_expected VARCHAR(64),
+    checksum_calculated VARCHAR(64),
+    result VARCHAR(64) REFERENCES checksum_results(result_code)
+);
+
+-- this will insert into the result code
+-- the initial results 
+
+insert into checksum_results
+values
+( 
+    'INVALID_HISTORY',
+    'Install of the cheksum checking code do not consider this history as valid' 
+);
+
+insert into checksum_results
+values
+( 
+    'BITSTREAM_NOT_FOUND',
+    'The bitstream could not be found' 
+);
+
+insert into checksum_results
+values
+( 
+    'CHECKSUM_MATCH',
+    'Current checksum matched previous checksum' 
+);
+
+insert into checksum_results
+values
+(
+    'CHECKSUM_NO_MATCH',
+    'Current checksum does not match previous checksum' 
+);
+
+insert into checksum_results
+values
+( 
+    'CHECKSUM_PREV_NOT_FOUND',
+    'Previous checksum was not found: no comparison possible' 
+);
+
+insert into checksum_results
+values
+( 
+    'BITSTREAM_INFO_NOT_FOUND',
+    'Bitstream info not found' 
+);
+
+insert into checksum_results
+values
+( 
+    'CHECKSUM_ALGORITHM_INVALID',
+    'Invalid checksum algorithm' 
+);
+insert into checksum_results
+values
+( 
+    'BITSTREAM_NOT_PROCESSED',
+    'Bitstream marked to_be_processed=false' 
+);
+insert into checksum_results
+values
+( 
+    'BITSTREAM_MARKED_DELETED',
+    'Bitstream marked deleted in bitstream table' 
+);
+
+-- this will insert into the most recent checksum
+-- on install all existing bitstreams
+-- setting all bitstreams already set as 
+-- deleted to not be processed
+
+insert into most_recent_checksum 
+(
+    bitstream_id,  
+    to_be_processed,
+    expected_checksum,
+    current_checksum,
+    last_process_start_date,
+    last_process_end_date,
+    checksum_algorithm,
+    matched_prev_checksum
+)
+select 
+    bitstream.bitstream_id, 
+    '1', 
+    CASE WHEN bitstream.checksum IS NULL THEN '' ELSE bitstream.checksum END, 
+    CASE WHEN bitstream.checksum IS NULL THEN '' ELSE bitstream.checksum END, 
+    date_trunc('milliseconds', now()),
+    date_trunc('milliseconds', now()),
+    CASE WHEN bitstream.checksum_algorithm IS NULL THEN 'MD5' ELSE bitstream.checksum_algorithm END,
+    '1'
+from bitstream; 
+
+-- Update all the deleted checksums
+-- to not be checked
+-- because they have since been
+-- deleted from the system
+
+update most_recent_checksum
+set to_be_processed = false
+where most_recent_checksum.bitstream_id in (
+select bitstream_id
+from bitstream where deleted = '1' );
+
+-- this will insert into history table
+-- for the initial start 
+-- we want to tell the users to disregard the initial
+-- inserts into the checksum history table
+
+insert into checksum_history
+(
+    bitstream_id,
+    process_start_date,
+    process_end_date,
+    checksum_expected,
+    checksum_calculated
+)
+select most_recent_checksum.bitstream_id,
+     most_recent_checksum.last_process_end_date,
+     date_trunc('milliseconds', now()),
+      most_recent_checksum.expected_checksum,
+      most_recent_checksum.expected_checksum;
+
+-- update the history to indicate that this was 
+-- the first time the software was installed
+update checksum_history 
+set result = 'INVALID_HISTORY';  
+
+------------------------------------------------------
+-- Drop unique community name constraint
+-- 
+-- FIXME:  Needs testing; the constraint name is not 
+-- guaranteed to be the same as below.  This step may
+-- need to be performed by hand.
+------------------------------------------------------
+ALTER TABLE community DROP CONSTRAINT community_name_key;
+
+
+-------------------------------------------------------
+-- Table and views for 'browse by subject' functionality
+-------------------------------------------------------
+CREATE SEQUENCE itemsbysubject_seq;
+
+-------------------------------------------------------
+--  ItemsBySubject table
+-------------------------------------------------------
+CREATE TABLE ItemsBySubject
+(
+   items_by_subject_id INTEGER PRIMARY KEY,
+   item_id             INTEGER REFERENCES Item(item_id),
+   subject             VARCHAR2(2000),
+   sort_subject        VARCHAR2(2000)
+);
+
+-- index by sort_subject
+CREATE INDEX sort_subject_idx on ItemsBySubject(sort_subject);
+
+-------------------------------------------------------
+--  CollectionItemsBySubject view
+-------------------------------------------------------
+CREATE VIEW CollectionItemsBySubject as
+SELECT Collection2Item.collection_id, ItemsBySubject.* 
+FROM ItemsBySubject, Collection2Item
+WHERE ItemsBySubject.item_id = Collection2Item.item_id
+;
+
+-------------------------------------------------------
+--  CommunityItemsBySubject view
+-------------------------------------------------------
+CREATE VIEW CommunityItemsBySubject as
+SELECT Communities2Item.community_id, ItemsBySubject.* 
+FROM ItemsBySubject, Communities2Item
+WHERE ItemsBySubject.item_id = Communities2Item.item_id
+;
+
+-------------------------------------------------------
+--  TasklistItem table
+-------------------------------------------------------
+CREATE TABLE TasklistItem
+(
+  tasklist_id	INTEGER PRIMARY KEY,
+  eperson_id	INTEGER REFERENCES EPerson(eperson_id),
+  workflow_id	INTEGER REFERENCES WorkflowItem(workflow_id)
+);

dspace/etc/oracle/update-sequences.sql

@@ -0,0 +1,93 @@
+--
+-- update-sequences.sql
+--
+-- Version: $Revision$
+--
+-- Date:    $Date$
+--
+-- Copyright (c) 2002, 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.
+
+-- SQL code to update the ID (primary key) generating sequences, if some
+-- import operation has set explicit IDs.
+--
+-- Sequences are used to generate IDs for new rows in the database.  If a
+-- bulk import operation, such as an SQL dump, specifies primary keys for
+-- imported data explicitly, the sequences are out of sync and need updating.
+-- This SQL code does just that.
+--
+-- This should rarely be needed; any bulk import should be performed using the
+-- org.dspace.content API which is safe to use concurrently and in multiple
+-- JVMs.  The SQL code below will typically only be required after a direct
+-- SQL data dump from a backup or somesuch.
+ 
+
+-- There should be one of these calls for every ID sequence defined in
+-- database_schema.sql.
+
+-- depends on being run from sqlplus with incseq.sql in the current path
+-- you can find incseq.sql at: http://akadia.com/services/scripts/incseq.sql
+
+@incseq.sql bitstreamformatregistry_seq bitstreamformatregistry bitstream_format_id
+@incseq.sql fileextension_seq fileextension file_extension_id
+@incseq.sql bitstream_seq bitstream bitstream_id
+@incseq.sql eperson_seq eperson eperson_id
+@incseq.sql epersongroup_seq epersongroup eperson_group_id
+@incseq.sql group2group_seq group2group id
+@incseq.sql group2groupcache group2groupcache id
+@incseq.sql item_seq item item_id
+@incseq.sql bundle_seq bundle bundle_id
+@incseq.sql item2bundle_seq item2bundle id
+@incseq.sql bundle2bitstream_seq bundle2bitstream id
+@incseq.sql dctyperegistry_seq dctyperegistry dc_type_id
+@incseq.sql dcvalue_seq dcvalue dc_value_id
+@incseq.sql community_seq community community_id
+@incseq.sql community2community_seq community2community id
+@incseq.sql collection_seq collection collection_id
+@incseq.sql community2collection_seq community2collection id
+@incseq.sql collection2item_seq collection2item id
+@incseq.sql resourcepolicy_seq resourcepolicy policy_id
+@incseq.sql epersongroup2eperson_seq epersongroup2eperson id
+@incseq.sql handle_seq handle handle_id
+@incseq.sql workspaceitem_seq workspaceitem workspace_item_id
+@incseq.sql workflowitem_seq workflowitem workflow_id
+@incseq.sql tasklistitem_seq tasklistitem tasklist_id
+@incseq.sql registrationdata_seq registrationdata registrationdata_id
+@incseq.sql subscription_seq subscription subscription_id
+@incseq.sql history_seq history history_id
+@incseq.sql historystate_seq historystate history_state_id
+@incseq.sql communities2item_seq communities2item id
+@incseq.sql itemsbyauthor_seq itemsbyauthor items_by_author_id
+@incseq.sql itemsbytitle_seq itemsbytitle items_by_title_id
+@incseq.sql itemsbydate_seq itemsbydate items_by_date_id
+@incseq.sql itemsbydateaccessioned_seq itemsbydateaccessioned items_by_date_accessioned_id
+@incseq.sql epersongroup2workspaceitem_seq epersongroup2workspaceitem id

dspace/etc/oracle/updateseq.sql

@@ -0,0 +1,36 @@
+-- #############################################################################################
+--
+-- %Purpose: Set a sequence to the max value of a given attribute
+--
+-- #############################################################################################
+--
+-- Paramters:
+--   1: sequence name
+--   2: table name
+--   3: attribute name
+--
+-- Sample usage:
+--   @updateseq-oracle.sql my_sequence my_table my_attribute
+--
+--------------------------------------------------------------------------------
+--
+SET SERVEROUTPUT ON SIZE 1000000;
+--
+DECLARE
+  dummy NUMBER := 0;
+  curr  NUMBER := 0;
+BEGIN
+  --
+  --SELECT &1..nextval INTO dummy FROM dual;
+  --dbms_output.put('start with next value=' || dummy);
+  --
+  SELECT max(&3) INTO curr FROM &2;
+
+  DROP SEQUENCE &1;
+  CREATE SEQUENCE &1 START WITH curr;
+
+  --
+  dbms_output.put_line(', end=' || dummy);
+  --
+END;
+/

dspace/etc/update-sequences.sql

@@ -60,6 +60,8 @@ SELECT setval('fileextension_seq', max(file_extension_id)) FROM fileextension;
 SELECT setval('bitstream_seq', max(bitstream_id)) FROM bitstream;
 SELECT setval('eperson_seq', max(eperson_id)) FROM eperson;
 SELECT setval('epersongroup_seq', max(eperson_group_id)) FROM epersongroup;
+SELECT setval('group2group_seq', max(id)) FROM group2group;
+SELECT setval('group2groupcache_seq', max(id)) FROM group2groupcache;
 SELECT setval('item_seq', max(item_id)) FROM item;
 SELECT setval('bundle_seq', max(bundle_id)) FROM bundle;
 SELECT setval('item2bundle_seq', max(id)) FROM item2bundle;
@@ -67,6 +69,7 @@ SELECT setval('bundle2bitstream_seq', max(id)) FROM bundle2bitstream;
 SELECT setval('dctyperegistry_seq', max(dc_type_id)) FROM dctyperegistry;
 SELECT setval('dcvalue_seq', max(dc_value_id)) FROM dcvalue;
 SELECT setval('community_seq', max(community_id)) FROM community;
+SELECT setval('community2community_seq', max(id)) FROM community2community;
 SELECT setval('collection_seq', max(collection_id)) FROM collection;
 SELECT setval('community2collection_seq', max(id)) FROM community2collection;
 SELECT setval('collection2item_seq', max(id)) FROM collection2item;
@@ -80,7 +83,12 @@ SELECT setval('registrationdata_seq', max(registrationdata_id)) FROM registratio
 SELECT setval('subscription_seq', max(subscription_id)) FROM subscription;
 SELECT setval('history_seq', max(history_id)) FROM history;
 SELECT setval('historystate_seq', max(history_state_id)) FROM historystate;
+SELECT setval('communities2item_seq', max(id)) FROM communities2item;
 SELECT setval('itemsbyauthor_seq', max(items_by_author_id)) FROM itemsbyauthor;
 SELECT setval('itemsbytitle_seq', max(items_by_title_id)) FROM itemsbytitle;
 SELECT setval('itemsbydate_seq', max(items_by_date_id)) FROM itemsbydate;
 SELECT setval('itemsbydateaccessioned_seq', max(items_by_date_accessioned_id)) FROM itemsbydateaccessioned;
+SELECT setval('epersongroup2workspaceitem_seq', max(id)) FROM epersongroup2workspaceitem;
+SELECT setval('metadatafieldregistry_seq', max(metadata_field_id)) FROM metadatafieldregistry;
+SELECT setval('metadatavalue_seq', max(metadata_value_id)) FROM metadatavalue;
+SELECT setval('metadataschemaregistry_seq', max(metadata_schema_id)) FROM metadataschemaregistry;

dspace/jsp/WEB-INF/dspace-tags.tld

@@ -55,12 +55,16 @@
   <info>DSpace JSP tags</info>
 
   <!--
-    - dspace:page tag - main tag for laying out pages.  If you specify a
+    - dspace:layout tag - main tag for laying out pages.  If you specify a
     - that you want a "link" or "nolink" location bar, you can specify a
     - "parent" page using "parent" and "parentlink".  Otherwise, the page is
     - treated as a "top-level" page directly under the home page.
     -
-    - title   - title of the page
+    - Specify only ONE of 'title' or 'titlekey'.
+    - Specify only ONE of 'parenttitle' or 'parenttitlekey'.
+    -
+    - title    - title of the page in text.  For backwards compatibility.
+    - titlekey - message key from i18n dictionary file for page title
     - navbar  - type of navbar to be used, or "off".  The navbar is loaded from
     -           layout/navbar_XXX.jsp.  If this parameter is omitted, "default"
     -           is used (i.e. layout/navbar-default.jsp).
@@ -71,10 +75,14 @@
     -                 nolink - show a location bar with no links
     -                 auto   - show community/collection from request (default)
     - parenttitle  - title of "parent" page, that is, the page one up in the
-    -                site hierarchy.  
+    -                site hierarchy.
+    - parenttitlekey  - message key from i18n dictionary of "parent" page,
+    -                   that is, the page one up in the site hierarchy.
     - parentlink - path to parent page - must be specified if "parent" specified
     - style   - page layout style.  Default is "default".  Page is loaded
     -            from layout/header-XXX.jsp and layout/footer-XXX.jsp.
+    - noache  - if true, set apprpropriate headers to stop browsers caching
+    -           the page (and possible back-button-related mishaps)
     -->
   <tag>
     <name>layout</name>
@@ -82,7 +90,12 @@
     <info>Lays out an HTML page</info>
     <attribute>
       <name>title</name>
-      <required>true</required>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>titlekey</name>
+      <required>false</required>
       <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
@@ -100,6 +113,11 @@
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
     </attribute>
+    <attribute>
+      <name>parenttitlekey</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
     <attribute>
       <name>parentlink</name>
       <required>false</required>
@@ -110,6 +128,16 @@
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
     </attribute>
+    <attribute>
+      <name>nocache</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>feedData</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
   </tag>
 
   <tag>
@@ -143,10 +171,11 @@
     <name>include</name>
     <tagclass>org.dspace.app.webui.jsptag.IncludeTag</tagclass>
     <info>
-      Simple tag, similar to jsp:include, that will use the localised or
-      locally modified version of a JSP if one is installed.  e.g. when
-      including "/foo/bar.jsp", this tag will include "/local/foo/bar/jsp"
-      instead if it exists, falling back to "/foo/bar.jsp".
+      Obsolete, simple tag, similar to jsp:include.  In versions prior
+      to DSpace 1.2, this tag would use the locally modified version of a JSP
+      if one was installed in jsp/local.  As of 1.2, the build process now
+      performs this function, however this tag is left in for backwards
+      compatibility.
     </info>
     <attribute>
       <name>page</name>
@@ -182,7 +211,20 @@
       <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-
+ 
+  <tag>
+    <name>item-preview</name>
+    <tagclass>org.dspace.app.webui.jsptag.ItemPreviewTag</tagclass>
+    <info>
+      Tag for displaying an item preview image.  "item" must always be an
+      org.dspace.content.Item
+    </info>
+    <attribute>
+      <name>item</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
 
   <tag>
     <name>itemlist</name>
@@ -244,10 +286,10 @@
       a popup link is pressed.  If Javascript is not available, a simple
       HTML link is used as a fallback.  The contents of the tag are used as
       the text of the link.
-      
+
       Additionally, this will link to the "local" version of the URL, if a
       locally modified version exists.
-      
+
       FIXME: Currently supports a single popup window at a hardcoded size;
       extra attributes could be added at a later date (e.g. name, width, height)
     </info>
@@ -257,7 +299,66 @@
       <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-    
+
+  <tag>
+    <name>selecteperson</name>
+    <tagclass>org.dspace.app.webui.jsptag.SelectEPersonTag</tagclass>
+    <info>
+      Tag for producing an e-person select widget in a form.  Somewhat
+      analogous to the HTML SELECT element.  An input
+      field is produced with a button which pops up a window from which
+      e-people can be selected.  Selected e-epeople are added to the field
+      in the form.  If the selector is for multiple e-people, a 'remove
+      selected from list' button is also added.
+
+      On any form that has a selecteperson tag (only one allowed per page),
+      you need to include the following Javascript code on all of the submit
+      buttons, to ensure that the e-people IDs are posted and that the popup
+      window is close:
+
+      onclick="javascript:finishEPerson();"
+    </info>
+    <attribute>
+      <name>multiple</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>selected</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>selectgroup</name>
+    <tagclass>org.dspace.app.webui.jsptag.SelectGroupTag</tagclass>
+    <info>
+      Tag for producing a Group select widget in a form.  Somewhat
+      analogous to the HTML SELECT element.  An input
+      field is produced with a button which pops up a window from which
+      groups can be selected.  Selected groups are added to the field
+      in the form.  If the selector is for multiple groups, a 'remove
+      selected from list' button is also added.
+
+      On any form that has a selectgroup tag (only one allowed per page),
+      you need to include the following Javascript code on all of the submit
+      buttons, to ensure that the e-people IDs are posted and that the popup
+      window is close:
+
+      onclick="javascript:finishGroup();"
+    </info>
+    <attribute>
+      <name>multiple</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>selected</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
 
   <tag>
     <name>sfxlink</name>
@@ -272,5 +373,47 @@
       <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
+  
+  
+    
+  
+  <tag>
+    <name>controlledvocabulary</name>
+    <tagclass>org.dspace.app.webui.jsptag.ControlledVocabularyTag</tagclass>
+    <bodycontent>empty</bodycontent>
+    <info>
+    	Lays out a html tree with a set of controlled vocabularies.
+    	This tag receives 3 possible parameters:
+    		- filter
+    			A filter specification to prune branches of the loaded vocabularies
+    		- allowMultipleSelection
+    			Specifies if we want to be able the select multiple terms
+    			from the taxonomy. This will diplay checkboxes close to the 
+    			vocabulary terms.
+    		- vocabulary
+    			The name of the vocabulary to be displayed. If no vocabulary
+    			is provided, all existing taxonomies will be rendered and 
+    			displayed.	
+    </info>
+
+   <attribute>
+      <name>filter</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>    
+
+   <attribute>
+      <name>allowMultipleSelection</name>
+      <required>no</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>    
+
+   <attribute>
+      <name>vocabulary</name>
+      <required>no</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>    	  
+  </tag>  
+
 
 </taglib>

dspace/jsp/WEB-INF/fmt.tld

@@ -0,0 +1,442 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib
+  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+  "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib>
+  <tlib-version>1.0</tlib-version>
+  <jsp-version>1.2</jsp-version>
+  <short-name>fmt</short-name>
+  <uri>http://java.sun.com/jstl/fmt</uri>
+  <display-name>JSTL fmt</display-name>
+  <description>JSTL 1.0 i18n-capable formatting library</description>
+
+  <validator>
+    <validator-class>
+	org.apache.taglibs.standard.tlv.JstlFmtTLV
+    </validator-class>
+    <init-param>
+	<param-name>expressionAttributes</param-name>
+	<param-value>
+            requestEncoding:value
+	    setLocale:value
+	    setLocale:variant
+	    timeZone:value
+	    setTimeZone:value
+	    bundle:basename
+	    bundle:prefix
+            setBundle:basename
+	    message:key
+	    message:bundle
+	    param:value
+	    formatNumber:value
+	    formatNumber:pattern
+            formatNumber:currencyCode
+            formatNumber:currencySymbol
+            formatNumber:groupingUsed
+            formatNumber:maxIntegerDigits
+            formatNumber:minIntegerDigits
+            formatNumber:maxFractionDigits
+            formatNumber:minFractionDigits
+	    parseNumber:value
+	    parseNumber:pattern
+	    parseNumber:parseLocale
+            parseNumber:integerOnly
+	    formatDate:value
+	    formatDate:pattern
+	    formatDate:timeZone
+	    parseDate:value
+	    parseDate:pattern
+	    parseDate:timeZone
+	    parseDate:parseLocale
+	</param-value>
+	<description>
+	    Whitespace-separated list of colon-separated token pairs
+	    describing tag:attribute combinations that accept expressions.
+	    The validator uses this information to determine which
+	    attributes need their syntax validated.
+	</description>
+     </init-param>
+  </validator>
+
+  <tag>
+    <name>requestEncoding</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.fmt.RequestEncodingTag</tag-class>
+    <body-content>empty</body-content>
+    <description>
+        Sets the request character encoding
+    </description>
+    <attribute>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>setLocale</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.fmt.SetLocaleTag</tag-class>
+    <body-content>empty</body-content>
+    <description>
+        Stores the given locale in the locale configuration variable
+    </description>
+    <attribute>
+        <name>value</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>variant</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>timeZone</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.fmt.TimeZoneTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+        Specifies the time zone for any time formatting or parsing actions
+        nested in its body
+    </description>
+    <attribute>
+        <name>value</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>setTimeZone</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.fmt.SetTimeZoneTag</tag-class>
+    <body-content>empty</body-content>
+    <description>
+        Stores the given time zone in the time zone configuration variable
+    </description>
+    <attribute>
+        <name>value</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>bundle</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.fmt.BundleTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+        Loads a resource bundle to be used by its tag body
+    </description>
+    <attribute>
+        <name>basename</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>prefix</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>setBundle</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.fmt.SetBundleTag</tag-class>
+    <body-content>empty</body-content>
+    <description>
+        Loads a resource bundle and stores it in the named scoped variable or
+        the bundle configuration variable
+    </description>
+    <attribute>
+        <name>basename</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>message</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.fmt.MessageTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+        Maps key to localized message and performs parametric replacement
+    </description>
+    <attribute>
+        <name>key</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>bundle</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>param</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.fmt.ParamTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+        Supplies an argument for parametric replacement to a containing
+        &lt;message&gt; tag
+    </description>
+    <attribute>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>formatNumber</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.fmt.FormatNumberTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+        Formats a numeric value as a number, currency, or percentage
+    </description>
+    <attribute>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>type</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>pattern</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>currencyCode</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>currencySymbol</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>groupingUsed</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>maxIntegerDigits</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>minIntegerDigits</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>maxFractionDigits</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>minFractionDigits</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>parseNumber</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.fmt.ParseNumberTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+        Parses the string representation of a number, currency, or percentage
+    </description>
+    <attribute>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>type</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>pattern</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>parseLocale</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>integerOnly</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>formatDate</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.fmt.FormatDateTag</tag-class>
+    <body-content>empty</body-content>
+    <description>
+        Formats a date and/or time using the supplied styles and pattern
+    </description>
+    <attribute>
+        <name>value</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>type</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>dateStyle</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>timeStyle</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>pattern</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>timeZone</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>parseDate</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.fmt.ParseDateTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+        Parses the string representation of a date and/or time
+    </description>
+    <attribute>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>type</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>dateStyle</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>timeStyle</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>pattern</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>timeZone</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>parseLocale</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+</taglib>

dspace/jsp/admin/authorize-item-edit.jsp

@@ -1,347 +0,0 @@
-<%--
-  - authorize_item_edit.jsp
-  -
-  - $Id$
-  -
-  - Version: $Revision$
-  -
-  - Date: $Date$
-  -
-  - Copyright (c) 2002, 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.
-  --%>
-
-
-<%--
-  - Show policies for an item, allowing you to modify, delete
-  -  or add to them
-  -
-  - Attributes:
-  -  item          - Item being modified
-  -  item_policies - ResourcePolicy List of policies for the item
-  -  bundles            - [] of Bundle objects
-  -  bundle_policies    - Map of (ID, List of policies)
-  -  bitstream_policies - Map of (ID, List of policies)
-  -
-  - Returns:
-  -  submit value item_add_policy         to add a policy 
-  -  submit value item_edit_policy        to edit policy for item, bundle, or bitstream
-  -  submit value item_delete_policy      to delete policy for item, bundle, or bitstream
-  -
-  -  submit value bundle_add_policy       add policy
-  -
-  -  submit value bitstream_add_policy    to add a policy
-  -
-  -  policy_id - ID of policy to edit, delete
-  -  item_id
-  -  bitstream_id
-  -  bundle_id
-  --%>
-
-<%@ page contentType="text/html;charset=UTF-8" %>
-
-<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
-
-<%@ page import="java.util.Iterator" %>
-<%@ page import="java.util.List"     %>
-<%@ page import="java.util.Map"      %>
-
-<%@ page import="org.dspace.authorize.ResourcePolicy" %>
-<%@ page import="org.dspace.content.Item"             %>
-<%@ page import="org.dspace.content.Bundle"           %>
-<%@ page import="org.dspace.content.Bitstream"        %>
-<%@ page import="org.dspace.core.Constants"           %>
-<%@ page import="org.dspace.eperson.EPerson"          %>
-<%@ page import="org.dspace.eperson.Group"            %>
-
-<%
-    // get item and list of policies
-    Item item = (Item) request.getAttribute("item");
-    List item_policies =
-        (List) request.getAttribute("item_policies");
-
-    // get bitstreams and corresponding policy lists
-    Bundle [] bundles      = (Bundle [])request.getAttribute("bundles");
-    Map bundle_policies    = (Map)request.getAttribute("bundle_policies"   );
-    Map bitstream_policies = (Map)request.getAttribute("bitstream_policies");
-%>
-
-<dspace:layout title="Edit item policies"
-               navbar="admin"
-               locbar="link"
-               parentlink="/admin"
-               parenttitle="Administer">
-
-    <h1>Policies for Item <%= item.getHandle() %> (ID=<%= item.getID() %>)</h1>
-
-    <P>With this editor you can view and alter the policies of an item,
-    plus alter policies of individual item components:  bundles and bitstreams.
-    Briefly, an item is a container of bundles, and bundles, are containers
-    of bitstreams.  Containers usually have ADD/REMOVE/READ/WRITE policies,
-    while bitstreams only have READ/WRITE policies.
-    </P>
-    <P>You will notice an extra bundle and bitstream for each item, and those
-    contain the license text for the item.
-    </P>
-
-
-    <H3>Item Policies</H3>
-    <P align="center">
-        <form method=POST>
-            <input type="hidden" name="item_id" value="<%=item.getID()%>" >
-            <input type="submit" name="submit_item_add_policy" value="Add New Policy">
-        </form>
-    </p>
-
-
-    <table class="miscTable" align="center">
-        <tr>
-            <th class="oddRowOddCol"><strong>ID</strong></th>
-            <th class="oddRowEvenCol"><strong>Action</strong></th>
-            <th class="oddRowOddCol"><strong>Public</strong></th>
-            <th class="oddRowEvenCol"><strong>EPerson</strong></th>
-            <th class="oddRowOddCol"><strong>Group</strong></th>
-            <th class="oddRowEvenCol"><strong>StartDate</strong></th>
-            <th class="oddRowOddCol"><strong>EndDate</strong></th>
-            <th class="oddRowEvenCol">&nbsp;</th>
-            <th class="oddRowOddCol">&nbsp;</th>
-        </tr>
-
-<%
-    String row = "even";
-    Iterator i = item_policies.iterator();
-
-    while( i.hasNext() )
-    {
-        ResourcePolicy rp = (ResourcePolicy) i.next();
-%>
-        <form method=POST>
-            <tr>
-                <td class="<%= row %>RowOddCol"><%= rp.getID() %></td>
-                <td class="<%= row %>RowEvenCol">
-                    <%= Constants.actionText[rp.getAction()]%>
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    ...  
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <%= (rp.getEPerson() == null ? "..." : rp.getEPerson().getEmail() ) %>  
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <%= (rp.getGroup()   == null ? "..." : rp.getGroup().getName() ) %>  
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <%= (rp.getStartDate() == null ? "..." : "..." ) %>  
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <%= (rp.getEndDate() == null   ? "..." : "..." ) %>  
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="hidden" name="policy_id"     value="<%= rp.getID() %>">
-                    <input type="hidden" name="item_id"       value="<%= item.getID() %>">
-                    <input type="submit" name="submit_item_edit_policy" value="Edit">
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="submit" name="submit_item_delete_policy" value="Delete">
-                </td>
-            </tr>
-        </form>
-<%
-        row = (row.equals("odd") ? "even" : "odd");
-    }
-%>
-    </table>
-<%
-    for( int b = 0; b < bundles.length; b++ )
-    {
-        Bundle myBun = bundles[b];
-        List myPolicies = (List)bundle_policies.get(new Integer(myBun.getID()));
-
-        // display add policy
-        // display bundle header w/ID
-
-%>                
-        <H3>Bundle <%=myBun.getID()%> Policies</H3>
-
-        <P align="center">
-            <form method=POST>
-                <input type="hidden" name="item_id"   value="<%=item.getID()%>" >
-                <input type="hidden" name="bundle_id" value="<%=myBun.getID()%>" >
-                <input type="submit" name="submit_bundle_add_policy" value="Add New Policy">
-            </form>
-        </P>
-        
-
-    <table class="miscTable" align="center">
-        <tr>
-            <th class="oddRowOddCol"><strong>ID</strong></th>
-            <th class="oddRowEvenCol"><strong>Action</strong></th>
-            <th class="oddRowOddCol"><strong>Public</strong></th>
-            <th class="oddRowEvenCol"><strong>EPerson</strong></th>
-            <th class="oddRowOddCol"><strong>Group</strong></th>
-            <th class="oddRowEvenCol"><strong>StartDate</strong></th>
-            <th class="oddRowOddCol"><strong>EndDate</strong></th>
-            <th class="oddRowEvenCol">&nbsp;</th>
-            <th class="oddRowOddCol">&nbsp;</th>
-        </tr>
-
-<%
-    row = "even";
-    i = myPolicies.iterator();
-
-    while( i.hasNext() )
-    {
-        ResourcePolicy rp = (ResourcePolicy) i.next();
-%>
-        <form method=POST>
-            <tr>
-                <td class="<%= row %>RowOddCol"><%= rp.getID() %></td>
-                <td class="<%= row %>RowEvenCol">
-                    <%= Constants.actionText[rp.getAction()]%>
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    ...  
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <%= (rp.getEPerson() == null ? "..." : rp.getEPerson().getEmail() ) %>  
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <%= (rp.getGroup()   == null ? "..." : rp.getGroup().getName() ) %>  
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <%= (rp.getStartDate() == null ? "..." : "..." ) %>  
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <%= (rp.getEndDate() == null   ? "..." : "..." ) %>  
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="hidden" name="policy_id"     value="<%= rp.getID() %>">
-                    <input type="hidden" name="item_id"       value="<%= item.getID() %>">
-                    <input type="hidden" name="bundle_id"     value="<%= myBun.getID() %>">
-                    <input type="submit" name="submit_item_edit_policy" value="Edit">
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="submit" name="submit_item_delete_policy" value="Delete">
-                </td>
-            </tr>
-        </form>
-<%
-        row = (row.equals("odd") ? "even" : "odd");
-    }
-%>
-    </table>
-
-<%
-        Bitstream [] bitstreams = myBun.getBitstreams();
-                
-        for( int s = 0; s < bitstreams.length; s++ )
-        {
-            Bitstream myBits = bitstreams[s];
-            myPolicies  = (List)bitstream_policies.get(new Integer(myBits.getID()));
-
-            // display bitstream header w/ID, filename
-            // 'add policy'
-            // display bitstream's policies
-%>                        
-            <P>Bitstream <%=myBits.getID()%> (<%=myBits.getName()%>)</P>
-            <P align="center">
-                <FORM method=POST>
-                    <input type="hidden" name="item_id"      value="<%=item.getID()%>">
-                    <input type="hidden" name="bitstream_id" value="<%=myBits.getID()%>" >
-                    <input type="submit" name="submit_bitstream_add_policy" value="Add New Policy">
-                </FORM>
-            </P>
-            <table class="miscTable" align="center">
-            <tr>
-                <th class="oddRowOddCol"><strong>ID</strong></th>
-                <th class="oddRowEvenCol"><strong>Action</strong></th>
-                <th class="oddRowOddCol"><strong>Public</strong></th>
-                <th class="oddRowEvenCol"><strong>EPerson</strong></th>
-                <th class="oddRowOddCol"><strong>Group</strong></th>
-                <th class="oddRowEvenCol"><strong>StartDate</strong></th>
-                <th class="oddRowOddCol"><strong>EndDate</strong></th>
-                <th class="oddRowEvenCol">&nbsp;</th>
-                <th class="oddRowOddCol">&nbsp;</th>
-            </tr>
-
-<%
-    row = "even";
-    i = myPolicies.iterator();
-
-    while( i.hasNext() )
-    {
-        ResourcePolicy rp = (ResourcePolicy) i.next();
-%>
-        <form method=POST>
-            <tr>
-                <td class="<%= row %>RowOddCol"><%= rp.getID() %></td>
-                <td class="<%= row %>RowEvenCol">
-                    <%= Constants.actionText[rp.getAction()]%>
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    ...  
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <%= (rp.getEPerson() == null ? "..." : rp.getEPerson().getEmail() ) %>  
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <%= (rp.getGroup()   == null ? "..." : rp.getGroup().getName() ) %>  
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <%= (rp.getStartDate() == null ? "..." : "..." ) %>  
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <%= (rp.getEndDate() == null   ? "..." : "..." ) %>  
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="hidden" name="policy_id"     value="<%= rp.getID()     %>">
-                    <input type="hidden" name="item_id"       value="<%= item.getID()   %>">
-                    <input type="hidden" name="bitstream_id"  value="<%= myBits.getID() %>">
-                    <input type="submit" name="submit_item_edit_policy" value="Edit">
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="submit" name="submit_item_delete_policy" value="Delete">
-                </td>
-            </tr>
-        </form>
-<%
-                row = (row.equals("odd") ? "even" : "odd");
-            }
-%>
-    </table>
-<%
-
-        }
-    }
-%>
-        
-</dspace:layout>

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

@@ -1,331 +0,0 @@
-<%--
-  - edit-item-form.jsp
-  -
-  - Version: $Revision$
-  -
-  - Date: $Date$
-  -
-  - Copyright (c) 2002, 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.
-  --%>
-
-<%--
-  - Show form allowing edit of collection metadata
-  -
-  - Attributes:
-  -    item        - item to edit
-  -    collections - collections the item is in, if any
-  -    handle      - item's Handle, if any (String)
-  -    dc.types    - DCType[] - all DC types in the registry
-  --%>
-
-<%@ page contentType="text/html;charset=UTF-8" %>
-
-<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
-
-<%@ page import="java.util.Date" %>
-<%@ page import="java.util.HashMap" %>
-<%@ page import="java.util.Map" %>
-
-<%@ page import="org.dspace.administer.DCType" %>
-<%@ page import="org.dspace.app.webui.servlet.admin.EditItemServlet" %>
-<%@ page import="org.dspace.content.Bitstream" %>
-<%@ page import="org.dspace.content.BitstreamFormat" %>
-<%@ page import="org.dspace.content.Bundle" %>
-<%@ page import="org.dspace.content.Collection" %>
-<%@ page import="org.dspace.content.DCDate" %>
-<%@ page import="org.dspace.content.DCValue" %>
-<%@ page import="org.dspace.content.Item" %>
-<%@ page import="org.dspace.core.ConfigurationManager" %>
-
-<%
-    Item item = (Item) request.getAttribute("item");
-    String handle = (String) request.getAttribute("handle");
-    Collection[] collections = (Collection[]) request.getAttribute("collections");
-    DCType[] dcTypes = (DCType[])  request.getAttribute("dc.types");
-%>
-
-<dspace:layout title="Edit Item"
-               navbar="admin"
-               locbar="link"
-               parentlink="/admin"
-               parenttitle="Administer">
-    <H1>Edit Item</H1>
-    
-    <P><strong>PLEASE NOTE: These changes are not validated in any way.
-    You are responsible for entering the data in the correct format.
-    If you are not sure what the format is, please do NOT make changes.</strong></P>  
-
-    <center>
-        <table width="70%">
-            <tr>
-                <td class="submitFormLabel">Item&nbsp;internal&nbsp;ID:</td>
-                <td class="standard"><%= item.getID() %></td>
-                <td class="standard" width="100%" align="right" rowspan=5>
-<%
-    if (!item.isWithdrawn())
-    {
-%>
-                    <form method=POST action="<%= request.getContextPath() %>/admin/edit-item">
-                        <input type="hidden" name="item_id" value="<%= item.getID() %>">
-                        <input type="hidden" name="action" value="<%= EditItemServlet.START_WITHDRAW %>">
-                        <input type="submit" name="submit" value="Withdraw...">
-                    </form>
-<%
-    }
-    else
-    {
-%>
-                    <form method=POST action="<%= request.getContextPath() %>/admin/edit-item">
-                        <input type="hidden" name="item_id" value="<%= item.getID() %>">
-                        <input type="hidden" name="action" value="<%= EditItemServlet.REINSTATE %>">
-                        <input type="submit" name="submit" value="Reinstate">
-                    </form>
-<%
-    }
-%>
-                    <br>
-                    <form method=POST action="<%= request.getContextPath() %>/admin/edit-item">
-                        <input type="hidden" name="item_id" value="<%= item.getID() %>">
-                        <input type="hidden" name="action" value="<%= EditItemServlet.START_DELETE %>">
-                        <input type="submit" name="submit" value="Delete (Expunge)...">
-                    </form>
-                </td>
-            </tr>
-            <tr>
-                <td class="submitFormLabel">Handle:</td>
-                <td class="standard"><%= (handle == null ? "None" : handle) %></td>
-            </tr>
-                <td class="submitFormLabel">Last modified:</td>
-                <td class="standard"><dspace:date date="<%= new DCDate(item.getLastModified()) %>" /></td>
-            </tr>
-            <tr>
-                <td class="submitFormLabel">In Collections:</td>
-                <td class="standard">
-<%  for (int i = 0; i < collections.length; i++) { %>
-                    <%= collections[i].getMetadata("name") %><br>
-<%  } %>
-                </td>
-            </tr>
-
-            <tr>
-                <td class="submitFormLabel">Item page:</td>
-                <td class="standard">
-<%  if (handle == null) { %>
-                    <em>N/A</em>
-<%  } else {
-    String url = ConfigurationManager.getProperty("dspace.url") + "/handle/" + handle; %>
-                    <A TARGET=_blank HREF="<%= url %>"><%= url %></A>
-<%  } %>
-                </td>
-            </tr>
-        </table>
-    </center>
-
-<%
-
-
-    if (item.isWithdrawn())
-    {
-%>
-    <P align=center><strong>This item was withdrawn from DSpace</strong></P>
-<%
-    }
-%>
-    <P>&nbsp;</P>
-
-
-    <form method=POST action="<%= request.getContextPath() %>/admin/edit-item">
-        <table class="miscTable">
-            <tr>
-                <th class="oddRowOddCol"><strong>Element</strong></th>
-                <th class="oddRowEvenCol"><strong>Qualifier</strong></th>
-                <th class="oddRowOddCol"><strong>Value</strong></th>
-                <th class="oddRowEvenCol"><strong>Language</strong></th>
-                <th class="oddRowOddCol">&nbsp;</th>
-            </tr>
-<%
-    DCValue[] dcv = item.getDC(Item.ANY, Item.ANY, Item.ANY);
-    String row = "even";
-    
-    // Keep a count of the number of values of each element+qualifier
-    // key is "element" or "element_qualifier" (String)
-    // values are Integers - number of values that element/qualifier so far
-    Map dcCounter = new HashMap();
-    
-    for (int i = 0; i < dcv.length; i++)
-    {
-        // Find out how many values with this element/qualifier we've found
-
-        String key = dcv[i].element +
-            (dcv[i].qualifier == null ? "" : "_" + dcv[i].qualifier);
-
-        Integer count = (Integer) dcCounter.get(key);
-        if (count == null)
-        {
-            count = new Integer(0);
-        }
-        
-        // Increment counter in map
-        dcCounter.put(key, new Integer(count.intValue() + 1));
-
-        // We will use two digits to represent the counter number in the parameter names.
-        // This means a string sort can be used to put things in the correct order even
-        // if there are >= 10 values for a particular element/qualifier.  Increase this to 
-        // 3 digits if there are ever >= 100 for a single element/qualifer! :)
-        String sequenceNumber = count.toString();
-        
-        while (sequenceNumber.length() < 2)
-        {
-            sequenceNumber = "0" + sequenceNumber;
-        }
- %>
-            <tr>
-                <td class="<%= row %>RowOddCol"><%= dcv[i].element %>&nbsp;&nbsp;</td>
-                <td class="<%= row %>RowEvenCol"><%= (dcv[i].qualifier == null ? "" : dcv[i].qualifier) %></td>
-                <td class="<%= row %>RowOddCol">
-                    <textarea name="value_<%= key %>_<%= sequenceNumber %>" rows=3 cols=50><%= dcv[i].value %></textarea>
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="text" name="language_<%= key %>_<%= sequenceNumber %>" value="<%= (dcv[i].language == null ? "" : dcv[i].language) %>" size=5>
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <input type="submit" name="submit_remove_<%= key %>_<%= sequenceNumber %>" value="Remove">
-                </td>
-            </tr>
-<%      row = (row.equals("odd") ? "even" : "odd");
-    } %>
-
-            <tr><td>&nbsp;</td></tr>
-
-            <tr>
-                <td colspan=2 class="<%= row %>RowEvenCol">
-                    <select name="addfield_dctype">
-<%  for (int i = 0; i < dcTypes.length; i++) { %>
-                        <option value="<%= dcTypes[i].getID() %>"><%= dcTypes[i].getElement() %><%= (dcTypes[i].getQualifier() == null ? "" : "." + dcTypes[i].getQualifier()) %></option>
-<%  } %>
-                    </select>
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <textarea name="addfield_value" rows=3 cols=50></textarea>
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="text" name="addfield_language" size=5>
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <input type="submit" name="submit_addfield" value="Add">
-                </td>
-            </tr>
-        </table>
-        
-        <P>&nbsp;</P>
-
-        <H2>Bitstreams</H2>
-
-        <P><strong>Note: Changes to the bitstreams will not be automatically reflected in the
-        Dublin Core metadata above (e.g. <code>format.extent</code>, <code>format.mimetype</code>).
-        You will need to update this by hand.</strong></P>
-
-        <P>Also note that if the "user format description" field isn't empty, the format will
-        always be set to "Unknown", so clear the user format description before changing the
-        format field.</P>
-
-        <table class="miscTable">
-            <tr>
-                <th class="oddRowOddCol"><strong>Name</strong></th>
-                <th class="oddRowEvenCol"><strong>Source</strong></th>
-                <th class="oddRowOddCol"><strong>Description</strong></th>
-                <th class="oddRowEvenCol"><strong>Format</strong></th>
-                <th class="oddRowOddCol"><strong>User&nbsp;Format&nbsp;Description</strong></th>
-                <th class="oddRowEvenCol">&nbsp;</th>
-            </tr>
-<%
-    Bundle[] bundles = item.getBundles();
-    row = "even";
-
-    for (int i = 0; i < bundles.length; i++)
-    {
-        Bitstream[] bitstreams = bundles[i].getBitstreams();
-        for (int j = 0; j < bitstreams.length; j++)
-        {
-            // Parameter names will include the bundle and bitstream ID
-            // e.g. "bitstream_14_18_desc" is the description of bitstream 18 in bundle 14
-            String key = bundles[i].getID() + "_" + bitstreams[j].getID();
-            BitstreamFormat bf = bitstreams[j].getFormat();
-%>
-            <tr>
-                <td class="<%= row %>RowOddCol">
-                    <input type="text" name="bitstream_name_<%= key %>" value="<%= (bitstreams[j].getName() == null ? "" : bitstreams[j].getName()) %>">
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="text" name="bitstream_source_<%= key %>" value="<%= (bitstreams[j].getSource() == null ? "" : bitstreams[j].getSource()) %>">
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <input type="text" name="bitstream_description_<%= key %>" value="<%= (bitstreams[j].getDescription() == null ? "" : bitstreams[j].getDescription()) %>">
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="text" name="bitstream_format_id_<%= key %>" value="<%= bf.getID() %>" size="4"> (<%= bf.getShortDescription() %>)
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <input type="text" name="bitstream_user_format_description_<%= key %>" value="<%= (bitstreams[j].getUserFormatDescription() == null ? "" : bitstreams[j].getUserFormatDescription()) %>">
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <A TARGET=_blank HREF="<%= request.getContextPath() %>/retrieve/<%= bitstreams[j].getID() %>">View</A>&nbsp;<input type="submit" name="submit_delete_bitstream_<%= key %>" value="Remove">
-                </td>
-            </tr>
-<%
-            row = (row.equals("odd") ? "even" : "odd");
-        }
-    }
-%>
-        </table>
-
-        <P align="center"><input type="submit" name="submit_addbitstream" value="Add Bitstream"></P>
-
-        <P>&nbsp;</P>
-
-        <input type="hidden" name="item_id" value="<%= item.getID() %>">
-        <input type="hidden" name="action" value="<%= EditItemServlet.UPDATE_ITEM %>">
-        <center>
-            <table width="70%">
-                <tr>
-                    <td align="left">
-                        <input type="submit" name="submit" value="Update">
-                    </td>
-                    <td align="right">
-                        <input type="submit" name="submit_cancel" value="Cancel">
-                    </td>
-                </tr>
-            </table>
-        </center>
-    </form>
-</dspace:layout>

dspace/jsp/admin/eperson-edit.jsp

@@ -1,147 +0,0 @@
-<%--
-  - eperson-edit.jsp
-  - Copyright (c) 2002, 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.
-  --%>
-
-
-<%--
-  - eperson editor - for new or existing epeople
-  -
-  - Attributes:
-  -   eperson - eperson to be edited
-  - Returns:
-  -   submit_save   - admin wants to save edits
-  -   submit_delete - admin wants to delete edits
-  -   submit_cancel - admin wants to cancel
-  -
-  -   eperson_id
-  -   email
-  -   firstname
-  -   lastname
-  -   phone
-  -   can_log_in          - (boolean)
-  -   require_certificate - (boolean)
-  --%>
-
-<%@ page contentType="text/html;charset=UTF-8" %>
-
-<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
-
-<%@ page import="org.dspace.eperson.EPerson" %>
-
-<%
-    EPerson eperson = (EPerson) request.getAttribute("eperson");
-
-    String email     = eperson.getEmail();
-    String firstName = eperson.getFirstName();
-    String lastName  = eperson.getLastName();
-    String phone     = eperson.getMetadata("phone");
-    String errorMessage  = (String)request.getAttribute("error_message");
-%>
-
-<dspace:layout title="Edit EPerson"
-               navbar="admin"
-               locbar="link"
-               parentlink="/admin"
-               parenttitle="Administer">
-
-
-    <h1><%= errorMessage %></h1>
-
-    <h1>Edit EPerson <%= eperson.getEmail() %>:</h1>
-
-    <form method=POST>
-
-    <table class="miscTable" align="center">
-        <tr>     
-            <td>Email:</td>
-            <td>
-                <input type="hidden" name="eperson_id" value="<%=eperson.getID()%>">
-                <input name="email" size="24" value="<%=email == null ? "" : email%>">
-            </td>
-        </tr>
-
-        <tr>
-            <td>Last Name:</td>
-            <td>
-                <input name="lastname" size="24" value="<%=lastName == null ? "" : lastName%>">
-            </td>
-        </tr>
-
-        <tr>
-            <td>First Name:</td>
-            <td>
-                <input name="firstname" size="24" value="<%=firstName == null ? "" : firstName%>">
-            </td>
-        </tr>
-
-        <tr>
-            <td>Phone:</td>
-            <td>
-                <input name="phone" size="24" value="<%=phone == null ? "" : phone%>">
-            </td>
-        </tr>
-
-        <tr>
-            <td>Can Log In:</td>
-            <td>
-                <input type="checkbox" name="can_log_in" value="true"<%= eperson.canLogIn() ? " CHECKED" : "" %>>
-            </td>
-        </tr>
-
-        <tr>
-            <td>Require Certificate:</td>
-            <td>
-                <input type="checkbox" name="require_certificate" value="true"<%= eperson.getRequireCertificate() ? " CHECKED" : "" %>>
-            </td>
-        </tr>
-
-
-    </table>
-    
-    <center>
-        <table width="70%">
-            <tr>
-                <td align="left">
-                    <input type="submit" name="submit_save" value="Save Edits">
-                </td>
-                <td align="right">
-                    <input type="submit" name="submit_delete" value="Delete EPerson...">
-                </td>
-            </tr>
-        </table>
-    </center>        
-
-    </form>
-
-</dspace:layout>

dspace/jsp/admin/list-communities.jsp

@@ -1,143 +0,0 @@
-<%--
-  - list-communities.jsp
-  -
-  - Version: $Revision$
-  -
-  - Date: $Date$
-  -
-  - Copyright (c) 2002, 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.
-  --%>
-
-
-<%--
-  - Display hierarchical list of communities and collections for admin editing
-  -
-  - Attributes to be passed in:
-  -    communities     - array of communities
-  -    collections.map  - Map where a keys is a community IDs and the value is
-  -                      the array of collections in that community.
-  --%>
-
-<%@ page contentType="text/html;charset=UTF-8" %>
-
-<%@ page import="java.util.Map" %>
-
-<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %>
-<%@ page import="org.dspace.content.Community" %>
-<%@ page import="org.dspace.content.Collection" %>
-
-<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
-
-<%
-    Community[] communities = (Community[]) request.getAttribute("communities");
-    Map collectionMap = (Map) request.getAttribute("collections.map");
-%>
-
-<dspace:layout title="Edit Communities and Collections" navbar="admin" locbar="link" parentlink="/admin" parenttitle="Administer">
-
-    <H1>Edit Communities and Collections</H1>
-    
-    <form method=POST>
-        <input type="hidden" name="action" value="<%= EditCommunitiesServlet.START_CREATE_COMMUNITY %>">
-        <P align="center"><input type="submit" name="submit" value="Create Community..."></P>
-    </form>
-
-    <table class="miscTable" align="center">
-<%
-    for (int i = 0; i < communities.length; i++)
-    {
-%>
-        <tr class="evenRowEvenCol">
-            <td>
-                <strong><A HREF="<%= request.getContextPath() %>/handle/<%= communities[i].getHandle() %>"><%= communities[i].getMetadata("name") %></A></strong>
-                <small><%= communities[i].getHandle() %> (DB ID: <%= communities[i].getID()%>)</small>
-            </td>
-            <form method=POST>
-                <td>
-                    <input type="hidden" name="action" value="<%= EditCommunitiesServlet.START_EDIT_COMMUNITY %>">
-                    <input type="hidden" name="community_id" value="<%= communities[i].getID() %>">
-                    <input type="submit" name="submit" value="Edit...">
-                </td>
-            </form>
-            <form method=POST>
-                <td>
-                    <input type="hidden" name="action" value="<%= EditCommunitiesServlet.START_DELETE_COMMUNITY %>">
-                    <input type="hidden" name="community_id" value="<%= communities[i].getID() %>">
-                    <input type="submit" name="submit" value="Delete...">
-                </td>
-            </form>
-            <form method=POST>
-                <td>
-                    <input type="hidden" name="action" value="<%= EditCommunitiesServlet.START_CREATE_COLLECTION %>">
-                    <input type="hidden" name="community_id" value="<%= communities[i].getID() %>">
-                    <input type="submit" name="submit" value="Create Collection...">
-                </td>
-            </form>
-        </tr>
-<%
-        Collection[] collections =
-            (Collection[]) collectionMap.get(new Integer(communities[i].getID()));
-
-        for (int j = 0; j < collections.length; j++)
-        {
-%>
-        <tr class="oddRowOddCol">
-            <td>
-                &nbsp;&nbsp;&nbsp;&nbsp;<A HREF="<%= request.getContextPath() %>/handle/<%= collections[j].getHandle() %>"><%= collections[j].getMetadata("name") %></A>
-                <small><%= collections[j].getHandle() %> (DB ID: <%= collections[j].getID()%>)</small>
-            </td>
-            <form method=POST>
-                <td>
-                    <input type="hidden" name="action"        value="<%= EditCommunitiesServlet.START_EDIT_COLLECTION %>">
-                    <input type="hidden" name="collection_id" value="<%= collections[j].getID() %>">
-                    <input type="submit" name="submit"        value="Edit...">
-                </td>
-            </form>
-            <form method=POST>
-                <td>
-                    <input type="hidden" name="action"        value="<%= EditCommunitiesServlet.START_DELETE_COLLECTION %>">
-                    <input type="hidden" name="collection_id" value="<%= collections[j].getID() %>">
-                    <input type="hidden" name="community_id"  value="<%= communities[i].getID() %>">
-                    <input type="submit" name="submit"        value="Delete...">
-                </td>
-            </form>
-        </tr>
-<%
-        }
-%>
-        <tr></tr>
-<%
-    }
-%>
-    </table>
-</dspace:layout>

dspace/jsp/admin/list-dc-types.jsp

@@ -1,116 +0,0 @@
-<%--
-  - list-dctypes.jsp
-  -
-  - Version: $Revision$
-  -
-  - Date: $Date$
-  -
-  - Copyright (c) 2002, 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.
-  --%>
-
-
-<%--
-  - Display list of DC types
-  -
-  - Attributes:
-  -
-  -   formats - the DC formats in the system (DCType[])
-  --%>
-
-<%@ page contentType="text/html;charset=UTF-8" %>
-
-<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
-
-<%@ page import="org.dspace.administer.DCType" %>
-
-<%
-    DCType[] types =
-        (DCType[]) request.getAttribute("types");
-%>
-
-<dspace:layout title="Dublin Core Type Registry"
-               navbar="admin"
-               locbar="link"
-               parentlink="/admin"
-               parenttitle="Administer">
-
-    <h1>Dublin Core Type Registry</h1>
-
-    <table class="miscTable" align="center">
-        <tr>
-            <th class="oddRowOddCol"><strong>ID</strong></th>
-            <th class="oddRowEvenCol"><strong>Element</strong></th>
-            <th class="oddRowOddCol"><strong>Qualifier</strong></th>
-            <th class="oddRowEvenCol"><strong>Scope Note</strong></th>
-            <th class="oddRowOddCol">&nbsp;</th>
-            <th class="oddRowEvenCol">&nbsp;</th>
-        </tr>
-
-<%
-    String row = "even";
-    for (int i = 0; i < types.length; i++)
-    {
-%>
-        <form method=POST>
-            <tr>
-                <td class="<%= row %>RowOddCol"><%= types[i].getID() %></td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="text" name="element" value="<%= types[i].getElement() %>" size=12>
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <input type="text" name="qualifier" value="<%= (types[i].getQualifier() == null ? "" : types[i].getQualifier()) %>" size=12>
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <textarea name="scope_note" rows=3 cols=40><%= (types[i].getScopeNote() == null ? "" : types[i].getScopeNote()) %></textarea>
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <input type="hidden" name="dc_type_id" value="<%= types[i].getID() %>">
-                    <input type="submit" name="submit_update" value="Update">
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="submit" name="submit_delete" value="Delete...">
-                </td>
-            </tr>
-        </form>
-<%
-        row = (row.equals("odd") ? "even" : "odd");
-    }
-%>
-    </table>
-        
-    <P align="center">
-        <form method=POST>
-            <input type="submit" name="submit_add" value="Add New">
-        </form>
-    </p>
-</dspace:layout>

dspace/jsp/admin/list-epeople.jsp

@@ -1,135 +0,0 @@
-<%--
-  - list-epeople.jsp
-  -
-  - Version: $Revision$
-  -
-  - Date: $Date$
-  -
-  - Copyright (c) 2002, 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.
-  --%>
-
-
-<%--
-  - Display list of E-people
-  -
-  - Attributes:
-  -
-  -   epeople - EPerson[] - all epeople in the system
-  --%>
-
-<%@ page contentType="text/html;charset=UTF-8" %>
-
-<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
-
-<%@ page import="org.dspace.eperson.EPerson" %>
-
-<%
-    EPerson[] epeople =
-        (EPerson[]) request.getAttribute("epeople");
-%>
-
-<dspace:layout title="E-People"
-               navbar="admin"
-               locbar="link"
-               parentlink="/admin"
-               parenttitle="Administer">
-
-    <h1>E-People</h1>
-
-    <P>Note that presently you can only update one line at a time - make
-    changes to a single e-person and click the relevant "update" button.</P>
-    
-    <P align="center">
-        <form method=POST>
-            <input type="submit" name="submit_add" value="Add New">
-        </form>
-    </p>
-
-    <table class="miscTable" align="center">
-        <tr>
-            <th class="oddRowOddCol"><strong><A HREF="<%= request.getContextPath() %>/admin/edit-epeople?sortby=id">ID</A></strong></th>
-            <th class="oddRowEvenCol"><strong><A HREF="<%= request.getContextPath() %>/admin/edit-epeople?sortby=email">E-mail Address</A></strong></th>
-            <th class="oddRowOddCol"><strong><A HREF="<%= request.getContextPath() %>/admin/edit-epeople?sortby=lastname">Last Name</A></strong></th>
-            <th class="oddRowEvenCol"><strong>First Name</strong></th>
-            <th class="oddRowOddCol"><strong>Can Log In?</strong></th>
-            <th class="oddRowEvenCol"><strong>Must Use Cert?</strong></th>
-            <th class="oddRowOddCol"><strong>Telephone</strong></th>
-            <th class="oddRowEvenCol">&nbsp;</th>
-            <th class="oddRowOddCol">&nbsp;</th>
-        </tr>
-
-<%
-    String row = "even";
-    for (int i = 0; i < epeople.length; i++)
-    {
-%>
-        <form method=POST>
-            <tr>
-                <td class="<%= row %>RowOddCol"><%= epeople[i].getID() %></td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="text" name="email" value="<%= (epeople[i].getEmail() == null ? "" : epeople[i].getEmail()) %>" size=12>
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <input type="text" name="lastname" value="<%= (epeople[i].getLastName() == null ? "" : epeople[i].getLastName()) %>" size=12>
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="text" name="firstname" value="<%= (epeople[i].getFirstName() == null ? "" : epeople[i].getFirstName()) %>" size=12>
-                </td>
-                <td class="<%= row %>RowOddCol" align="center">
-                    <input type="checkbox" name="active" value="true"<%= epeople[i].canLogIn() ? " CHECKED" : "" %>>
-                </td>
-                <td class="<%= row %>RowEvenCol" align="center">
-                    <input type="checkbox" name="require_certificate" value="true"<%= epeople[i].getRequireCertificate() ? " CHECKED" : "" %>>
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <input type="text" name="phone" value="<%= (epeople[i].getMetadata("phone") == null ? "" : epeople[i].getMetadata("phone")) %>" size=12>
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="hidden" name="eperson_id" value="<%= epeople[i].getID() %>">
-<%      if (request.getParameter("sortby") != null) { %>
-                    <input type="hidden" name="sortby" value="<%= request.getParameter("sortby") %>">
-<%      } %>
-                    <input type="submit" name="submit_update" value="Update">
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <input type="submit" name="submit_delete" value="Delete...">
-                </td>
-            </tr>
-        </form>
-<%
-        row = (row.equals("odd") ? "even" : "odd");
-    }
-%>
-    </table>
-
-</dspace:layout>

dspace/jsp/admin/list-formats.jsp

@@ -1,148 +0,0 @@
-<%--
-  - list-formats.jsp
-  -
-  - Version: $Revision$
-  -
-  - Date: $Date$
-  -
-  - Copyright (c) 2002, 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.
-  --%>
-
-
-<%--
-  - Display list of bitstream formats
-  -
-  - Attributes:
-  -
-  -   formats - the bitstream formats in the system (BitstreamFormat[])
-  --%>
-
-<%@ page contentType="text/html;charset=UTF-8" %>
-
-<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
-
-<%@ page import="org.dspace.content.BitstreamFormat" %>
-
-<%
-    BitstreamFormat[] formats =
-        (BitstreamFormat[]) request.getAttribute("formats");
-%>
-
-<dspace:layout title="Bitstream Format Registry" navbar="admin" locbar="link" parentlink="/admin" parenttitle="Administer">
-
-    <h1>Bitstream Format Registry</h1>
-
-    <P><strong>Extensions</strong> are comma-separated lists of filename
-    extensions used to automatically identify the formats of uploaded files.
-    Do not include the dot.</P>
-
-    <P>When you add a bitstream format, it is initially made "internal" so that
-    it does not appear in the submission UI before you've finished editing
-    the format metadata.  Be sure to uncheck "internal" if the format should
-    appear in the submission UI list of formats.</P>
-
-    <table class="miscTable" align="center">
-        <tr>
-            <th class="oddRowOddCol"><strong>ID</strong></th>
-            <th class="oddRowEvenCol"><strong>MIME Type</strong></th>
-            <th class="oddRowOddCol"><strong>Name</strong></th>
-            <th class="oddRowEvenCol"><strong>Long Description</strong></th>
-            <th class="oddRowOddCol"><strong>Support Level</strong></th>
-            <th class="oddRowEvenCol"><strong>Internal?</strong></th>
-            <th class="oddRowOddCol"><strong>Extensions</strong></th>
-            <th class="oddRowEvenCol">&nbsp;</th>
-            <th class="oddRowOddCol">&nbsp;</th>
-        </tr>
-
-<%
-    String row = "even";
-    for (int i = 0; i < formats.length; i++)
-    {
-        String[] extensions = formats[i].getExtensions();
-        String extValue = "";
-
-        for (int j = 0 ; j < extensions.length; j++)
-        {
-            if (j > 0)
-            {
-                extValue = extValue + ", ";
-            }
-            extValue = extValue + extensions[j];
-        }
-%>
-        <form method=POST>
-            <tr>
-                <td class="<%= row %>RowOddCol"><%= formats[i].getID() %></td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="text" name="mimetype" value="<%= formats[i].getMIMEType() %>" size=14>
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <input type="text" name="short_description" value="<%= formats[i].getShortDescription() %>" size=10>
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="text" name="description" value="<%= formats[i].getDescription() %>" size=20>
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <select name="support_level">
-                        <option value="0" <%= formats[i].getSupportLevel() == 0 ? "SELECTED" : "" %>>Unknown</option>
-                        <option value="1" <%= formats[i].getSupportLevel() == 1 ? "SELECTED" : "" %>>Known</option>
-                        <option value="2" <%= formats[i].getSupportLevel() == 2 ? "SELECTED" : "" %>>Supported</option>
-                    </select>
-                </td>
-                <td class="<%= row %>RowEvenCol" align="center">
-                    <input type="checkbox" name="internal" value="true"<%= formats[i].isInternal() ? " CHECKED" : "" %>>
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <input type="text" name="extensions" value="<%= extValue %>" size="10">
-                </td>
-                <td class="<%= row %>RowEvenCol">
-                    <input type="hidden" name="format_id" value="<%= formats[i].getID() %>">
-                    <input type="submit" name="submit_update" value="Update">
-                </td>
-                <td class="<%= row %>RowOddCol">
-                    <input type="submit" name="submit_delete" value="Delete...">
-                </td>
-            </tr>
-        </form>
-<%
-        row = (row.equals("odd") ? "even" : "odd");
-    }
-%>
-    </table>
-        
-    <P align="center">
-        <form method=POST>
-            <input type="submit" name="submit_add" value="Add New">
-        </form>
-    </p>
-</dspace:layout>

dspace/jsp/browse/authors.jsp

@@ -56,6 +56,8 @@
 
 <%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
 <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
 
 <%@ page import="java.net.URLEncoder" %>
@@ -67,6 +69,11 @@
 <%@ page import="org.dspace.content.DCDate" %>
 <%@ page import="org.dspace.content.DCValue" %>
 <%@ page import="org.dspace.content.Item" %>
+<%@ page import="org.dspace.core.Utils" %>
+
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="org.apache.taglibs.standard.tag.common.fmt.BundleSupport" %>
+<%@ page import="java.util.Locale" %>
 
 <%
     // Get attributes
@@ -80,47 +87,40 @@
     String prevQuery = (String) request.getAttribute("previous.query");
     String nextQuery = (String) request.getAttribute("next.query");
 
-    // Description of what the user is actually browsing
-    String scopeName = "All of DSpace";
-    if (collection != null)
-    {
-        scopeName = collection.getMetadata("name");
-    }
-    else if (community != null)
-    {
-        scopeName = community.getMetadata("name");
-    }
 %>
 
-<dspace:layout title="Browse by Author">
+<dspace:layout titlekey="jsp.browse.authors.title">
 
-    <H2>Browsing <%= scopeName %> by Author</H2>
-
-    <form action="browse-author" method=GET>
+    <h2><fmt:message key="jsp.browse.authors.title"/></h2>
+    <form action="browse-author" method="get">
 
         <%-- Browse controls --%>
-        <table align=center border=0 bgcolor="#CCCCCC" cellpadding=0>
+        <table align="center" border="0" bgcolor="#CCCCCC" cellpadding="0">
             <tr>
                 <td>
-                    <table border=0 bgcolor="#EEEEEE" cellpadding=2>
+                    <table border="0" bgcolor="#EEEEEE" cellpadding="2"> <%--allow for greek alphabet also--%>
                         <tr>
                             <td class="browseBar">
-                                <span class="browseBarLabel">Jump&nbsp;to:&nbsp;</span>
-                                <A HREF="browse-author?starts_with=0">0-9</A>
+                        	    <%--<span class="browseBarLabel">Jump&nbsp;to:&nbsp;</span>--%>
+						        <span class="browseBarLabel"><fmt:message key="jsp.browse.authors.jump"/></span>
+                                <a href="browse-author?starts_with=0">0-9</a>
 <%
     for (char c = 'A'; c <= 'Z'; c++)
     {
 %>
-                                <A HREF="browse-author?starts_with=<%= c %>"><%= c %></A>
+                                <a href="browse-author?starts_with=<%= c %>"><%= c %></a>
 <%
     }
 %>
                             </td>
                         </tr>
                         <tr>
-                            <td class="browseBar" align=center>
-                                <span class="browseBarLabel">or enter first few letters:&nbsp;</span>
-                                <input type="text" name="starts_with">&nbsp;<input type="submit" value="Go!">
+                            <td class="browseBar" align="center" id="tstarts_with">
+                                <span class="browseBarLabel"><label for="tstarts_with"><fmt:message key="jsp.browse.authors.enter"/>&nbsp;</label></span>                              
+                                <%--<span class="browseBarLabel">or enter first few letters:&nbsp;</span>--%>
+								<%--<input type="text" name="starts_with">&nbsp;<input type="submit" value="Go!">--%>
+                                <input type="text" name="starts_with"/>&nbsp;<input type="submit" value="<fmt:message key="jsp.browse.general.go"/>" />
+
                             </td>
                         </tr>
                     </table>
@@ -128,39 +128,47 @@
             </tr>
         </table>
 
-        <BR />
+        <br />
 
-        <P align=center>Showing authors <%= browseInfo.getOverallPosition() + 1 %>-<%= browseInfo.getOverallPosition() + browseInfo.getResultCount() %> of <%= browseInfo.getTotal() %>.</P>
+        <%--<p align="center">Showing authors <%= browseInfo.getOverallPosition() + 1 %>-<%= browseInfo.getOverallPosition() + browseInfo.getResultCount() %> of <%= browseInfo.getTotal() %>.</p>--%>
+        <p align="center"><fmt:message key="jsp.browse.authors.show">
+            <fmt:param><%= browseInfo.getOverallPosition() + 1 %></fmt:param>
+            <fmt:param><%= browseInfo.getOverallPosition() + browseInfo.getResultCount() %></fmt:param>
+            <fmt:param><%= browseInfo.getTotal() %></fmt:param>
+        </fmt:message></p>
 
         <%-- Previous page/Next page --%>
-        <table align=center border=0 width=70%>
+        <table align="center" border="0" width="70%">
             <tr>
-                <td class=standard align=left>
+                <td class="standard" align="left">
 <%
     if (prevQuery != null)
     {
 %>
-                    <A HREF="browse-author?<%= prevQuery %>">Previous page</A>
+
+
+                    <%-- <a="browse-author?<%= prevQuery %>">Previous page</a> --%>
+					<a href="browse-author?<%= prevQuery %>"><fmt:message key="jsp.browse.general.previous"/></a>
 <%
     }
 %>
                 </td>
-                <td class=standard align=right>
+                <td class="standard" align="right">
 <%
     if (nextQuery != null)
     {
 %>
-                    <A HREF="browse-author?<%= nextQuery %>">Next page</A>
+		            <%-- <a href="browse-author?<%= nextQuery %>">Next page</a> --%>
+                    <a href="browse-author?<%= nextQuery %>"><fmt:message key="jsp.browse.general.next"/></a>
 <%
     }
 %>
                 </td>
             </tr>
         </table>
-
-
+        
         <%-- The authors --%>
-        <table align=center class="miscTable">
+        <table align="center" class="miscTable" summary="This table displays a list of authors">
 <%
     // Row: toggles between Odd and Even
     String row = "odd";
@@ -171,7 +179,7 @@
 %>
             <tr>
                 <td class="<%= highlight && i==browseInfo.getOffset() ? "highlight" : row %>RowOddCol">
-                    <A HREF="items-by-author?author=<%= URLEncoder.encode(results[i]) %>"><%= results[i] %></A>
+                    <a href="items-by-author?author=<%= URLEncoder.encode(results[i], "UTF-8") %>"><%= Utils.addEntities(results[i]) %></a>
                 </td>
             </tr>
 <%
@@ -179,35 +187,32 @@
     }
 %>
         </table>
-
-
         <%-- Previous page/Next page --%>
-        <table align=center border=0 width=70%>
+        <table align="center" border="0" width="70%">
             <tr>
-                <td class=standard align=left>
+                <td class="standard" align="left">
 <%
     if (prevQuery != null)
     {
 %>
-                    <A HREF="browse-author?<%= prevQuery %>">Previous page</A>
+				    <a href="browse-author?<%= prevQuery %>"><fmt:message key="jsp.browse.general.previous"/></a>
 <%
     }
 %>
                 </td>
-                <td class=standard align=right>
+                <td class="standard" align="right">
 <%
     if (nextQuery != null)
     {
 %>
-                    <A HREF="browse-author?<%= nextQuery %>">Next page</A>
+		            <%-- <a href="browse-author?<%= nextQuery %>">Next page</a> --%>
+                    <a href="browse-author?<%= nextQuery %>"><fmt:message key="jsp.browse.general.next"/></a>
 <%
     }
 %>
                 </td>
             </tr>
         </table>
-
-
     </form>
 
 </dspace:layout>

dspace/jsp/browse/items-by-author.jsp

@@ -55,6 +55,7 @@
 
 <%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
 
@@ -64,6 +65,7 @@
 <%@ page import="org.dspace.content.Community" %>
 <%@ page import="org.dspace.content.Collection" %>
 <%@ page import="org.dspace.content.Item" %>
+<%@ page import="org.dspace.core.Utils" %>
 
 <%
     Collection collection = (Collection) request.getAttribute("collection");
@@ -71,52 +73,42 @@
     BrowseInfo browseInfo = (BrowseInfo) request.getAttribute("browse.info" );
     String author = (String) request.getAttribute("author");
     boolean orderByTitle = ((Boolean) request.getAttribute("order.by.title")).booleanValue();
-
-
-    // Description of what the user is actually browsing
-    String scopeName = "All of DSpace";
-    if (collection != null)
-    {
-        scopeName = collection.getMetadata("name");
-    }
-    else if (community != null)
-    {
-        scopeName = community.getMetadata("name");
-    }
-
-    String pageTitle = "Items for Author " + author;
 %>
 
-<dspace:layout title="<%= pageTitle %>">
-
-    <H2>Items for Author <%= author %> in <%= scopeName %></H2>
+<dspace:layout titlekey="jsp.browse.items-by-author.title">
 
+  <h2><fmt:message key="jsp.browse.items-by-author.heading1"/> "<%= Utils.addEntities(author) %>"</h2>
     <%-- Sorting controls --%>
-    <table border=0 cellpadding=10 align=center>
+    <table border="0" cellpadding="10" align="center" summary="Browse the repository by author">
         <tr>
-            <td colspan=2 align=center class=standard>
-                <a href="browse-author?starts_with=<%= URLEncoder.encode(author) %>">Return to Browse by Author</A>
+            <td colspan="2" align="center" class="standard">
+                <%-- <a href="browse-author?starts_with=<%= URLEncoder.encode(author) %>">Return to Browse by Author</a> --%>
+			    <a href="browse-author?starts_with=<%= URLEncoder.encode(author) %>"><fmt:message key="jsp.browse.items-by-author.return"/></a>
             </td>
         </tr>
         <tr>
-            <td class=standard>
+            <td class="standard">
 <%
     if (orderByTitle)
     {
 %>
-                <strong>Sorting by Title</strong>
+                <%-- <strong>Sorting by Title</strong> --%>
+                <strong><fmt:message key="jsp.browse.items-by-author.sort1"/></strong>
             </td>
-            <td class=standard>
-                <a href="items-by-author?author=<%= URLEncoder.encode(author) %>&order=date">Sort by Date</a>
+            <td class="standard">
+                <%-- <a href="items-by-author?author=<%= URLEncoder.encode(author) %>&order=date">Sort by Date</a> --%>
+				<a href="items-by-author?author=<%= URLEncoder.encode(author) %>&amp;order=date"><fmt:message key="jsp.browse.items-by-author.sort2"/></a>
 <%
     }
     else
     {
 %>
-                <a href="items-by-author?author=<%= URLEncoder.encode(author) %>&order=title">Sort by Title</a>
+      	        <%-- <a href="items-by-author?author=<%= URLEncoder.encode(author) %>&order=title">Sort by Title</a> --%>
+	            <a href="items-by-author?author=<%= URLEncoder.encode(author) %>&amp;order=title"><fmt:message key="jsp.browse.items-by-author.sort3"/></a>
             </td>
-            <td class=standard>
-                <strong>Sorting by Date</strong>
+            <td class="standard">
+                <%-- <strong>Sorting by Date</strong> --%>
+				<strong><fmt:message key="jsp.browse.items-by-author.sort4"/></strong>
 <%
     }
 %>
@@ -124,7 +116,11 @@
         </tr>
     </table>
 
-    <P align=center>Showing <%= browseInfo.getResultCount() %> items.</P>
+    <%-- <p align="center">Showing <%= browseInfo.getResultCount() %> items.</p> --%>
+	<p align="center"><fmt:message key="jsp.browse.items-by-author.show">
+
+        <fmt:param><%= browseInfo.getResultCount() %></fmt:param>
+    </fmt:message></p>
 
 
     <%-- The items --%>

dspace/jsp/browse/items-by-date.jsp

@@ -60,6 +60,8 @@
 
 <%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
 <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
 
 <%@ page import="org.dspace.browse.BrowseInfo" %>
@@ -85,57 +87,46 @@
     boolean oldestFirst = ((Boolean) request.getAttribute("oldest.first")).booleanValue();
     String flipOrderingQuery = (String) request.getAttribute("flip.ordering.query");
 
-    // Description of what the user is actually browsing
-    String scopeName = "All of DSpace";
-    if (collection != null)
-    {
-        scopeName = collection.getMetadata("name");
-    }
-    else if (community != null)
-    {
-        scopeName = community.getMetadata("name");
-    }
 %>
 
-<dspace:layout title="Browsing by Date">
-
-    <H2>Browsing <%= scopeName %> by Date</H2>
-
+<dspace:layout titlekey="jsp.browse.items-by-date.title">
+    <h2><fmt:message key="jsp.browse.items-by-date.title"/></h2>
     <%-- Date browse controls table --%>
-    <form action="browse-date" method=GET>
- 
+    <form action="browse-date" method="get">
 <%
     if (oldestFirst)
     {
         // Remember ordering when using browse controls
 %>
-        <input type=hidden name="order" value="oldestfirst">
+        <input type="hidden" name="order" value="oldestfirst"/>
 <%
     }
 %>
-        <table align=center border=0 bgcolor="#CCCCCC" cellpadding=0>
+        <table align="center" border="0" bgcolor="#CCCCCC" cellpadding="0" summary="Browse the respository by date">
             <tr>
                 <td>
-                    <table border=0 bgcolor="#EEEEEE" cellpadding=2>
+                    <table border="0" bgcolor="#EEEEEE" cellpadding="2">
                         <tr>
                             <td class="browseBar">
-                                <span class="browseBarLabel">Jump to a point in the index: </span>
-                                <select name=month>
-                                    <option selected value="-1">(Choose month)</option>
+                                <%-- <span class="browseBarLabel">Jump to a point in the index: </span> --%>
+								<span class="browseBarLabel"><fmt:message key="jsp.browse.items-by-date.jump"/> </span>
+                                <select name="month">
+								    <%-- <option selected value="-1">(Choose month)</option> --%>
+                                    <option selected="selected" value="-1"><fmt:message key="jsp.browse.items-by-date.month"/></option>
 <%
     for (int i = 1; i <= 12; i++)
     {
 %>
-                                    <option value=<%= i %>><%= DCDate.getMonthName(i) %></option>
+                                    <option value="<%= i %>"><%= DCDate.getMonthName(i) %></option>
 <%
     }
 %>
                                 </select>
-
-                                <select name=year>
-                                    <option selected value="-1">(Choose year)</option>
+                                <select name="year">
+								    <%-- <option selected value="-1">(Choose year)</option> --%>
+                                    <option selected="selected" value="-1"><fmt:message key="jsp.browse.items-by-date.year"/></option>
 <%
-    int thisYear = new DCDate().getYear();
+    int thisYear = DCDate.getCurrent().getYear();
     for (int i = thisYear; i >= 1990; i--)
     {
 %>
@@ -151,15 +142,17 @@
                                     <option>1950</option>
                                 </select>
                             </td>
-                            <td class="browseBar" rowspan=2>
-                                <input type=submit value="Go">
+                            <td class="browseBar" rowspan="2">
+							    <%-- <input type="submit" value="Go"> --%>
+                                <input type="submit" value="<fmt:message key="jsp.browse.general.go"/>" />
                             </td>
                         </tr>
                         <tr>
                             <%-- HACK:  Shouldn't use align here --%>
-                            <td class="browseBar" align=center>
-                                <span class="browseBarLabel">Or type in a year:</span>
-                                <input type=text name=starts_with size=4 maxlength=4>
+                            <td class="browseBar" align="center">
+							    <%-- <span class="browseBarLabel">Or type in a year:</span> --%>
+                                <span class="browseBarLabel"><fmt:message key="jsp.browse.items-by-date.type"/></span>
+                                <input type="text" name="starts_with" size="4" maxlength="4"/>
                             </td>
                         </tr>
                     </table>
@@ -170,67 +163,80 @@
 
         <%-- Flip the ordering controls --%>
 
-        <table border=0 width=70% align=center>
+        <table border="0" width="70%" align="center">
             <tr>
-                <td align=left class=standard>
+                <td align="left" class="standard">
 <%
     if (oldestFirst)
     {
 %>
-                    <a href="browse-date?<%= flipOrderingQuery %>">Show Most Recent First</A>
+                    <%-- <a href="browse-date?<%= flipOrderingQuery %>">Show Most Recent First</a> --%>
+                    <a href="browse-date?<%= flipOrderingQuery %>"><fmt:message key="jsp.browse.items-by-date.recent"/></a>
 <%
     }
     else
     {
 %>
-                    <strong>Ordering With Most Recent First</strong>
+                    <%-- <strong>Ordering With Most Recent First</strong> --%>
+                    <strong><fmt:message key="jsp.browse.items-by-date.order1"/></strong>
 <%
     }
 %>
                 </td>
-                <td align=right class=standard>
+                <td align="right" class="standard">
 <%
     if( oldestFirst )
     {
 %>
-                    <strong>Ordering With Oldest First</strong>
+                    <%-- <strong>Ordering With Oldest First</strong> --%>
+                    <strong><fmt:message key="jsp.browse.items-by-date.order2"/></strong>
 <%
     }
     else
     {
 %>
-                    <a href="browse-date?<%= flipOrderingQuery %>order=oldestfirst">Show Oldest First</A>
+                    <%-- <a href="browse-date?<%= flipOrderingQuery %>order=oldestfirst">Show Oldest First</a> --%>
+                    <a href="browse-date?<%= flipOrderingQuery %>order=oldestfirst"><fmt:message key="jsp.browse.items-by-date.old"/></a>
 <%
     }
 %>
                 </td>
             </tr>
-        </table>                
+        </table>
     </form>
 
-    <BR>
+    <br/>
 
-    <P align=center>Showing items <%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %> of <%= browseInfo.getTotal() %>.</P>
+    <%-- <p align="center">Showing items <%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %> of <%= browseInfo.getTotal() %>.</p> --%>
+	<p align="center"><fmt:message key="jsp.browse.items-by-date.show">
+        <fmt:param><%= browseInfo.getOverallPosition()+1 %></fmt:param>
+        <fmt:param><%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %></fmt:param>
+        <fmt:param><%= browseInfo.getTotal() %></fmt:param>
+    </fmt:message></p>
 
     <%-- Previous page/Next page --%>
-    <table align=center border=0 width=70%>
+    <table align="center" border="0" width="70%">
         <tr>
-            <td class=standard align=left>
+            <td class="standard" align="left">
 <%
     if (prevQuery != null)
     {
 %>
-                <A HREF="browse-date?<%= prevQuery %>">Previous page</A>
+                <%-- <a href="browse-date?<%= prevQuery %>">Previous page</a> --%>
+                <a href="browse-date?<%= prevQuery %>"><fmt:message key="jsp.browse.general.previous"/></a>
+
 <%
     }
 %>
             </td>
-            <td class=standard align=right>
+            <td class="standard" align="right">
 <%
     if (nextQuery != null)
     {
 %>
-                <A HREF="browse-date?<%= nextQuery %>">Next page</A>
+                <%-- <a href="browse-date?<%= nextQuery %>">Next page</a> --%>
+				<a href="browse-date?<%= nextQuery %>"><fmt:message key="jsp.browse.general.next"/></a>
+
 <%
     }
 %>
@@ -244,30 +250,33 @@
     if (highlight)
     {
         highlightAttribute = String.valueOf(browseInfo.getOffset());
-    }    
+    }
 %>
     <dspace:itemlist items="<%= browseInfo.getItemResults() %>" emphcolumn="date" highlightrow="<%= highlightAttribute %>" />
 
 
     <%-- Previous page/Next page --%>
-    <table align=center border=0 width=70%>
+    <table align="center" border="0" width="70%">
         <tr>
-            <td class=standard align=left>
+            <td class="standard" align="left">
 <%
     if (prevQuery != null)
     {
 %>
-                <A HREF="browse-date?<%= prevQuery %>">Previous page</A>
+                <%-- <a href="browse-date?<%= prevQuery %>">Previous page</a> --%>
+				<a href="browse-date?<%= prevQuery %>"><fmt:message key="jsp.browse.general.previous"/></a>
 <%
     }
 %>
             </td>
-            <td class=standard align=right>
+            <td class="standard" align="right">
 <%
     if (nextQuery != null)
     {
 %>
-                <A HREF="browse-date?<%= nextQuery %>">Next page</A>
+
+                <%-- <a href="browse-date?<%= nextQuery %>">Next page</a> --%>
+				<a href="browse-date?<%= nextQuery %>"><fmt:message key="jsp.browse.general.next"/></a>
 <%
     }
 %>

dspace/jsp/browse/items-by-subject.jsp

@@ -0,0 +1,126 @@
+<%--
+  - items_by_subject.jsp
+  -
+  - Version: $Revision$
+  -
+  - Date: $Date$
+  -
+  - Copyright (c) 2002, 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.
+  --%>
+
+
+<%--
+  - Display items by a particular subject
+  -
+  - Attributes to pass in:
+  -
+  -   community      - pass in if the scope of the browse is a community, or
+  -                    a collection within this community
+  -   collection     - pass in if the scope of the browse is a collection
+  -   browse.info    - the BrowseInfo containing the items to display
+  -   subject        - The name of the subject
+  -   sort.by.date   - Boolean.  if true, we're sorting by date, otherwise by
+  -                    title.
+  --%>
+
+<%@ page contentType="text/html;charset=UTF-8" %>
+
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
+
+<%@ page import="java.net.URLEncoder" %>
+
+<%@ page import="org.dspace.browse.BrowseInfo" %>
+<%@ page import="org.dspace.content.Community" %>
+<%@ page import="org.dspace.content.Collection" %>
+<%@ page import="org.dspace.content.Item" %>
+<%@ page import="org.dspace.core.Utils" %>
+
+<%
+    Collection collection = (Collection) request.getAttribute("collection");
+    Community community = (Community) request.getAttribute("community");
+    BrowseInfo browseInfo = (BrowseInfo) request.getAttribute("browse.info" );
+    String subject = (String) request.getAttribute("subject");
+    boolean orderByTitle = ((Boolean) request.getAttribute("order.by.title")).booleanValue();
+%>
+
+<dspace:layout titlekey="jsp.browse.items-by-subject.title">
+
+  <h2><fmt:message key="jsp.browse.items-by-subject.heading1"/> "<%= Utils.addEntities(subject) %>"</h2>
+    <%-- Sorting controls --%>
+    <table border="0" cellpadding="10" align="center" summary="Browse the repository by subject">
+        <tr>
+            <td colspan="2" align="center" class="standard">
+			    <a href="browse-subject?starts_with=<%= URLEncoder.encode(subject) %>"><fmt:message key="jsp.browse.items-by-subject.return"/></a>
+            </td>
+        </tr>
+        <tr>
+            <td class="standard">
+<%
+    if (orderByTitle)
+    {
+%>
+                <strong><fmt:message key="jsp.browse.items-by-subject.sort1"/></strong>
+            </td>
+            <td class="standard">
+				<a href="items-by-subject?subject=<%= URLEncoder.encode(subject) %>&amp;order=date"><fmt:message key="jsp.browse.items-by-subject.sort2"/></a>
+<%
+    }
+    else
+    {
+%>
+	            <a href="items-by-subject?subject=<%= URLEncoder.encode(subject) %>&amp;order=title"><fmt:message key="jsp.browse.items-by-subject.sort3"/></a>
+            </td>
+            <td class="standard">
+				<strong><fmt:message key="jsp.browse.items-by-subject.sort4"/></strong>
+<%
+    }
+%>
+            </td>
+        </tr>
+    </table>
+
+	<p align="center"><fmt:message key="jsp.browse.items-by-subject.show">
+
+        <fmt:param><%= browseInfo.getResultCount() %></fmt:param>
+    </fmt:message></p>
+
+
+    <%-- The items --%>
+<%
+    String emphColumn = (orderByTitle ? "title" : "date");
+%>
+    <dspace:itemlist items="<%= browseInfo.getItemResults() %>" emphcolumn="<%= emphColumn %>" />
+
+
+</dspace:layout>

dspace/jsp/browse/items-by-title.jsp

@@ -56,6 +56,9 @@
 
 <%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"
+    prefix="fmt" %>
+
 <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
 
 <%@ page import="org.dspace.browse.BrowseInfo" %>
@@ -78,80 +81,81 @@
     String prevQuery = (String) request.getAttribute("previous.query");
     String nextQuery = (String) request.getAttribute("next.query");
 
-    // Description of what the user is actually browsing
-    String scopeName = "All of DSpace";
-    if (collection != null)
-    {
-        scopeName = collection.getMetadata("name");
-    }
-    else if (community != null)
-    {
-        scopeName = community.getMetadata("name");
-    }
 %>
 
-<dspace:layout title="Browse by Title">
-
-    <H2>Browsing <%= scopeName %> by Title</H2>
+<dspace:layout titlekey="jsp.browse.items-by-title.title">
 
+    <h2><fmt:message key="jsp.browse.items-by-title.title"/></h2>
     <%-- Title browse controls table --%>
-    <form action="browse-title" method=GET>
-        <table align=center border=0 bgcolor="#CCCCCC" cellpadding=0>
+    <form action="browse-title" method="get">
+        <table align="center" border="0" bgcolor="#CCCCCC" cellpadding="0" summary="Browse the respository by title">
             <tr>
                 <td>
-                    <table border=0 bgcolor="#EEEEEE" cellpadding=2>
+                    <table border="0" bgcolor="#EEEEEE" cellpadding="2"> <%--allow for greek alphabet also--%>
                         <tr>
                             <td class="browseBar">
-                                <span class="browseBarLabel">Jump&nbsp;to:&nbsp;</span>
-                                <A HREF="browse-title?starts_with=0">0-9</A>
+                             <%-- <span class="browseBarLabel">Jump&nbsp;to:&nbsp;</span> --%>
+    							<span class="browseBarLabel"><fmt:message key="jsp.browse.items-by-title.jump"/></span>
+                                 <a href="browse-title?starts_with=0">0-9</a>
 <%
     for (char c = 'A'; c <= 'Z'; c++)
     {
 %>
-                                <A HREF="browse-title?starts_with=<%= c %>"><%= c %></A>
+                                <a href="browse-title?starts_with=<%= c %>"><%= c %></a>
 <%
     }
 %>
                             </td>
                         </tr>
                         <tr>
-                            <td class="browseBar" align=center>
-                                <span class="browseBarLabel">or enter first few letters:&nbsp;</span>
-                                <input type="text" name="starts_with"/>&nbsp;<input type="submit" value="Go!">
-                            </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
+                                <td class="browseBar" align="center">
+                                    <%-- <span class="browseBarLabel">or enter first few letters:&nbsp;</span> --%>
+    								<span class="browseBarLabel"><fmt:message key="jsp.browse.items-by-title.enter"/>&nbsp;</span>
+                                    <%-- <input type="text" name="starts_with"/>&nbsp;<input type="submit" value="Go!"> --%>
+    								<input type="text" name="starts_with"/>&nbsp;<input type="submit" value="<fmt:message key="jsp.browse.general.go"/>" />
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
     </form>
 
-    <BR>
+    <br/>
 
-    <P align=center>
-        Showing items <%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %>
-        of <%= browseInfo.getTotal() %>.
-    </P>
+    <p align="center">
+        <%-- Showing items <%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %>
+        of <%= browseInfo.getTotal() %>. --%>
+		<fmt:message key="jsp.browse.items-by-title.show">
+            <fmt:param><%= browseInfo.getOverallPosition()+1 %></fmt:param>
+            <fmt:param><%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %></fmt:param>
+            <fmt:param><%= browseInfo.getTotal() %></fmt:param>
+        </fmt:message>
+    </p>
 
     <%-- Previous page/Next page --%>
-    <table align=center border=0 width=70%>
+    <table align="center" border="0" width="70%">
         <tr>
-            <td class=standard align=left>
+            <td class="standard" align="left">
 <%
     if (prevQuery != null)
     {
 %>
-                <A HREF="browse-title?<%= prevQuery %>">Previous page</A>
+                <%-- <a href="browse-title?<%= prevQuery %>">Previous page</a> --%>
+				<a href="browse-title?<%= prevQuery %>"><fmt:message key="jsp.browse.general.previous"/></a>
+
 <%
     }
 %>
             </td>
-            <td class=standard align=right>
+            <td class="standard" align="right">
 <%
     if (nextQuery != null)
     {
 %>
-                <A HREF="browse-title?<%= nextQuery %>">Next page</A>
+                <%-- <a href="browse-title?<%= nextQuery %>">Next page</a> --%>
+				<a href="browse-title?<%= nextQuery %>"><fmt:message key="jsp.browse.general.next"/></a>
+
 <%
     }
 %>
@@ -164,30 +168,33 @@
     if (highlight)
     {
         highlightAttribute = String.valueOf(browseInfo.getOffset());
-    }    
+    }
 %>
     <dspace:itemlist items="<%= browseInfo.getItemResults() %>" emphcolumn="title" highlightrow="<%= highlightAttribute %>" />
 
-
     <%-- Previous page/Next page --%>
-    <table align=center border=0 width=70%>
+    <table align="center" border="0" width="70%">
         <tr>
-            <td class=standard align=left>
+            <td class="standard" align="left">
 <%
     if (prevQuery != null)
     {
 %>
-                <A HREF="browse-title?<%= prevQuery %>">Previous page</A>
+                <%-- <a href="browse-title?<%= prevQuery %>">Previous page</a> --%>
+				<a href="browse-title?<%= prevQuery %>"><fmt:message key="jsp.browse.general.previous"/></a>
+
 <%
     }
 %>
             </td>
-            <td class=standard align=right>
+            <td class="standard" align="right">
 <%
     if (nextQuery != null)
     {
 %>
-                <A HREF="browse-title?<%= nextQuery %>">Next page</A>
+                <%-- <a href="browse-title?<%= nextQuery %>">Next page</a> --%>
+				<a href="browse-title?<%= nextQuery %>"><fmt:message key="jsp.browse.general.next"/></a>
+
 <%
     }
 %>

dspace/jsp/browse/no-results.jsp

@@ -48,8 +48,12 @@
 
 <%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
 <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
 
+<%@ page  import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
+
 <%@ page import="org.dspace.content.Community" %>
 <%@ page import="org.dspace.content.Collection" %>
 
@@ -59,31 +63,53 @@
     Collection collection = (Collection) request.getAttribute("collection");
 
     // Description of what the user is actually browsing, and where link back
-    String scopeName = "All of DSpace";
-    String linkText = "DSpace Home";
+    String linkText = LocaleSupport.getLocalizedMessage(pageContext, "jsp.general.home");
     String linkBack = "/";
 
     if(collection != null)
     {
-        scopeName = collection.getMetadata("name");
         linkText = collection.getMetadata("name");
-        linkBack = "/communities/" + community.getID() + "/collections/" +
-            collection.getID() + "/";
+        linkBack = "/handle/" + collection.getHandle();
     }
     else if(community != null)
     {
-        scopeName = community.getMetadata("name");
         linkText = community.getMetadata("name");
-        linkBack = "/communities/" + community.getID() + "/";
+        linkBack = "/handle/" + community.getHandle();
     }
 %>
 
-<dspace:layout title="No Entries in Index">
+<dspace:layout titlekey="jsp.browse.no-results.title">
 
-    <H1>No Entries in Index</H1>
-    
-    <P>There are no entries in the index for <%= scopeName %>.</P>
-    
-    <P><A HREF="<%= request.getContextPath() %><%= linkBack %>"><%= linkText %></A></P>
+    <h1><fmt:message key="jsp.browse.no-results.title"/></h1>
+
+
+<p>
+    <%
+	    if (collection != null)
+	    {
+   %>
+            	<fmt:message key="jsp.browse.no-results.col">
+                    <fmt:param><%= collection.getMetadata("name")%></fmt:param>
+                </fmt:message>
+   <%
+	    }
+	    else if (community != null)
+	    {
+   %>
+   		<fmt:message key="jsp.browse.no-results.com">
+            <fmt:param><%= community.getMetadata("name")%></fmt:param>
+        </fmt:message>
+   <%
+ 	    }
+ 	    else
+ 	    {
+   %>
+   		<fmt:message key="jsp.browse.no-results.genericScope"/>
+   <%
+   	    }
+   %>
+ </p>
+   
+    <p><a href="<%= request.getContextPath() %><%= linkBack %>"><%= linkText %></a></p>
 
 </dspace:layout>