Commit Graph

1876 Commits

Author SHA1 Message Date
Richard Jones
d378aef30f mass commit of broken code for identifiers. Fixes coming up over the next couple of weeks.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2583 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-29 14:28:53 +00:00
Mark Diggory
2c34bf1bf8 Complete JSPUI reorganization. Merge changes from 1.5 including java and webapp relocations and pom edits.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2579 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-27 02:52:17 +00:00
Graham Triggs
380a9f02ac Minor corrections following the generalisation of sort ordering
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2568 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-25 16:09:21 +00:00
Richard Jones
f2f2569022 fix title display of item on jsp-ui
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2563 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-22 15:39:59 +00:00
Tim Donohue
d69626c9ce Fixing order of copy processes in 'ant update'. Previously it was overwriting everything in [dspace]/etc, and *then* backing that up to [dspace]/etc.bak-{build.date}. Fixed it to perform backup of /etc first!
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2558 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-16 20:30:51 +00:00
Tim Donohue
fe152ed100 Updated 'echo' comments that are returned when running 'ant update' or 'ant fresh_install'. The comments had not been fully updated for the 1.5 build/install process.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2542 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-15 22:29:12 +00:00
Mark Diggory
5e5cd8cf4f Remove vestigial History tables from database schema and add DROP TABLE in update schemas.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2536 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-15 19:58:12 +00:00
Graham Triggs
1c068b2132 Fix problem with DatabaseManager retrieving column information if the database contains multiple schemas
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2530 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-15 13:50:15 +00:00
Mark Diggory
e199e7f17e bring along etc directory into install so that any sql upgrade code can be run from either dspace.home or from target/dspace-./
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2511 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-10 22:07:32 +00:00
Graham Triggs
20f921b7c8 First part of search update - reduce search size, add in fields for sorting content, lessen dependency on handles
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2509 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-10 14:04:16 +00:00
Richard Jones
071e1d2b9c extend identification mechanism to include Group objects. These could now technically be made resolvable through the UI using a unique URL.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2506 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-10 08:43:50 +00:00
Richard Jones
68f8572e8a extend identification mechanism to include EPerson objects. These could now technically be made resolvable through the UI using a unique URL.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2505 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-09 17:54:36 +00:00
Richard Jones
d8cfa7304c extend identification mechanism to non-DSpaceObject objects. This introduces a SimpleIdentifier which offers a basic wrapper for UUIDs, which is in turn extended by ObjectIdentifier to allow DSpaceObjects to take advantage of this type heirarchy. DSpaceIdentifier has been renamed ResolvableIdentifier which ObjectIdentifier and ExternalIdentifier now implement, so that it is clear that objects can be obtained from identifiers implementing this interface, but not from the SimpleIdentifier. With the addition of an Identifiable interface, we can now tag classes to be identifiable, with their choice of exactly which identifier mechanisms they wish to support. There is also the beginning of formal exception handling.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2504 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-09 11:47:36 +00:00
Mark Diggory
062a102c51 Merge to trunk:
Reordering Submission Aspect after EPerson Aspect corrects bug where "My Account" title disappears when logged in. Unsure why bug occurs.

git-svn-id: http://scm.dspace.org/svn/repo/trunk@2501 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-09 00:09:48 +00:00
Tim Donohue
f83ebc1dd4 Fixes to DTD based on merged version of the item-submission.xml
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2497 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-08 22:50:29 +00:00
Tim Donohue
49386c1c5d Merging recent Config Submission changes from 1.5.x Branch into Trunk:
(From earlier today)
Merged 'item-submission-JSPUI.xml' and 'item-submission-XMLUI.xml' files into a single 'item-submission.xml' configuration file (based on suggestions from Graham Triggs).  

Small updates throughout API for Configurable Submission to support this merged configuration file (majority of changes in dspace-api and dspace-jspui modules).   Also includes updates to Configurable Submission documentation and small updates to I18N to make the XMLUI and JSPUI keys more parallel.

git-svn-id: http://scm.dspace.org/svn/repo/trunk@2494 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-08 20:02:59 +00:00
Tim Donohue
50cbccfd26 Merging recent Config Submission changes from 1.5.x Branch into Trunk:
(From Jan 4)
Various bug fixes to JSP-UI file upload step:
Fixed NPE when no file selected to upload.  Fixed small bug in processing of upload-error.jsp (was not returning to file upload screen).  Fixed ability to enable *skipping* uploading a file during JSPUI submission (some of the code never made it into 1.5 codebase during my original Config Submission patch, so this feature was not working properly).

