Commit Graph

3 Commits

Author SHA1 Message Date
Mark Diggory
89566dec3d Restore files deleted (on 1.4.x branch) in merge, this is also restoring history on these files.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@1867 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-04-23 17:11:06 +00:00
Mark Diggory
f548bd0d58 Merging revisions upto 1.4.2-beta back to trunk. Below is a list of the revisions included in this merge.
r2271@libaxis1 (orig r1780):  jrutherford | 2007-04-10 09:41:17 -0400
 Branching for 1.4.x development.
 
 r2272@libaxis1 (orig r1781):  jrutherford | 2007-04-10 12:31:50 -0400
 Removed the following patches:
 =========
 (Andrea Bollini)
 - SF Patch #1687815 Search function for select eperson JSPUI
 
 (Richard Jones)
 - SF Patch #1659868 Improved database level debugging
 - SF Patch #1659901 Import community and collection structure
 - SF Patch #1659837 ItemIterator now deals with item ids also
 - SF Patch #1659796 Create administrator wtih command line options
 - SF Patch #1659841 Add option to clear context object cache
 
 (Stuart Lewis)
 - SF Patch #1641678 [dspace]/bin scripts for import and export
 - SF Patch #1642336 Restrict domains of self-registered users
 - SF Patch #1587225 Google and html sitemap generator
 
 (Monika Mevenkamp)
 - SF Patch #1654466 dsprop convenience script
 
 (Dorothea Salo)
 - SF Patch #1557948 Link subjects and authors on item pages
 
 r2276@libaxis1 (orig r1785):  cjuergen | 2007-04-11 08:09:26 -0400
 (James Rutherford)
 - SF Patch #1695702 Update SubmitServlet to use default.language instead of "en" for SF bug 1636792 default.language not applied to new submissions
 r2277@libaxis1 (orig r1786):  cjuergen | 2007-04-11 08:13:24 -0400
 updated year in copyright statement
 r2280@libaxis1 (orig r1789):  mdiggory | 2007-04-11 15:39:28 -0400
 (Mark Diggory/Graham Triggs)
 - SF Patch 1655583 Fixes issues with FilterMedia, the UI and Index locking, includes 
   a lucene upgrade to support better management of index locking.
 r2281@libaxis1 (orig r1790):  jrutherford | 2007-04-12 04:40:31 -0400
 Fixed a bug in DSIndexer where there was a Long/long mixup.
 
 r2284@libaxis1 (orig r1793):  jrutherford | 2007-04-12 06:36:23 -0400
 updated to reflect the removal of lucene-sandbox.jar and the update of
 lucene.jar
 
 r2285@libaxis1 (orig r1794):  mdiggory | 2007-04-12 12:57:15 -0400
 Missing file for  [ 1655583 ] Avoid index lock with filter-media
 r2286@libaxis1 (orig r1795):  mdiggory | 2007-04-12 16:44:29 -0400
 rolling back DSpaceServletContextListener to previous revision.
 r2287@libaxis1 (orig r1796):  jrutherford | 2007-04-14 08:02:09 -0400
 (James Rutherford)
 - SF Patch #1699903 for SF Bug #1695692 make-release-package still uses CVS commands
 
 
 r2288@libaxis1 (orig r1797):  mdiggory | 2007-04-14 23:04:59 -0400
  [ 1655583 ] Avoid index lock with filter-media: More internal solution for orphaned file handles in Microsoft Windows. Close any open IndexSearcher on finalization, works in Servlet Engine or CLI.  Removed IndexReader from DSIndexer, get it from DSQuery so it can be managed there likewise.
 r2289@libaxis1 (orig r1798):  mdiggory | 2007-04-14 23:15:34 -0400
  [ 1655583 ] Correct small logic error introduced in last commit.
 r2290@libaxis1 (orig r1799):  jrutherford | 2007-04-17 08:15:58 -0400
 (Flavio Botelho)
 - SF Patch #1601946 for SF Bug #1601875 - Makes javascript idependent to form position
 
 r2455@libaxis1 (orig r1856):  jrutherford | 2007-04-20 06:40:41 -0400
 (Claudia Juergen)
 - SF Patch #1702177 For SF bug #1638605 bin/cleanup fails on deleted primary bitstream
 
 
 r2456@libaxis1 (orig r1857):  stuartlewis | 2007-04-20 08:33:26 -0400
 SF Patch #1445573 Stats not working in Oracle
 r2457@libaxis1 (orig r1858):  stuartlewis | 2007-04-20 08:36:01 -0400
 SF Patch #1445573 Stats not working in Oracle
 r2458@libaxis1 (orig r1859):  cjuergen | 2007-04-20 09:02:19 -0400
 Bouncy Castle libs required by the current pdfbox.jar for text extraction of encrypted pdf's
 r2459@libaxis1 (orig r1860):  cjuergen | 2007-04-20 09:02:49 -0400
 Bouncy Castle libs required by the current pdfbox.jar for text extraction of encrypted pdf's
 r2460@libaxis1 (orig r1861):  cjuergen | 2007-04-20 09:03:14 -0400
 License for Bouncy Castle libs required by the current pdfbox.jar for text extraction of encrypted pdf's
 r2461@libaxis1 (orig r1862):  cjuergen | 2007-04-20 09:03:29 -0400
 License for Bouncy Castle libs required by the current pdfbox.jar for text extraction of encrypted pdf's


git-svn-id: http://scm.dspace.org/svn/repo/trunk@1866 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-04-23 14:20:41 +00:00
James Rutherford
236951fa78 (Stuart Lewis)
- SF Patch #1670110 for SF Bug #1670106 Onebox and textarea fail when visibility set to workflow
- SF Patch #1628889 Improve file size descriptions in ItemTag
- SF Patch #1641678 [dspace]/bin scripts for import and export


git-svn-id: http://scm.dspace.org/svn/repo/trunk@1765 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2007-04-06 14:15:48 +00:00