[sakai] svn commit: r71469 - in search/branches/post-2.6: . search-impl/impl/src/java/org/sakaiproject/search/index/impl search-impl/impl/src/java/org/sakaiproject/search/journal/impl search-impl/impl/src/java/org/sakaiproject/search/optimize/shared/impl search-impl/impl/src/test/org/sakai/search/index/impl/test search-impl/impl/src/test/org/sakaiproject/search/index/soaktest search-impl/impl/src/test/org/sakaiproject/search/indexer/impl/test search-tool/tool/src/java/org/sakaiproject/search/tool search-util/src/java/org/sakaiproject/search/util

[david.horwitz at uct.ac.za]

Details: http://source.sakaiproject.org/viewsvn?root=svn&view=rev&rev=71469

Author: david.horwitz at uct.ac.za
Date: 2010-01-15 01:43:42 -0500 (Fri, 15 Jan 2010)
New Revision: 71469

Modified:
   search/branches/post-2.6/
   search/branches/post-2.6/search-impl/impl/src/java/org/sakaiproject/search/index/impl/SegmentState.java
   search/branches/post-2.6/search-impl/impl/src/java/org/sakaiproject/search/journal/impl/JournaledFSIndexStorage.java
   search/branches/post-2.6/search-impl/impl/src/java/org/sakaiproject/search/optimize/shared/impl/DbJournalOptimizationManager.java
   search/branches/post-2.6/search-impl/impl/src/test/org/sakai/search/index/impl/test/ClusterFSIndexStorageEclipsetest.java
   search/branches/post-2.6/search-impl/impl/src/test/org/sakaiproject/search/index/soaktest/SharedTestDataSource.java
   search/branches/post-2.6/search-impl/impl/src/test/org/sakaiproject/search/indexer/impl/test/DbJournalManagerTest.java
   search/branches/post-2.6/search-impl/impl/src/test/org/sakaiproject/search/indexer/impl/test/TDataSource.java
   search/branches/post-2.6/search-tool/tool/src/java/org/sakaiproject/search/tool/SearchBeanImpl.java
   search/branches/post-2.6/search-util/src/java/org/sakaiproject/search/util/FileUtils.java
Log:
> svn log -r70909 https://source.sakaiproject.org/svn/search/trunk/
------------------------------------------------------------------------
r70909 | david.horwitz at uct.ac.za | 2010-01-05 09:08:16 +0200 (Tue, 05
Jan 2010) | 2 lines

SAK-17638

------------------------------------------------------------------------
dhorwitz at david-horwitz-4:~/branchManagement/search_post-2.6> svn merge
-c70909 https://source.sakaiproject.org/svn/search/trunk/
--- Merging r70909 into '.':
U
search-impl/impl/src/java/org/sakaiproject/search/index/impl/SegmentState.java
dhorwitz at david-horwitz-4:~/branchManagement/search_post-2.6> svn merge
-c70911 https://source.sakaiproject.org/svn/search/trunk/
--- Merging r70911 into '.':
U
search-tool/tool/src/java/org/sakaiproject/search/tool/SearchBeanImpl.java
U    search-util/src/java/org/sakaiproject/search/util/FileUtils.java
U
search-impl/impl/src/java/org/sakaiproject/search/journal/impl/JournaledFSIndexStorage.java
dhorwitz at david-horwitz-4:~/branchManagement/search_post-2.6> svn merge
-c70912 https://source.sakaiproject.org/svn/search/trunk/
--- Merging r70912 into '.':
U
search-impl/impl/src/test/org/sakai/search/index/impl/test/ClusterFSIndexStorageEclipsetest.java
dhorwitz at david-horwitz-4:~/branchManagement/search_post-2.6> svn merge
-c70972 https://source.sakaiproject.org/svn/search/trunk/
--- Merging r70972 into '.':
U
search-impl/impl/src/java/org/sakaiproject/search/optimize/shared/impl/DbJournalOptimizationManager.java
dhorwitz at david-horwitz-4:~/branchManagement/search_post-2.6> svn merge
-c70973 https://source.sakaiproject.org/svn/search/trunk/
--- Merging r70973 into '.':
U
search-impl/impl/src/test/org/sakaiproject/search/index/soaktest/SharedTestDataSource.java
U
search-impl/impl/src/test/org/sakaiproject/search/indexer/impl/test/DbJournalManagerTest.java
U
search-impl/impl/src/test/org/sakaiproject/search/indexer/impl/test/TDataSource.java