git-svn-id: http://scm.dspace.org/svn/repo/trunk@2493 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-08 19:45:52 +00:00
James Rutherford
c6599aafcb Moved all database creation SQL into the main database_schema.sql, removing the old DAO-specific file. Updated the build.xml to reflect changes.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2488 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-08 11:04:41 +00:00
Richard Jones
775078c133 initial code to allow arbitrary identifier schemes to be used as the basis for the DSpace standard url scheme. If a namespace is set in the configuration, the IdentifierFactory will attempt to construct an internal style url based on this scheme, and fall back to standard object identifiers if unsuccessful. This requires a change in the way that URLs for objects are constructed for the UI, which has so far only been implemented in the BrowseListTag as a demonstrator. This needs to be further rolled out across the code base.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2480 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-04 17:33:41 +00:00
Richard Jones
45d50eab9f re-introduce the LNI module into the build process. I can't verify directly that this is functioning correctly, but the code compiles and looks correct. Further testing will be required to ensure that identifier management is being done properly. I have endeavoured to make additional changes to the DAVDSpaceObject which make sure that LNI resource paths are now actually assembled using the canonical forms of the UUIDs associated with items, and not their handles, which ought to mean that the resolution code is now also working. Further work is needed to move the LNI away from its reliance on the semantics of handles, but this is too much for the moment.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2479 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2008-01-04 16:20:27 +00:00
Graham Triggs
0499f077b9 Added "db.poolname" configuration (so that multiple applications can share a single DBCP). Also add a shutdown method to allow web applications to clean up on undeploy.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2469 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-29 22:20:07 +00:00
Richard Jones
9b9522d190 Complete initial implementation of the external identification mechanism. This includes a generalised object and storage model for external identifiers, as well as tools to manage the plugin stack for allowing pluggable identification mechanisms. There is a partial implementation of all the handle kit, which is still to be finalised, but which allows for assignment of handles to all DSpaceObjects, and will currently resolve handles only to DSpace Items. This new object model and process is then implemented throughout the dspace-api, and dspace-jspui modules, but will currently not work with the dspace-xmlui module (it will not currently compile against the dspace-api module, and will continue to remain inactive until the API for external and internal identifiers has been stabilised and changes can be propagated) or the dspace-lni module. There are additional changes to the dspace-jspui module which improve the display mechanics for both external and internal identifiers. Please note: the changes have not been tested in all contexts, and bugs will undoubtedly remain in areas such as RSS feeds, statistical reports, and so on.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2458 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-21 12:25:59 +00:00
Richard Jones
977a58d054 fix uuid assignment and storage mechanism throughout core object model. This adds relevant ObjectIdentifier management techniques to the object model, and manages their creation, assignment, update and removal through the DAO layer. It also adds a de-normalised index of uuids for rapid access to the content objects. The URIServlet is updated to be able to resolve UUID based URLs to the DSpaceObject which they pertain to. Currently, the handle and other external identifier mechanisms are not in line with this code, so they will not function yet. Also attached are database schema files for creating the relevant underlying storage in postgres.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2445 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-14 16:19:54 +00:00
Mark Diggory
2a9f0b81c3 r8829@libaxis1 (orig r2435): mdiggory | 2007-12-13 14:26:33 -0500
Allow X509Authentication to be triggered from Login Choices page as well. Default is old behavior, This allows one to maintain the site under http and only protect certificate login page with https for certificate authentication. Implicit X509 Authentication is not ideal in relation to default Internet Explorer behavior.


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2441 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-14 05:00:53 +00:00
James Rutherford
5eb2087bfc Fixed some NPEs and a typo in the input forms DTD.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2430 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-13 11:54:46 +00:00
James Rutherford
7091b0c32b Fixed a minor typo in the configuration.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2428 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-13 10:25:01 +00:00
James Rutherford
410854970e Migrated org.dspace.storage.dao to org.dspace.dao, and rearranged the stackable DAO interfaces & classes a bit. I've also refactored the EPerson DAOs to take advantage of the refined mechanism.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2425 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-12 14:52:52 +00:00
Mark Diggory
467fab985d r8785@libaxis1 (orig r2421): mdiggory | 2007-12-10 16:34:12 -0500
Enable METS OAI Crosswalk by default.


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2423 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-11 05:00:21 +00:00
Mark Diggory
982b2caffd r8784@libaxis1 (orig r2420): mdiggory | 2007-12-10 16:31:39 -0500
correct dateCreated and dateIssued mappings in mods-submission xsl


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2422 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-11 05:00:15 +00:00
Mark Diggory
e5ec28d621 Restore Version to "SNAPSHOT"
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2418 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-10 17:15:04 +00:00
Mark Diggory
f1c004f5b0 This commit introduces the DAO prototype to trunk. This merge contains the works of James Rutherford (jrutherford) et. al. found in the DAO prototype branch revision number 1502 located here:
http://dspace-sandbox.googlecode.com/svn/branches/dao-prototype/

