svn commit: r1205750 - in /ofbiz/branches/jackrabbit20100709: ./ applications/content/ applications/content/lib/ framework/base/lib/ framework/example/src/org/ofbiz/example/ framework/jcr/ framework/jcr/lib/ framework/jcr/src/org/ofbiz/jcr/access/ fram...

[sascharodekamp]

Author: sascharodekamp
Date: Thu Nov 24 08:31:15 2011
New Revision: 1205750

URL: http://svn.apache.org/viewvc?rev=1205750&view=rev
Log:
[Update] Clean duplicate dependencies, delete unnecessary interfaces, rename some classes

Added:
    ofbiz/branches/jackrabbit20100709/framework/base/lib/jcl-over-slf4j-1.6.4.jar   (with props)
    ofbiz/branches/jackrabbit20100709/framework/base/lib/log4j-over-slf4j-1.6.4.jar   (with props)
    ofbiz/branches/jackrabbit20100709/framework/base/lib/slf4j-api-1.6.4.jar   (with props)
    ofbiz/branches/jackrabbit20100709/framework/base/lib/slf4j-log4j12-1.6.4.jar   (with props)
    ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/JcrRepositoryAccessor.java   (contents, props changed)
      - copied, changed from r1202564, ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/RepositoryAccess.java
    ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/test/JackrabbitTests.java   (contents, props changed)
      - copied, changed from r1202564, ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/test/JcrTests.java
Removed:
    ofbiz/branches/jackrabbit20100709/applications/content/lib/tika-core-0.9.jar
    ofbiz/branches/jackrabbit20100709/applications/content/lib/tika-parsers-0.9.jar
    ofbiz/branches/jackrabbit20100709/framework/jcr/lib/commons-compress-1.1.jar
    ofbiz/branches/jackrabbit20100709/framework/jcr/lib/jcl-over-slf4j-1.6.1.jar
    ofbiz/branches/jackrabbit20100709/framework/jcr/lib/pdfbox-1.6.0.jar
    ofbiz/branches/jackrabbit20100709/framework/jcr/lib/slf4j-api-1.6.1.jar
    ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/Constants.java
    ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/DBAccess.java
    ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/HealthCheck.java
    ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/RepositoryAccess.java
    ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/jackrabbit/HealthCheckJackrabbit.java
    ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/test/JcrTests.java
    ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/util/JcrUtil.java
    ofbiz/branches/jackrabbit20100709/framework/jetty/lib/slf4j-api-1.3.1.jar
    ofbiz/branches/jackrabbit20100709/framework/jetty/lib/slf4j-log4j12-1.3.1.jar
Modified:
    ofbiz/branches/jackrabbit20100709/.classpath
    ofbiz/branches/jackrabbit20100709/applications/content/build.xml
    ofbiz/branches/jackrabbit20100709/framework/example/src/org/ofbiz/example/JackrabbitEvents.java
    ofbiz/branches/jackrabbit20100709/framework/jcr/build.xml
    ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/jackrabbit/ConstantsJackrabbit.java
    ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/jackrabbit/RepositoryAccessJackrabbit.java
    ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/api/JcrFileHelper.java
    ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/util/jackrabbit/JcrUtilJackrabbit.java
    ofbiz/branches/jackrabbit20100709/framework/jcr/testdef/jcrtests.xml

Modified: ofbiz/branches/jackrabbit20100709/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/.classpath?rev=1205750&r1=1205749&r2=1205750&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/.classpath (original)
+++ ofbiz/branches/jackrabbit20100709/.classpath Thu Nov 24 08:31:15 2011
@@ -10,8 +10,6 @@
     <classpathentry kind="lib" path="applications/content/lib/poi-3.7.jar"/>
     <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-3.7.jar"/>
     <classpathentry kind="lib" path="applications/content/lib/poi-scratchpad-3.7.jar"/>
-    <classpathentry kind="lib" path="applications/content/lib/tika-core-0.9.jar"/>
-    <classpathentry kind="lib" path="applications/content/lib/tika-parsers-0.9.jar"/>
     <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/>
     <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/ant-1.7.1.jar"/>
@@ -149,8 +147,8 @@
     <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-spi-commons-2.3.3.jar"/>
     <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-ocm-2.0.jar" sourcepath="/ocm"/>
     <classpathentry kind="lib" path="framework/jcr/lib/jcr-2.0.jar"/>
