Uploaded image for project: 'Sakai'
  1. Sakai
  2. SAK-10366

Branch to develop a JSR-170 Backed Content Hosting Serivce

    Details

      Description

      We are going to make a branch to modify Content Hosting Service so that it will work ontop of JSR-170 (probablty the JCRService in contrib)

      Ian Boston
      Jim Eng
      Linda M Place

      will be involved in this patch.

      We intend to test it with the UoM dataset to ensure that it can cope with 1.5TB of data.
      Aiming to be available in 2.5

        Gliffy Diagrams

          Attachments

            Activity

            ianeboston Ian Boston created issue -
            Hide
            ianeboston Ian Boston added a comment -
            Show
            ianeboston Ian Boston added a comment - Branch has been created https://source.sakaiproject.org/svn//content/branches/SAK-10366/
            Hide
            ianeboston Ian Boston added a comment -

            First pass at a base JCR layer is now in the Branch. It extends DbContentService and create a new implementation of Storage that uses a LiteStorageUser that is unbound from XML DOM for create Resources.

            This layer binds to the JCRService which stacks wht whole of CHS on JCR rather than on the DB

            Show
            ianeboston Ian Boston added a comment - First pass at a base JCR layer is now in the Branch. It extends DbContentService and create a new implementation of Storage that uses a LiteStorageUser that is unbound from XML DOM for create Resources. This layer binds to the JCRService which stacks wht whole of CHS on JCR rather than on the DB
            Repository Revision Date User Message
            Sakai Trunk Repository #31525 Mon Jun 11 09:05:43 CDT 2007 ian@caret.cam.ac.uk Starting Branch SAK-10366
            See JIRA for definition
            Files Changed
            ADD /content/branches/SAK-10366 (from /content/trunk)
            Hide
            ianeboston Ian Boston added a comment -

            I have moved the Storage Layer out of the JCRContentService partially to discover where the internal hidden links to protected class members are in parent classes. There appear to be quite a number.

            It also looks like the storage is split between the Storage layer and the DbContentService with direct access in DbContentService in a number of places especially with commits mid stream.

            The other area of concern is the use of setting UUID on an item which should be immutable, as part othe move operations. It may be necessary to bind down to the move operation in the JCR as this will be far faster than serializing all the content into the JVM and then out again to perform the move, rather than just moving the node.

            Show
            ianeboston Ian Boston added a comment - I have moved the Storage Layer out of the JCRContentService partially to discover where the internal hidden links to protected class members are in parent classes. There appear to be quite a number. It also looks like the storage is split between the Storage layer and the DbContentService with direct access in DbContentService in a number of places especially with commits mid stream. The other area of concern is the use of setting UUID on an item which should be immutable, as part othe move operations. It may be necessary to bind down to the move operation in the JCR as this will be far faster than serializing all the content into the JVM and then out again to perform the move, rather than just moving the node.
            Hide
            ianeboston Ian Boston added a comment -

            resolveUUID, getUUID, findUUID, findInternalUUID all appear to do the same thing. The first 3 are in the API. These are being routed to a single getUUID with simple semantics. The catch throwable in resolve never gets triggered unless the DB is down.

            Show
            ianeboston Ian Boston added a comment - resolveUUID, getUUID, findUUID, findInternalUUID all appear to do the same thing. The first 3 are in the API. These are being routed to a single getUUID with simple semantics. The catch throwable in resolve never gets triggered unless the DB is down.
            ianeboston Ian Boston made changes -
            Field Original Value New Value
            Status Open [ 1 ] In Progress [ 3 ]
            knoop Peter A. Knoop made changes -
            Component/s Content (SVN module) [ 10590 ]
            Component/s Resources [ 10020 ]
            Component/s WebDAV [ 10073 ]
            Hide
            ianeboston Ian Boston added a comment -

            The layer is now working, but there are some issues that need sorting out.

            1. CHS relies heavily on the trailing / in entity names to identify collections, JCR uses a node type and so the path separator is not significant. The use of this in CHS is variable as it also relies on the BaseContentCollectionEdit class and the IS_COLLECTION property. In some places there is code that uses all three of these, but will never execute certain paths since its impossible.

            2. The Tool layer appears to be making repeated demands for the same entity over and over again in the same request cycle. For instance for each control on the UI (the name, the dropdown, the member count) it will individually ask all the way down to the storage layer to findCollection(id). Without caching of the ContentCollectionEdit in the storage layer, you will get this object created 10 or more time per request, when its really the same object. This is from the tool.

            3. The caching layer in the thread local (inside BaseContentService) appears to re-create the object by copying it, which leaves the request cycle in a variable state. You might (and do) end up with 10 or more copies of a ContentCollectionEdit (or resource) in memory with only one of them in edit mode. This must lead to inconsistancies.

            I am not intending to fix all these problems since it will mean major surgery on the Resources Tool which Jim is working on but I do have to work around them in the CHS - JCR layer.

            Show
            ianeboston Ian Boston added a comment - The layer is now working, but there are some issues that need sorting out. 1. CHS relies heavily on the trailing / in entity names to identify collections, JCR uses a node type and so the path separator is not significant. The use of this in CHS is variable as it also relies on the BaseContentCollectionEdit class and the IS_COLLECTION property. In some places there is code that uses all three of these, but will never execute certain paths since its impossible. 2. The Tool layer appears to be making repeated demands for the same entity over and over again in the same request cycle. For instance for each control on the UI (the name, the dropdown, the member count) it will individually ask all the way down to the storage layer to findCollection(id). Without caching of the ContentCollectionEdit in the storage layer, you will get this object created 10 or more time per request, when its really the same object. This is from the tool. 3. The caching layer in the thread local (inside BaseContentService) appears to re-create the object by copying it, which leaves the request cycle in a variable state. You might (and do) end up with 10 or more copies of a ContentCollectionEdit (or resource) in memory with only one of them in edit mode. This must lead to inconsistancies. I am not intending to fix all these problems since it will mean major surgery on the Resources Tool which Jim is working on but I do have to work around them in the CHS - JCR layer.
            knoop Peter A. Knoop made changes -
            Issue Type Task [ 3 ] Branch [ 7 ]
            knoop Peter A. Knoop made changes -
            Component/s  New Tool (Feature Requests only) [ 10472 ]
            knoop Peter A. Knoop made changes -
            Workflow jira [ 22774 ] Sakai [ 31361 ]
            Hide
            ianeboston Ian Boston added a comment -

            SAK-10366 branch is now synchronized with Trunk content hosting and works. (somewhat, I havent tested everything)

            This branch replaced the Database Storage layer in Content Hosting Service with a JCR/JSR-170 Storage layer.

            To try it out (if you are feeling brave)

            ---------------------------------------------------------------------------

            Check out a JCRService implementation

            svn co https://source.sakaiproject.org/contrib//tfd/trunk/jackrabbitservice
            cd jackrabbitservice
            mvn -Dmaven.tomcat.home=/Users/ieb/mytomcat clean install sakai:deploy

            (The 1060 unit tests in the jackrabbit build may need a mysql db, I think they use Derby but I cant remember)

            then Checkout SAK-10366

            svn co https://source.sakaiproject.org/svn/content/SAK-10366
            cd SAK-10366
            mvn -Dmaven.tomcat.home=/Users/ieb/mytomcat clean install sakai:deploy

            configure sakai.properties to make the JCRService use MySQL

            dbDialect@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=mysql
            dbUser@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=sakai22
            dbPass@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=sakai22
            dbDriver@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=com.mysql.jdbc.Driver
            dbURL@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=jdbc:mysql://127.0.0.1:3306/sakai22?useUnicode=true&characterEncoding=UTF-8
            contentOnFilesystem@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=false
            journalLocation@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=/Users/ieb/Caret/sakai22/shared/jcr-journal/
            dataSourcePersistanceManager@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=false

            startup tomcat

            You should see lots of JCR messages fly past with no exceptions upto the Tomcat Started point.

            there is a jcr-webdav installation at
            http://localhost:8080/jcr-webdav/repository/default/sakai

            login as admin admin

            And the normal webdav and resources will also work. (I was last having some problems with Dublin Core meta data, reported file sizes and the mime type in jcr webdav)

            --------------------------------------------------------------------------

            I will continue working on this over the next 2 weeks.

            Ian

            Show
            ianeboston Ian Boston added a comment - SAK-10366 branch is now synchronized with Trunk content hosting and works. (somewhat, I havent tested everything) This branch replaced the Database Storage layer in Content Hosting Service with a JCR/JSR-170 Storage layer. To try it out (if you are feeling brave) --------------------------------------------------------------------------- Check out a JCRService implementation svn co https://source.sakaiproject.org/contrib//tfd/trunk/jackrabbitservice cd jackrabbitservice mvn -Dmaven.tomcat.home=/Users/ieb/mytomcat clean install sakai:deploy (The 1060 unit tests in the jackrabbit build may need a mysql db, I think they use Derby but I cant remember) then Checkout SAK-10366 svn co https://source.sakaiproject.org/svn/content/SAK-10366 cd SAK-10366 mvn -Dmaven.tomcat.home=/Users/ieb/mytomcat clean install sakai:deploy configure sakai.properties to make the JCRService use MySQL dbDialect@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=mysql dbUser@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=sakai22 dbPass@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=sakai22 dbDriver@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=com.mysql.jdbc.Driver dbURL@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=jdbc:mysql://127.0.0.1:3306/sakai22?useUnicode=true&characterEncoding=UTF-8 contentOnFilesystem@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=false journalLocation@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=/Users/ieb/Caret/sakai22/shared/jcr-journal/ dataSourcePersistanceManager@org.sakaiproject.jcr.api.JCRService.repositoryBuilder=false startup tomcat You should see lots of JCR messages fly past with no exceptions upto the Tomcat Started point. there is a jcr-webdav installation at http://localhost:8080/jcr-webdav/repository/default/sakai login as admin admin And the normal webdav and resources will also work. (I was last having some problems with Dublin Core meta data, reported file sizes and the mime type in jcr webdav) -------------------------------------------------------------------------- I will continue working on this over the next 2 weeks. Ian
            Repository Revision Date User Message
            Sakai Trunk Repository #32944 Fri Jul 20 17:46:55 CDT 2007 ian@caret.cam.ac.uk Recreating Branch with new update from Trunk: NEW MERGE POINT
            SAK-10366
            Files Changed
            ADD /content/branches/SAK-10366 (from /content/trunk)
            Repository Revision Date User Message
            Sakai Trunk Repository #32945 Fri Jul 20 17:59:36 CDT 2007 ian@caret.cam.ac.uk Updated SAK-10366 to latest trunk and merget all changes.

            This commit represents a patch against the thrunk at 32942 that will at JCR Storage to the CHS replacing the DB Storage.

            To use, you will need to deploy a JCRService and have the JCRService API's in your local maven repo
            Files Changed
            ADD /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/BaseJCRResourceEdit.java
            MODIFY /content/branches/SAK-10366/content-api/api/src/java/org/sakaiproject/content/api/ContentHostingHandler.java
            MODIFY /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/DbContentService.java
            MODIFY /content/branches/SAK-10366/content-impl/.classpath
            ADD /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/jcr
            ADD /content/branches/SAK-10366/content-impl/impl/src/config/org/sakaiproject
            ADD /content/branches/SAK-10366/content-impl/pack/src/webapp/WEB-INF/components-jcr.xml
            ADD /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/LiteStorageUser.java
            ADD /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/BaseJCRStorage.java
            ADD /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/JCRContentService.java
            ADD /content/branches/SAK-10366/content-impl/impl/src/config/org/sakaiproject/content/imp
            MODIFY /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/BaseContentService.java
            ADD /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/JCRStorageUser.java
            ADD /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/jcr/DAVConstants.java
            ADD /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/jcr/JCRConstants.java
            ADD /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/BaseJCRCollectionEdit.java
            ADD /content/branches/SAK-10366/content-impl/impl/src/config/org/sakaiproject/content/imp/CHSNodeTypes.xml
            ADD /content/branches/SAK-10366/content-impl/impl/src/config/org/sakaiproject/content
            MODIFY /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/ContentHostingHandlerResolverImpl.java
            ADD /content/branches/SAK-10366/content-api/api/src/java/org/sakaiproject/content/api/OperationDelegationException.java
            ADD /content/branches/SAK-10366/content-impl/impl/src/config/org
            ADD /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/JCRStorage.java
            MODIFY /content/branches/SAK-10366/content-impl/pack/src/webapp/WEB-INF/components.xml
            ADD /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/ThreadLocalCache.java
            MODIFY /content/branches/SAK-10366/content-api/api/src/java/org/sakaiproject/content/api/ContentHostingHandlerResolver.java
            ADD /content/branches/SAK-10366/content-impl/impl/src/java/org/sakaiproject/content/impl/jcr/SakaiConstants.java
            MODIFY /content/branches/SAK-10366/content-impl/impl/pom.xml
            Hide
            dlhaines David Haines added a comment -

            I'm not quite sure where to find out if JSR 170 will make easy to implement an un-delete / soft delete capability. That would make a lot of people happy.

            Show
            dlhaines David Haines added a comment - I'm not quite sure where to find out if JSR 170 will make easy to implement an un-delete / soft delete capability. That would make a lot of people happy.
            knoop Peter A. Knoop made changes -
            Workflow Sakai [ 31361 ] jira [ 43580 ]
            Repository Revision Date User Message
            Sakai Trunk Repository #34055 Thu Aug 16 08:06:14 CDT 2007 ian@caret.cam.ac.uk SAK-10366

            This is the merge of the SAK-10366 branch.
            The JCR Code is isolates and not part of the build at the moment,
            content-impl-jcr/impl needs to be activated in the build once the JCR API is in place.

            To use you will need to deactivate the standard content-impl-pact and active content-impl-jcr-pack
            which contains both the DB content service and the JCR content service.

            You will also need to deploy a JCR implementation into Sakai to provide the JCRService
            Files Changed
            ADD /content/trunk/content-impl-jcr
            ADD /content/trunk/content-impl-jcr/impl/src/java/org
            MODIFY /content/trunk/content-impl/impl/pom.xml
            ADD /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/jcr/SakaiConstants.java
            ADD /content/trunk/content-impl-jcr/pack
            ADD /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/BaseJCRCollectionEdit.java
            ADD /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content
            ADD /content/trunk/content-impl-jcr/impl/src/config
            ADD /content/trunk/content-impl-jcr/impl/src/bundle
            ADD /content/trunk/content-impl-jcr/impl
            ADD /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/BaseJCRStorage.java
            ADD /content/trunk/content-impl-jcr/pack/src/webapp/WEB-INF/components.xml
            ADD /content/trunk/content-impl-jcr/pack/src/webapp/WEB-INF
            ADD /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/JCRStorageUser.java
            ADD /content/trunk/content-api/api/src/java/org/sakaiproject/content/api/OperationDelegationException.java (from /content/branches/SAK-10366/content-api/api/src/java/org/sakaiproject/content/api/OperationDelegationException.java)
            ADD /content/trunk/content-impl-jcr/.project
            ADD /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/BaseJCRResourceEdit.java
            ADD /content/trunk/content-impl-jcr/pack/src
            MODIFY /content/trunk/content-api/api/src/java/org/sakaiproject/content/api/ContentHostingHandler.java
            ADD /content/trunk/content-impl-jcr/.classpath
            MODIFY /content/trunk/content-impl/impl/src/java/org/sakaiproject/content/impl/DbContentService.java
            ADD /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject
            ADD /content/trunk/content-impl-jcr/pack/src/webapp/WEB-INF/components-jcr.xml
            ADD /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/JCRStorage.java
            ADD /content/trunk/content-impl-jcr/impl/src/sql
            ADD /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/LiteStorageUser.java
            ADD /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/ThreadLocalCache.java
            ADD /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl
            ADD /content/trunk/content-impl-jcr/impl/src
            ADD /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/JCRContentService.java
            MODIFY /content/trunk/content-impl/.classpath
            MODIFY /content/trunk/content-impl/impl/src/java/org/sakaiproject/content/impl/BaseContentService.java
            ADD /content/trunk/content-impl-jcr/impl/src/java
            ADD /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/jcr
            ADD /content/trunk/content-impl-jcr/pack/pom.xml
            MODIFY /content/trunk/pom.xml
            ADD /content/trunk/content-impl-jcr/impl/pom.xml
            MODIFY /content/trunk/content-impl/impl/src/java/org/sakaiproject/content/impl/ContentHostingHandlerResolverImpl.java
            MODIFY /content/trunk/content-api/api/src/java/org/sakaiproject/content/api/ContentHostingHandlerResolver.java
            ADD /content/trunk/content-impl-jcr/pack/src/webapp
            Hide
            ianeboston Ian Boston added a comment -

            Soft delete,
            JSR-170 has versioning of everything, so a soft delete, undelete should be relatively easy.

            Show
            ianeboston Ian Boston added a comment - Soft delete, JSR-170 has versioning of everything, so a soft delete, undelete should be relatively easy.
            Hide
            ianeboston Ian Boston added a comment -

            The branch is now merged into trunk.

            In the process I have separated out the JCR dependencies from the main build so that you dont have to have a) JCR running in trunk/2.5.

            In the base pom.xml for content there are 2 new projects content-impl-jrc/impl and content-impl-jrc/pack

            impl builds the JCR extension jar that provides JCR storage and depends on the sakai jcr api.
            pack is an alternative pack to the standard DB CHS pack. This pack contains both the DB CHS and the JCR CHS

            For the moment, we will build the impl but not peform the pack so the JCR jar will not appear in the running Sakai.

            As we migrate we will continue to build the DB CHS (and the JCR CHS jar) but will move to the jcr pack.

            There is no need to change what is checked out, since build configuration is now all done with the pom.xml and not as a result of the code being present on disk.

            Show
            ianeboston Ian Boston added a comment - The branch is now merged into trunk. In the process I have separated out the JCR dependencies from the main build so that you dont have to have a) JCR running in trunk/2.5. In the base pom.xml for content there are 2 new projects content-impl-jrc/impl and content-impl-jrc/pack impl builds the JCR extension jar that provides JCR storage and depends on the sakai jcr api. pack is an alternative pack to the standard DB CHS pack. This pack contains both the DB CHS and the JCR CHS For the moment, we will build the impl but not peform the pack so the JCR jar will not appear in the running Sakai. As we migrate we will continue to build the DB CHS (and the JCR CHS jar) but will move to the jcr pack. There is no need to change what is checked out, since build configuration is now all done with the pom.xml and not as a result of the code being present on disk.
            filters Filter Maintainer made changes -
            Summary BRANCH: Branch to develop a JSR-170 Backed Content Hosting Serivce Branch to develop a JSR-170 Backed Content Hosting Serivce
            Hide
            knoop Peter A. Knoop added a comment -

            [Bulk Change] This issue is currently Unresolved, however, it has a Fix Version set. In keeping with the newly added Target Version, Fix Versions should only be set for Resolved Issues, and only after it has been merged to that version specifically. The Fix Version is being reset to Unknown for this issue. Please use the Target Version to indicate when you plan to address this issue.

            Show
            knoop Peter A. Knoop added a comment - [Bulk Change] This issue is currently Unresolved, however, it has a Fix Version set. In keeping with the newly added Target Version, Fix Versions should only be set for Resolved Issues, and only after it has been merged to that version specifically. The Fix Version is being reset to Unknown for this issue. Please use the Target Version to indicate when you plan to address this issue.
            knoop Peter A. Knoop made changes -
            Fix Version/s 2.5.0 [Tentative] [ 10784 ]
            Repository Revision Date User Message
            Sakai Trunk Repository #36075 Tue Oct 02 11:32:09 CDT 2007 ian@caret.cam.ac.uk SAK-10366
            Update to make further things work with JCR
            Fix to DbContentService to stop it useing m_sqlService where there is none injected
            Files Changed
            MODIFY /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/BaseJCRStorage.java
            MODIFY /content/trunk/content-impl-jcr/pack/src/webapp/WEB-INF/components-jcr.xml
            MODIFY /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/JCRStorage.java
            MODIFY /content/trunk/content-impl-jcr/pack/src/webapp/WEB-INF/components.xml
            MODIFY /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/JCRContentService.java
            MODIFY /content/trunk/content-impl-jcr/impl/pom.xml
            MODIFY /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/JCRStorageUser.java
            MODIFY /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/BaseJCRResourceEdit.java
            MODIFY /content/trunk/content-impl-jcr/.classpath
            MODIFY /content/trunk/content-impl/impl/src/java/org/sakaiproject/content/impl/DbContentService.java
            Repository Revision Date User Message
            Sakai Trunk Repository #36096 Wed Oct 03 02:57:12 CDT 2007 ian@caret.cam.ac.uk SAK-10366
            jcr:lastModified lives in jcr:content and not on the node.
            Put some protection arround the finalize statements so that they dont restart the JCR session.
            Files Changed
            MODIFY /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/BaseJCRStorage.java
            MODIFY /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/JCRContentService.java
            MODIFY /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/JCRStorageUser.java
            Repository Revision Date User Message
            Sakai Trunk Repository #36113 Wed Oct 03 14:11:31 CDT 2007 ian@caret.cam.ac.uk SAK-10366 http://jira.sakaiproject.org/jira/browse/SAK-10366

            Removed some Logging that was unnecessary

            Corrected the log message to have he correct SAK
            Files Changed
            MODIFY /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/BaseJCRStorage.java
            MODIFY /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/JCRStorage.java
            MODIFY /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/JCRStorageUser.java
            Repository Revision Date User Message
            Sakai Trunk Repository #36608 Tue Oct 09 09:16:54 CDT 2007 ian@caret.cam.ac.uk SAK-10366
            Some fixes to get folder count and file size working correctly
            Files Changed
            MODIFY /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/BaseJCRStorage.java
            MODIFY /content/trunk/content-impl-jcr/impl/src/java/org/sakaiproject/content/impl/JCRStorageUser.java
            Repository Revision Date User Message
            Sakai Trunk Repository #36616 Tue Oct 09 11:43:49 CDT 2007 ian@caret.cam.ac.uk SAK-10366
            Added a multiplexer to enable migration of data
            Files Changed
            ADD /content/trunk/contentmultiplex-impl/.classpath
            ADD /content/trunk/contentmultiplex-impl/impl/src/java/org
            ADD /content/trunk/contentmultiplex-impl/impl
            ADD /content/trunk/contentmultiplex-impl/impl/src/java/org/sakaiproject
            ADD /content/trunk/contentmultiplex-impl/impl/src
            ADD /content/trunk/contentmultiplex-impl/impl/src/java/org/sakaiproject/content/multiplex
            MODIFY /content/trunk/pom.xml
            ADD /content/trunk/contentmultiplex-impl/impl/src/java/org/sakaiproject/content/multiplex/ContentHostingMultiplexService.java
            ADD /content/trunk/contentmultiplex-impl/impl/pom.xml
            ADD /content/trunk/contentmultiplex-impl/impl/src/java
            ADD /content/trunk/contentmultiplex-impl/.project
            ADD /content/trunk/contentmultiplex-impl/impl/src/java/org/sakaiproject/content
            ADD /content/trunk/contentmultiplex-impl
            Hide
            ianeboston Ian Boston added a comment -

            Branch is now retired, and code merged into CHS in trunk, closing item

            Show
            ianeboston Ian Boston added a comment - Branch is now retired, and code merged into CHS in trunk, closing item
            Repository Revision Date User Message
            Sakai Trunk Repository #37528 Mon Oct 29 17:20:03 CDT 2007 mmmay@indiana.edu Neeed to pick up SAK-11946
            IN-143-196:~/sakai_2-5-x/content mmmay$ svn merge -r 36615:36616 https://source.sakaiproject.org/svn/content/trunk
            U pom.xml
            A contentmultiplex-impl
            A contentmultiplex-impl/.classpath
            A contentmultiplex-impl/impl
            A contentmultiplex-impl/impl/src
            A contentmultiplex-impl/impl/src/java
            A contentmultiplex-impl/impl/src/java/org
            A contentmultiplex-impl/impl/src/java/org/sakaiproject
            A contentmultiplex-impl/impl/src/java/org/sakaiproject/content
            A contentmultiplex-impl/impl/src/java/org/sakaiproject/content/multiplex
            A contentmultiplex-impl/impl/src/java/org/sakaiproject/content/multiplex/ContentHostingMultiplexService.java
            A contentmultiplex-impl/impl/pom.xml
            A contentmultiplex-impl/.project
            IN-143-196:~/sakai_2-5-x/content mmmay$ svn log -r 37026:37027 https://source.sakaiproject.org/svn/content/trunk
            ------------------------------------------------------------------------
            r37027 | ian@caret.cam.ac.uk | 2007-10-15 16:46:54 -0400 (Mon, 15 Oct 2007) | 4 lines

            http://bugs.sakaiproject.org/jira/browse/SAK-11946
            Fixed


            ------------------------------------------------------------------------
            IN-143-196:~/sakai_2-5-x/content mmmay$ svn log -r 36615:36616 https://source.sakaiproject.org/svn/content/trunk
            ------------------------------------------------------------------------
            r36616 | ian@caret.cam.ac.uk | 2007-10-09 12:43:49 -0400 (Tue, 09 Oct 2007) | 4 lines

            SAK-10366
            Added a multiplexer to enable migration of data


            ------------------------------------------------------------------------
            IN-143-196:~/sakai_2-5-x/content mmmay$
            Files Changed
            ADD /content/branches/sakai_2-5-x/contentmultiplex-impl (from /content/trunk/contentmultiplex-impl)
            REPLACE /content/branches/sakai_2-5-x/contentmultiplex-impl/impl/src/java/org/sakaiproject (from /content/trunk/contentmultiplex-impl/impl/src/java/org/sakaiproject)
            REPLACE /content/branches/sakai_2-5-x/contentmultiplex-impl/impl/src/java/org (from /content/trunk/contentmultiplex-impl/impl/src/java/org)
            REPLACE /content/branches/sakai_2-5-x/contentmultiplex-impl/impl/src (from /content/trunk/contentmultiplex-impl/impl/src)
            REPLACE /content/branches/sakai_2-5-x/contentmultiplex-impl/impl/src/java/org/sakaiproject/content/multiplex (from /content/trunk/contentmultiplex-impl/impl/src/java/org/sakaiproject/content/multiplex)
            REPLACE /content/branches/sakai_2-5-x/contentmultiplex-impl/impl/src/java/org/sakaiproject/content/multiplex/ContentHostingMultiplexService.java (from /content/trunk/contentmultiplex-impl/impl/src/java/org/sakaiproject/content/multiplex/ContentHostingMultiplexService.java)
            REPLACE /content/branches/sakai_2-5-x/contentmultiplex-impl/impl/pom.xml (from /content/trunk/contentmultiplex-impl/impl/pom.xml)
            MODIFY /content/branches/sakai_2-5-x/pom.xml
            REPLACE /content/branches/sakai_2-5-x/contentmultiplex-impl/.project (from /content/trunk/contentmultiplex-impl/.project)
            REPLACE /content/branches/sakai_2-5-x/contentmultiplex-impl/impl/src/java/org/sakaiproject/content (from /content/trunk/contentmultiplex-impl/impl/src/java/org/sakaiproject/content)
            REPLACE /content/branches/sakai_2-5-x/contentmultiplex-impl/impl/src/java (from /content/trunk/contentmultiplex-impl/impl/src/java)
            REPLACE /content/branches/sakai_2-5-x/contentmultiplex-impl/.classpath (from /content/trunk/contentmultiplex-impl/.classpath)
            REPLACE /content/branches/sakai_2-5-x/contentmultiplex-impl/impl (from /content/trunk/contentmultiplex-impl/impl)
            filters Filter Maintainer made changes -
            Issue Type Branch [ 7 ] Task [ 3 ]
            filters Filter Maintainer made changes -
            Status In Progress [ 3 ] Closed [ 6 ]
            Fix Version/s 2.5.0-beta [ 10980 ]
            Resolution Fixed [ 1 ]
            filters Filter Maintainer made changes -
            2.5.x Status None
            filters Filter Maintainer made changes -
            2.4.x Status None
            filters Filter Maintainer made changes -
            2.6.x Status None
            aaronz Aaron Zeckoski made changes -
            Workflow jira [ 43580 ] Sakai CLE workflow [ 100054 ]

              People

              • Assignee:
                ianeboston Ian Boston
                Reporter:
                ianeboston Ian Boston
              • Votes:
                0 Vote for this issue
                Watchers:
                4 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:

                  Git Source Code