Further details can be found at the following WIKI page http://wiki.dspace.org/DSpace_1.6


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2417 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-10 17:00:07 +00:00
James Rutherford
89683e07e2 Fixed a bug in the cleanup script where any arguments passed in would be ignored.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2416 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-06 11:47:48 +00:00
Mark Diggory
ce6c29b497 r8715@libaxis1 (orig r2412): grahamtriggs | 2007-12-01 06:17:19 -0500
Updated schema to remove the old browse tables that are no longer used


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2413 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-02 05:00:17 +00:00
Mark Diggory
aa26ca4418 r8710@libaxis1 (orig r2410): tdonohue | 2007-11-30 13:14:41 -0500
Small addition of a "Skip" flag to MediaFilterManager/filter-media. Allows one to specific a list of identifiers (communities/collections/items) to SKIP during filtering process.  Updated documentation to explain this new flag.


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2411 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-12-01 05:00:17 +00:00
Mark Diggory
e15942f3e6 r8682@libaxis1 (orig r2406): grahamtriggs | 2007-11-29 06:58:05 -0500
Improved browse configuration (ability to hide sort options from the browse controls, can set left-hand navigation to asc and/or desc lists). Improves normalisation of titles.


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2408 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-30 05:00:35 +00:00
Mark Diggory
820e9a6a94 r8652@libaxis1 (orig r2398): mdiggory | 2007-11-28 16:07:34 -0500
New options for ItemImporter to support bitstream permissions and descriptions


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2403 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-29 05:00:44 +00:00
Mark Diggory
cea5f6f57c r8625@libaxis1 (orig r2393): tdonohue | 2007-11-27 17:03:24 -0500
Applying SF patch #1589429 - "Self-Named" Media Filters (i.e. MediaFilter Plugins!)
 [This original patch was modified slightly to leave the existing MediaFilter abstract class intact, 
 and instead create a new FormatFilter interface which MediaFilter now implements]


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2395 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-28 05:35:58 +00:00
Stuart Lewis
4cf8e13002 (Richard Jones) SF Patch 1659868 - improved database level debugging
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2391 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-27 09:37:01 +00:00
Mark Diggory
293b1f3538 r8500@libaxis1 (orig r2365): grahamtriggs | 2007-11-26 05:24:51 -0500
And the update script - changed 'number' column to 'count' as number is a reserved word in Oracle


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2386 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-26 20:28:44 +00:00
Mark Diggory
d09592f42f r8499@libaxis1 (orig r2364): grahamtriggs | 2007-11-26 05:21:46 -0500
Changed 'number' column to 'count' as number is a reserved word in Oracle


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2385 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-26 20:28:33 +00:00
Mark Diggory
9a5065452d r8488@libaxis1 (orig r2359): grahamtriggs | 2007-11-25 12:25:41 -0500
Add BMP to the default list of formats read by the JPEGFilter, as it is supported in Java 5


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2381 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-26 20:27:56 +00:00
Mark Diggory
c485143eed r8487@libaxis1 (orig r2358): grahamtriggs | 2007-11-25 08:29:44 -0500
Renamed recent.submissions.index to recent.submissions.sort-option
 This is to avoid confusion with index names and sort options - also updated configuration documentation to correctly refer to sort-option and not index


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2380 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-26 20:27:49 +00:00
Mark Diggory
0d31c38ba6 r8485@libaxis1 (orig r2357): grahamtriggs | 2007-11-24 18:08:54 -0500
Removed authorlinks and subjectlinks configuration, as they were no longer used following Andrea's update


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2379 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-26 20:27:31 +00:00
Mark Diggory
aba19a44ea r8479@libaxis1 (orig r2355): grahamtriggs | 2007-11-22 05:22:56 -0500
Add ability to customise the item list display for different browse indexes and sort options


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2377 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-26 20:27:12 +00:00
Mark Diggory
db797f1379 Again attach assembly of directory to package phase.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2349 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-19 16:16:01 +00:00
Mark Diggory
8aa7904dfd 1.) Adjust scm location to be in the trunk.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2342 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-13 01:20:19 +00:00
Mark Diggory
ed0bc8eaf3 Merge back to trunk from dspace-1_5_x branch
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2340 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-12 23:49:18 +00:00
Richard Jones
242d43a696 Option to generate community and collection "strength" as a batch job
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2329 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-12 12:00:32 +00:00
Mark Diggory
c5c4049a99 Merging formating changes back from branch.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2311 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-05 18:58:36 +00:00
Mark Diggory
eed1641525 r7757@libaxis1 (orig r2272): mdiggory | 2007-10-25 14:10:16 -0400
Adjusting versioning to 1.5-alpha


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2306 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-11-05 18:29:09 +00:00