-    <classpathentry kind="lib" path="framework/jcr/lib/pdfbox-1.6.0.jar"/>
-    <classpathentry kind="lib" path="framework/jcr/lib/slf4j-api-1.6.1.jar"/>
+    <classpathentry kind="lib" path="framework/jcr/lib/tika-core-0.10.jar"/>
+    <classpathentry kind="lib" path="framework/jcr/lib/tika-parsers-0.10.jar"/>
     <classpathentry kind="lib" path="framework/jetty/lib/jasper-compiler-5.5.15.jar"/>
     <classpathentry kind="lib" path="framework/jetty/lib/jasper-runtime-5.5.15.jar"/>
     <classpathentry kind="lib" path="framework/jetty/lib/jetty-6.1.11.jar"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/content/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/build.xml?rev=1205750&r1=1205749&r2=1205750&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/build.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/build.xml Thu Nov 24 08:31:15 2011
@@ -47,6 +47,7 @@ under the License.
         <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
         <fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
         <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/jcr/lib" includes="*.jar"/>
     </path>
 
     <patternset id="src.exc.set">

Added: ofbiz/branches/jackrabbit20100709/framework/base/lib/jcl-over-slf4j-1.6.4.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/lib/jcl-over-slf4j-1.6.4.jar?rev=1205750&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/jackrabbit20100709/framework/base/lib/jcl-over-slf4j-1.6.4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/jackrabbit20100709/framework/base/lib/log4j-over-slf4j-1.6.4.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/lib/log4j-over-slf4j-1.6.4.jar?rev=1205750&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/jackrabbit20100709/framework/base/lib/log4j-over-slf4j-1.6.4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/jackrabbit20100709/framework/base/lib/slf4j-api-1.6.4.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/lib/slf4j-api-1.6.4.jar?rev=1205750&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/jackrabbit20100709/framework/base/lib/slf4j-api-1.6.4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/jackrabbit20100709/framework/base/lib/slf4j-log4j12-1.6.4.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/lib/slf4j-log4j12-1.6.4.jar?rev=1205750&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/jackrabbit20100709/framework/base/lib/slf4j-log4j12-1.6.4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ofbiz/branches/jackrabbit20100709/framework/example/src/org/ofbiz/example/JackrabbitEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/src/org/ofbiz/example/JackrabbitEvents.java?rev=1205750&r1=1205749&r2=1205750&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/example/src/org/ofbiz/example/JackrabbitEvents.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/example/src/org/ofbiz/example/JackrabbitEvents.java Thu Nov 24 08:31:15 2011
@@ -36,7 +36,7 @@ import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.GenericValue;
-import org.ofbiz.jcr.access.RepositoryAccess;
+import org.ofbiz.jcr.access.JcrRepositoryAccessor;
 import org.ofbiz.jcr.access.jackrabbit.RepositoryAccessJackrabbit;
 import org.ofbiz.jcr.api.JcrArticleHelper;
 import org.ofbiz.jcr.api.JcrContentHelper;
@@ -263,7 +263,7 @@ public class JackrabbitEvents {
     public static String getRepositoryFileTree(HttpServletRequest request, HttpServletResponse response) {
         GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
 
-        RepositoryAccess repositoryAccess = new RepositoryAccessJackrabbit(userLogin);
+        JcrRepositoryAccessor repositoryAccess = new RepositoryAccessJackrabbit(userLogin);
         try {
             JSONArray fileTree = repositoryAccess.getJsonFileTree();
             request.setAttribute("fileTree", StringUtil.wrapString(fileTree.toString()));

Modified: ofbiz/branches/jackrabbit20100709/framework/jcr/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jcr/build.xml?rev=1205750&r1=1205749&r2=1205750&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/jcr/build.xml (original)
+++ ofbiz/branches/jackrabbit20100709/framework/jcr/build.xml Thu Nov 24 08:31:15 2011
@@ -39,6 +39,7 @@ under the License.
         <fileset dir="../../framework/entity/build/lib" includes="*.jar"/>
         <fileset dir="../../framework/service/build/lib" includes="*.jar"/>
         <fileset dir="../../framework/security/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/jetty/lib" includes="*.jar"/>
     </path>
 
     <target name="jar" depends="classes">

Copied: ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/JcrRepositoryAccessor.java (from r1202564, ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/RepositoryAccess.java)
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/JcrRepositoryAccessor.java?p2=ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/JcrRepositoryAccessor.java&p1=ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/RepositoryAccess.java&r1=1202564&r2=1205750&rev=1205750&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/RepositoryAccess.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/JcrRepositoryAccessor.java Thu Nov 24 08:31:15 2011
@@ -11,7 +11,7 @@ import net.sf.json.JSONArray;
 import org.apache.jackrabbit.ocm.exception.ObjectContentManagerException;
 import org.ofbiz.jcr.orm.OfbizRepositoryMapping;
 
-public interface RepositoryAccess {
+public interface JcrRepositoryAccessor {
 
     /**
      * Close the current repository session should be used when the operation

Propchange: ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/JcrRepositoryAccessor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/jackrabbit/ConstantsJackrabbit.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/jackrabbit/ConstantsJackrabbit.java?rev=1205750&r1=1205749&r2=1205750&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/jackrabbit/ConstantsJackrabbit.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/jackrabbit/ConstantsJackrabbit.java Thu Nov 24 08:31:15 2011
@@ -2,9 +2,7 @@ package org.ofbiz.jcr.access.jackrabbit;
 
 import javax.jcr.nodetype.NodeType;
 
-import org.ofbiz.jcr.access.Constants;
-
-public class ConstantsJackrabbit implements Constants {
+public class ConstantsJackrabbit {
     // JCR Variables
     public static String MESSAGE = "jcr:message";
     public static String FILE = NodeType.NT_FILE;

Modified: ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/jackrabbit/RepositoryAccessJackrabbit.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/jackrabbit/RepositoryAccessJackrabbit.java?rev=1205750&r1=1205749&r2=1205750&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/jackrabbit/RepositoryAccessJackrabbit.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/access/jackrabbit/RepositoryAccessJackrabbit.java Thu Nov 24 08:31:15 2011
@@ -15,13 +15,13 @@ import org.ofbiz.base.util.Debug;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.jcr.access.ContentReader;
 import org.ofbiz.jcr.access.ContentWriter;
-import org.ofbiz.jcr.access.RepositoryAccess;
+import org.ofbiz.jcr.access.JcrRepositoryAccessor;
 import org.ofbiz.jcr.access.VersioningManager;
 import org.ofbiz.jcr.loader.JCRFactoryUtil;
 import org.ofbiz.jcr.loader.jackrabbit.JCRFactoryImpl;
 import org.ofbiz.jcr.orm.OfbizRepositoryMapping;
 
-public class RepositoryAccessJackrabbit implements RepositoryAccess {
+public class RepositoryAccessJackrabbit implements JcrRepositoryAccessor {
 
     private static String module = RepositoryAccessJackrabbit.class.getName();
 

Modified: ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/api/JcrFileHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/api/JcrFileHelper.java?rev=1205750&r1=1205749&r2=1205750&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/api/JcrFileHelper.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/api/JcrFileHelper.java Thu Nov 24 08:31:15 2011
@@ -53,19 +53,7 @@ public class JcrFileHelper extends Abstr
      * @throws
      */
     public OfbizRepositoryMappingJackrabbitHierarchyNode getRepositoryContent(String contentPath) throws ClassCastException {
-        OfbizRepositoryMapping orm = access.getContentObject(contentPath);
-
-        if (orm instanceof OfbizRepositoryMappingJackrabbitFile) {
-            OfbizRepositoryMappingJackrabbitFile fileObj = (OfbizRepositoryMappingJackrabbitFile) orm;
-            hierarchy = fileObj;
-            return fileObj;
-        } else if (orm instanceof OfbizRepositoryMappingJackrabbitFolder) {
-            OfbizRepositoryMappingJackrabbitFolder fileObj = (OfbizRepositoryMappingJackrabbitFolder) orm;
-            hierarchy = fileObj;
-            return fileObj;
-        }
-
-        throw new ClassCastException("The content object for the path: " + contentPath + " is not a file content object. This Helper can only handle content objects with the type: " + OfbizRepositoryMappingJackrabbitFile.class.getName());
+        return getRepositoryContent(contentPath, null);
     }
 
     /**
@@ -78,7 +66,12 @@ public class JcrFileHelper extends Abstr
      * @throws
      */
     public OfbizRepositoryMappingJackrabbitHierarchyNode getRepositoryContent(String contentPath, String version) throws ClassCastException {
-        OfbizRepositoryMapping orm = access.getContentObject(contentPath, version);
+        OfbizRepositoryMapping orm = null;
+        if (version != null) {
+            orm = access.getContentObject(contentPath, version);
+        } else {
+            orm = access.getContentObject(contentPath);
+        }
 
         if (orm instanceof OfbizRepositoryMappingJackrabbitFile) {
             OfbizRepositoryMappingJackrabbitFile fileObj = (OfbizRepositoryMappingJackrabbitFile) orm;
@@ -106,7 +99,7 @@ public class JcrFileHelper extends Abstr
     public void storeContentInRepository(byte[] fileData, String fileName, String folderPath) throws ObjectContentManagerException, RepositoryException {
         if (UtilValidate.isEmpty(folderPath)) {
             throw new ObjectContentManagerException("Please specify a folder path, the folder path should not be empty!");
-        } else if (ConstantsJackrabbit.ROOTPATH.equals(folderPath)){
+        } else if (ConstantsJackrabbit.ROOTPATH.equals(folderPath)) {
             throw new ObjectContentManagerException("Please specify a folder, a file content can't be stored directly under root.");
         }
 
@@ -122,7 +115,8 @@ public class JcrFileHelper extends Abstr
         ormFile.setResource(ormResource);
         ormFile.setPath(fileName);
 
-        // Create the folder if necessary, otherwise we just update the folder content
+        // Create the folder if necessary, otherwise we just update the folder
+        // content
         folderPath = JcrUtilJackrabbit.createAbsoluteNodePath(folderPath);
         if (access.getSession().itemExists(folderPath)) {
             OfbizRepositoryMapping orm = access.getContentObject(folderPath);
@@ -140,11 +134,12 @@ public class JcrFileHelper extends Abstr
             access.storeContentObject(ormFolder);
         }
 
-
     }
 
     /**
-     * Returns TRUE if the current content is a file content (Type: OfbizRepositoryMappingJackrabbitFile)
+     * Returns TRUE if the current content is a file content (Type:
+     * OfbizRepositoryMappingJackrabbitFile)
+     *
      * @return
      */
     public boolean isFileContent() {
@@ -152,7 +147,9 @@ public class JcrFileHelper extends Abstr
     }
 
     /**
-     * Returns TRUE if the current content is a folder content (Type: OfbizRepositoryMappingJackrabbitFolder)
+     * Returns TRUE if the current content is a folder content (Type:
+     * OfbizRepositoryMappingJackrabbitFolder)
+     *
      * @return
      */
     public boolean isFolderContent() {

Copied: ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/test/JackrabbitTests.java (from r1202564, ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/test/JcrTests.java)
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/test/JackrabbitTests.java?p2=ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/test/JackrabbitTests.java&p1=ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/test/JcrTests.java&r1=1202564&r2=1205750&rev=1205750&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/test/JcrTests.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/test/JackrabbitTests.java Thu Nov 24 08:31:15 2011
@@ -28,7 +28,7 @@ import javolution.util.FastMap;
 
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.entity.GenericValue;
-import org.ofbiz.jcr.access.RepositoryAccess;
+import org.ofbiz.jcr.access.JcrRepositoryAccessor;
 import org.ofbiz.jcr.access.jackrabbit.RepositoryAccessJackrabbit;
 import org.ofbiz.jcr.api.JcrArticleHelper;
 import org.ofbiz.jcr.orm.jackrabbit.OfbizRepositoryMappingJackrabbitFile;
@@ -39,12 +39,12 @@ import org.ofbiz.jcr.util.jackrabbit.Jcr
 import org.ofbiz.service.ServiceUtil;
 import org.ofbiz.service.testtools.OFBizTestCase;
 
-public class JcrTests extends OFBizTestCase {
+public class JackrabbitTests extends OFBizTestCase {
 
     protected GenericValue userLogin = null;
-    RepositoryAccess repositoryAccess = null;
+    JcrRepositoryAccessor repositoryAccess = null;
 
-    public JcrTests(String name) {
+    public JackrabbitTests(String name) {
         super(name);
     }
 

Propchange: ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/test/JackrabbitTests.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/util/jackrabbit/JcrUtilJackrabbit.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/util/jackrabbit/JcrUtilJackrabbit.java?rev=1205750&r1=1205749&r2=1205750&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/util/jackrabbit/JcrUtilJackrabbit.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/util/jackrabbit/JcrUtilJackrabbit.java Thu Nov 24 08:31:15 2011
@@ -15,9 +15,8 @@ import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.jcr.access.jackrabbit.ConstantsJackrabbit;
 import org.ofbiz.jcr.loader.JCRFactoryUtil;
-import org.ofbiz.jcr.util.JcrUtil;
 
-public class JcrUtilJackrabbit implements JcrUtil {
+public class JcrUtilJackrabbit {
 
     public static final String module = JcrUtilJackrabbit.class.getName();
 

Modified: ofbiz/branches/jackrabbit20100709/framework/jcr/testdef/jcrtests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jcr/testdef/jcrtests.xml?rev=1205750&r1=1205749&r2=1205750&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/jcr/testdef/jcrtests.xml (original)
+++ ofbiz/branches/jackrabbit20100709/framework/jcr/testdef/jcrtests.xml Thu Nov 24 08:31:15 2011
@@ -29,8 +29,8 @@
     -->
 
 
-    <test-case case-name="jcr-tests">
-        <junit-test-suite class-name="org.ofbiz.jcr.test.JcrTests"/>
+    <test-case case-name="jackrabbit-tests">
+        <junit-test-suite class-name="org.ofbiz.jcr.test.JackrabbitTests"/>
     </test-case>
 
 </test-suite>
\ No newline at end of file