jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r615649 [9/14] - in /jackrabbit/trunk: jackrabbit-classloader/src/main/java/org/apache/jackrabbit/classloader/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ jackra...
Date Sun, 27 Jan 2008 21:08:36 GMT
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/reflection/ReflectionUtils.java Sun Jan 27 13:08:08 2008
@@ -27,14 +27,14 @@
 
 /**
  * Utility class for handling reflection using BeanUtils.
- * 
+ *
  * @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
  */
 abstract public class ReflectionUtils {
-    
+
     // default the class loader to the load of this class
     private static ClassLoader classLoader = ReflectionUtils.class.getClassLoader();
-    
+
     /**
      * Sets the class loader to use in the {@link #forName(String)} method to
      * load classes.
@@ -42,30 +42,30 @@
      * Care must be taken when using this method as when setting an improperly
      * set up classloader, the mapper will not work again throwing tons of
      * exceptions.
-     * 
+     *
      * @param newClassLoader The new class loader to use. This may be
      *      <code>null</code> in which case the system class loader will be used.
      */
     public static void setClassLoader(ClassLoader newClassLoader) {
         classLoader = newClassLoader;
     }
-    
+
     /**
      * Returns the class loader which is used by the {@link #forName(String)}
      * method to load classes.
-     * 
+     *
      * @return The class loader used by {@link #forName(String)} or
      *      <code>null</code> if the system class loader is used.
      */
     public static ClassLoader getClassLoader() {
         return classLoader;
     }
-    
+
     public static Object getNestedProperty(Object object, String fieldName) {
         if (null == object) {
             return null;
         }
-        
+
         try {
             return PropertyUtils.getNestedProperty(object, fieldName);
         }
@@ -85,7 +85,7 @@
                     e);
         }
     }
-    
+
     public static Class getPropertyType(Object object, String fieldName) {
         try {
             return PropertyUtils.getPropertyType(object, fieldName);
@@ -107,7 +107,7 @@
                     ex);
         }
     }
-    
+
     /**
      * @param className
      * @param objects
@@ -116,7 +116,7 @@
     public static Object  invokeConstructor(String className,  Object[] params) {
         try {
             Class converterClass= forName(className);
-    
+
             return  ConstructorUtils.invokeConstructor(converterClass, params);
         }
         catch(Exception ex) {
@@ -165,12 +165,12 @@
             throw new JcrMappingException("Cannot load class " + clazz, ex);
         }
     }
-    
+
     public static boolean isProxy(Class beanClass)
-    {    	        	     
+    {    	        	
          return Enhancer.isEnhanced(beanClass);	
     }
-    
+
     public static Class getBeanClass(Object bean)
     {
     	     Class beanClass = bean.getClass();
@@ -181,5 +181,5 @@
          }
          return beanClass;
     }
-    
+
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/repository/NodeUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/repository/NodeUtil.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/repository/NodeUtil.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/repository/NodeUtil.java Sun Jan 27 13:08:08 2008
@@ -23,24 +23,24 @@
 
 /**
 * Utility class for managing JCR nodes.
-* 
+*
 *
 * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
 * @version $Id: Exp $
 */
 public class NodeUtil
 {
-    
-      
+
+
     /** Item path separator */
     public static final String PATH_SEPARATOR = "/";
-    
+
     private final static Log log = LogFactory.getLog(NodeUtil.class);
-    
-      
+
+
     /**
-     * Check if a path is valid 
-     * 
+     * Check if a path is valid
+     *
      * @param path The path to validate
      * @return true if the path is valid, else false
      */
@@ -49,47 +49,47 @@
         if ((path == null) ||
             (path.equals(PATH_SEPARATOR)) ||
             (path.endsWith(PATH_SEPARATOR)) ||
-            (! path.startsWith(PATH_SEPARATOR)) || 
+            (! path.startsWith(PATH_SEPARATOR)) ||
             (path.equals("")))
         {
-            return false; 
+            return false;
         }
         return true;
-    }    
-    
+    }
+
     /**
      * Get the parent path
      * @param path The path from wich the parent path has to be returned
      * @return The parent path
-     * 
+     *
      * @throws ObjectContentManagerException when the path is invalid
      */
     public static String getParentPath(String path) throws ObjectContentManagerException
     {
         String parentPath = "";
-        
+
         if (!isValidPath(path))
         {
             throw new JcrMappingException("Invalid path : " + path);
         }
-        
-        String[] pathElements = path.split(PATH_SEPARATOR);         
-        
+
+        String[] pathElements = path.split(PATH_SEPARATOR);
+
         // Firts path element should be = empty string because a uri always start with '/'
-        // So, if len=2, means it is a root folder like '/foo'. 
+        // So, if len=2, means it is a root folder like '/foo'.
         // In this case the uri has not parent folder => return "/"
         if (pathElements.length == 2)
         {
             return PATH_SEPARATOR;
         }
-        
+
         for(int i=0; i < pathElements.length -1; i++)
-        {   
+        {
             if (! pathElements[i].equals(""))
-            {    
+            {
                parentPath += PATH_SEPARATOR + pathElements[i];
             }
-        }                  
+        }
         return parentPath;
     }
 
@@ -97,20 +97,20 @@
      * Get the node name
      * @param path  The path from which the node name has to be retrieved
      * @return The node name
-     * 
+     *
      * @throws ObjectContentManagerException when the path is invalid
      */
     public static String getNodeName(String path)  throws ObjectContentManagerException
     {
-        
+
         String[] pathElements = path.split(PATH_SEPARATOR);
-        
+
         if (! isValidPath(path))
         {
             throw new JcrMappingException("Invalid path : " + path);
-        }        
+        }
         return pathElements[pathElements.length-1];
     }
-    
-  
+
+
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/version/Version.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/version/Version.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/version/Version.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/version/Version.java Sun Jan 27 13:08:08 2008
@@ -23,10 +23,10 @@
 import org.apache.jackrabbit.ocm.exception.VersionException;
 
 /**
- * 
- * 
+ *
+ *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
- * 
+ *
  */
 public class Version
 {

Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/version/VersionIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/version/VersionIterator.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/version/VersionIterator.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/version/VersionIterator.java Sun Jan 27 13:08:08 2008
@@ -24,7 +24,7 @@
 
 /**
  * VersionIterator is a wrapper class for JCR VersionIterator
- * 
+ *
  * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
  *
  */
@@ -39,7 +39,7 @@
 	}
 
 	/**
-	 * 
+	 *
 	 * @see java.util.Iterator#hasNext()
 	 */
 	public boolean hasNext()
@@ -48,10 +48,10 @@
 	}
 
 	/**
-	 * 
+	 *
 	 * @see java.util.Iterator#next()
 	 */
-	public Object next() 
+	public Object next()
 	{
 
 		try
@@ -67,7 +67,7 @@
 	}
 
 	/**
-	 * 
+	 *
 	 * @return the versionIterator size
 	 */
 	public long getSize()
@@ -76,7 +76,7 @@
 	}
 	
 	/**
-	 * 
+	 *
 	 * @see java.util.Iterator#remove()
 	 */
 	public void remove()

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AbstractTestBase.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AbstractTestBase.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AbstractTestBase.java Sun Jan 27 13:08:08 2008
@@ -55,7 +55,7 @@
 /**
  * Base class for testcases. Provides priviledged access to the jcr test
  * repository.
- * 
+ *
  * @author <a href="mailto:okiessler@apache.org">Oliver Kiessler</a>
  * @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
  * @version $Id: Exp $
@@ -70,14 +70,14 @@
 	protected ObjectContentManager ocm;
 
 	protected Mapper mapper;
-    
+
     protected boolean isInit = false;
 
 	/**
 	 * <p>
 	 * Defines the test case name for junit.
 	 * </p>
-	 * 
+	 *
 	 * @param testName
 	 *            The test case name.
 	 */
@@ -88,14 +88,14 @@
 
 	/**
 	 * Setting up the testcase.
-	 * 
+	 *
 	 * @see junit.framework.TestCase#setUp()
 	 */
 	protected void setUp() throws Exception
 	{
 		try {
 			super.setUp();
-	        
+	
 	        if (!isInit) {
 	            initObjectContentManager();
 	            RepositoryUtil.setupSession(getSession());
@@ -121,7 +121,7 @@
 
 	/**
 	 * Getter for property ocm.
-	 * 
+	 *
 	 * @return jcrSession
 	 */
 	public ObjectContentManager getObjectContentManager()
@@ -145,7 +145,7 @@
 
 	protected abstract void initObjectContentManager() throws UnsupportedRepositoryOperationException, javax.jcr.RepositoryException;
 	
-    protected void registerNodeTypes(Session session) 
+    protected void registerNodeTypes(Session session)
     throws InvalidNodeTypeDefException, javax.jcr.RepositoryException, IOException {
         InputStream xml = new FileInputStream(
                 "./src/test/test-config/nodetypes/custom_nodetypes.xml");
@@ -170,7 +170,7 @@
 
         }
     }
-   
+
 
 	public void exportDocument(String filePath, String nodePath, boolean skipBinary, boolean noRecurse)
 	{
@@ -233,16 +233,16 @@
                     {
                     	   return false;
                     }
- 
+
                 }
             }
             return false;
     }
 
 	
-	protected  void cleanUpRepisotory() 
+	protected  void cleanUpRepisotory()
 	{
-		try 
+		try
 		{
 				Session session = this.getSession();		
 				NodeIterator nodeIterator = session.getRootNode().getNodes();

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AllTests.java Sun Jan 27 13:08:08 2008
@@ -22,7 +22,7 @@
 
 /**
  * OCM suite definition. Bundles together all independent and package level test suites.
- * 
+ *
  * @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
  */
 public class AllTests {
@@ -33,7 +33,7 @@
 
     public static Test buildSuite() throws Exception {
         TestSuite suite= new TestSuite("Jackrabbit OCM Tests");
-             
+
         suite.addTest(org.apache.jackrabbit.ocm.manager.atomic.AllTests.buildSuite());
         suite.addTest(org.apache.jackrabbit.ocm.manager.auto.AllTests.buildSuite());
         suite.addTest(org.apache.jackrabbit.ocm.manager.basic.AllTests.buildSuite());
@@ -41,16 +41,16 @@
         suite.addTest(org.apache.jackrabbit.ocm.manager.collectionconverter.AllTests.buildSuite());
         suite.addTest(org.apache.jackrabbit.ocm.manager.inheritance.AllTests.buildSuite());
         suite.addTest(org.apache.jackrabbit.ocm.manager.interfaces.AllTests.buildSuite());
-        suite.addTest(org.apache.jackrabbit.ocm.manager.jcrnodetype.AllTests.buildSuite());        
-        suite.addTest(org.apache.jackrabbit.ocm.manager.lock.AllTests.buildSuite());        
+        suite.addTest(org.apache.jackrabbit.ocm.manager.jcrnodetype.AllTests.buildSuite());
+        suite.addTest(org.apache.jackrabbit.ocm.manager.lock.AllTests.buildSuite());
         suite.addTest(org.apache.jackrabbit.ocm.manager.proxy.AllTests.buildSuite());
         suite.addTest(org.apache.jackrabbit.ocm.manager.query.AllTests.buildSuite());
-        suite.addTest(org.apache.jackrabbit.ocm.manager.uuid.AllTests.buildSuite());        
+        suite.addTest(org.apache.jackrabbit.ocm.manager.uuid.AllTests.buildSuite());
         suite.addTest(org.apache.jackrabbit.ocm.manager.version.AllTests.buildSuite());
         suite.addTest(org.apache.jackrabbit.ocm.mapper.AllTests.buildSuite());
         suite.addTest(org.apache.jackrabbit.ocm.querymanager.AllTests.buildSuite());
         suite.addTest(org.apache.jackrabbit.ocm.repository.AllTests.buildSuite());
-        
+
         return suite;
     }
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java Sun Jan 27 13:08:08 2008
@@ -67,10 +67,10 @@
 /**
  * Base class for testcases. Provides priviledged access to the jcr test
  * repository.
- * 
+ *
  * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- * 
- * 
+ *
+ *
  */
 public abstract class AnnotationTestBase extends AbstractTestBase
 {
@@ -80,7 +80,7 @@
 	 * <p>
 	 * Defines the test case name for junit.
 	 * </p>
-	 * 
+	 *
 	 * @param testName
 	 *            The test case name.
 	 */
@@ -89,7 +89,7 @@
 		super(testName);
 	}
 
-    
+
 	protected void initObjectContentManager() throws UnsupportedRepositoryOperationException, javax.jcr.RepositoryException
 	{
 		Repository repository = RepositoryUtil.getRepository("repositoryTest");	
@@ -112,7 +112,7 @@
 		classes.add(MultiValue.class);
 		
 
-		classes.add(Residual.class); 
+		classes.add(Residual.class);
 		classes.add(ResidualProperties.class);
 		classes.add(ResidualNodes.class);
 		

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/DigesterTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/DigesterTestBase.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/DigesterTestBase.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/DigesterTestBase.java Sun Jan 27 13:08:08 2008
@@ -25,10 +25,10 @@
 /**
  * Base class for testcases. Provides priviledged access to the jcr test
  * repository.
- * 
+ *
  * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- * 
- * 
+ *
+ *
  */
 public abstract class DigesterTestBase extends AbstractTestBase
 {
@@ -37,7 +37,7 @@
 	 * <p>
 	 * Defines the test case name for junit.
 	 * </p>
-	 * 
+	 *
 	 * @param testName
 	 *            The test case name.
 	 */
@@ -46,17 +46,17 @@
 		super(testName);
 	}
 
-    
+
 	protected void initObjectContentManager() throws UnsupportedRepositoryOperationException, javax.jcr.RepositoryException
 	{
 		Repository repository = RepositoryUtil.getRepository("repositoryTest");
-		String[] files = { "./src/test/test-config/jcrmapping.xml", 
+		String[] files = { "./src/test/test-config/jcrmapping.xml",
 						   "./src/test/test-config/jcrmapping-proxy.xml",
 						   "./src/test/test-config/jcrmapping-atomic.xml",
                            "./src/test/test-config/jcrmapping-default.xml",
                            "./src/test/test-config/jcrmapping-beandescriptor.xml",
                            "./src/test/test-config/jcrmapping-inheritance.xml",
-                           "./src/test/test-config/jcrmapping-jcrnodetypes.xml", 
+                           "./src/test/test-config/jcrmapping-jcrnodetypes.xml",
                            "./src/test/test-config/jcrmapping-uuid.xml"};
 		session = RepositoryUtil.login(repository, "superuser", "superuser");
 		ocm = new ObjectContentManagerImpl(session, files);

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/RepositoryLifecycleTestSetup.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/RepositoryLifecycleTestSetup.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/RepositoryLifecycleTestSetup.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/RepositoryLifecycleTestSetup.java Sun Jan 27 13:08:08 2008
@@ -22,7 +22,7 @@
 import org.apache.jackrabbit.ocm.repository.RepositoryUtil;
 /**
  * A TestSetup that opens/close the JCR repository.
- * 
+ *
  * @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
  */
 public class RepositoryLifecycleTestSetup extends TestSetup {
@@ -36,7 +36,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         System.out.println("registering repository ... ");
-        RepositoryUtil.registerRepository("repositoryTest", 
+        RepositoryUtil.registerRepository("repositoryTest",
                 "./src/test/test-config/repository-derby.xml", "./target/repository");
     }
 
@@ -48,6 +48,6 @@
         System.out.println("repository shutdown");
         super.tearDown();
     }
-    
-    
+
+
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AllTests.java Sun Jan 27 13:08:08 2008
@@ -24,7 +24,7 @@
 
 /**
  * Package level tests.
- * 
+ *
  * @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
  */
 public class AllTests {
@@ -37,10 +37,10 @@
         TestSuite suite= new TestSuite("Test for org.apache.jackrabbit.ocm.jcr.manager.atomic");
         //$JUnit-BEGIN$
         suite.addTestSuite(AnnotationAtomicTest.class);
-        suite.addTestSuite(AnnotationNullAtomicTest.class);    
+        suite.addTestSuite(AnnotationNullAtomicTest.class);
         suite.addTestSuite(AnnotationDefaultValueTest.class);
         suite.addTestSuite(DigesterAtomicTest.class);
-        suite.addTestSuite(DigesterNullAtomicTest.class);    
+        suite.addTestSuite(DigesterNullAtomicTest.class);
         suite.addTestSuite(DigesterDefaultValueTest.class);
 
         //$JUnit-END$

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationAtomicTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationAtomicTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationAtomicTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationAtomicTest.java Sun Jan 27 13:08:08 2008
@@ -55,7 +55,7 @@
         return new RepositoryLifecycleTestSetup(new TestSuite(AnnotationAtomicTest.class));
     }
 
-    
+
     public void testAtomicFields()
     {
         try
@@ -75,7 +75,7 @@
             a.setString("Test String");
             a.setDate(date);
             a.setInt2boolean(true);
-            
+
             byte[] content = "Test Byte".getBytes();
             a.setByteArray(content);
             a.setCalendar(calendar);
@@ -83,17 +83,17 @@
             a.setDoublePrimitive(1.23);
             long now = System.currentTimeMillis();
             a.setTimestamp(new Timestamp(now));
-            
+
             ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream("Test Stream".getBytes());
             a.setInputStream(byteArrayInputStream);
             a.setNamedProperty("ocm:test");
             a.setPathProperty("/node1/node2");
             a.setUndefinedProperty("aStringData");
-            
+
             ocm.insert(a);
             ocm.save();
 
-             
+
             // --------------------------------------------------------------------------------
             // Get the object
             // --------------------------------------------------------------------------------
@@ -110,70 +110,70 @@
             assertTrue("Incorrect boolean object", a.getString().equals("Test String"));
             assertNotNull("Byte array object is null", a.getByteArray());
             assertTrue("Incorrect byte object", new String(a.getByteArray()).equals("Test Byte"));
-            
+
             assertNotNull("date object is null", a.getDate());
-            assertTrue("Invalid date", a.getDate().equals(date));            
+            assertTrue("Invalid date", a.getDate().equals(date));
             assertNotNull("calendar object is null", a.getCalendar());
-            
+
             log.debug("Calendar : " + a.getCalendar().get(Calendar.YEAR) + "-" + a.getCalendar().get(Calendar.MONTH) + "-" + a.getCalendar().get(Calendar.DAY_OF_MONTH));
             assertTrue("Invalid calendar object", a.getCalendar().equals(calendar));
-            
+
             assertNotNull("Double object is null", a.getDoubleObject());
             assertTrue("Incorrect double object", a.getDoubleObject().doubleValue() == 2.12);
             assertTrue("Incorrect double primitive", a.getDoublePrimitive() == 1.23);
-            
+
             assertNotNull("Incorrect input stream primitive", a.getInputStream());
             assertNotNull("Incorrect timestamp", a.getTimestamp());
-            assertTrue("Invalid timestamp value ", a.getTimestamp().getTime() == now);            
+            assertTrue("Invalid timestamp value ", a.getTimestamp().getTime() == now);
             assertTrue("Invalid int2boolean value ", a.isInt2boolean());
-            
+
             assertTrue("Invalid namedProperty value ", a.getNamedProperty().equals("ocm:test"));
             assertTrue("Invalid pathProperty value ", a.getPathProperty().equals("/node1/node2"));
             assertTrue("Invalid undefinedProperty value ", ((String) a.getUndefinedProperty()).equals("aStringData"));
             // --------------------------------------------------------------------------------
             // Update the property "namedProperty" with an invalid value
-            // --------------------------------------------------------------------------------            
-            try 
+            // --------------------------------------------------------------------------------
+            try
             {
                // update with an incorrect namespace - Should throws an exception
-               a.setNamedProperty("unknown:test");               
+               a.setNamedProperty("unknown:test");
                ocm.update(a);
                fail("Exception was not triggered with an invalid namespace");
                ocm.save();
             }
             catch (Exception e)
             {
-               
-                
+
+
             }
-            
+
             // --------------------------------------------------------------------------------
             // Update the property "pathProperty" with an invalid value
-            // --------------------------------------------------------------------------------            
-            try 
+            // --------------------------------------------------------------------------------
+            try
             {
                // update with an incorrect namespace - Should throws an exception
-               a.setPathProperty("//node1");               
+               a.setPathProperty("//node1");
                ocm.update(a);
                fail("Exception was not triggered with an invalid path");
                ocm.save();
             }
             catch (Exception e)
             {
-               
-                
+
+
             }
-            
+
             // --------------------------------------------------------------------------------
             // Update the property "undefinedProperty" with an invalid value
-            // --------------------------------------------------------------------------------            
+            // --------------------------------------------------------------------------------
             a = null;
             a = (Atomic) ocm.getObject( "/test");
 
             a.setUndefinedProperty(new Double(1.2));
             ocm.update(a);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Get the object
             // --------------------------------------------------------------------------------
@@ -181,14 +181,14 @@
             a = (Atomic) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             assertTrue("Invalid undefinedProperty value ", ((Double) a.getUndefinedProperty()).doubleValue() == 1.2);
-            
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
-    
+
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationDefaultValueTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationDefaultValueTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationDefaultValueTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationDefaultValueTest.java Sun Jan 27 13:08:08 2008
@@ -50,13 +50,13 @@
         // All methods starting with "test" will be executed in the test suite.
         return new RepositoryLifecycleTestSetup(new TestSuite(AnnotationDefaultValueTest.class));
     }
-    
+
 	public void testDefaultValues()
 	{
 	    try
 	    {
 	        ObjectContentManager ocm = getObjectContentManager();
-	        
+	
 	        // --------------------------------------------------------------------------------
 	        // Create and store an object graph in the repository
 	        // --------------------------------------------------------------------------------
@@ -64,31 +64,31 @@
 	        a.setPath("/testDefault");
 	        a.setP1("p1Value");
 	        // do not set p2, p3, p4, p5
-	        
+	
 	        ocm.insert(a);
 	        ocm.save();
-	        
-	        
+	
+	
 	        // --------------------------------------------------------------------------------
 	        // Get the object
 	        // --------------------------------------------------------------------------------
 	        a = null;
 	        a = (Default) ocm.getObject( "/testDefault" );
 	        assertNotNull("a is null", a);
-	        
+	
 	        assertEquals("p1Value", a.getP1());
 	        assertNull(a.getP2());
 	        assertEquals("p3DescriptorDefaultValue", a.getP3());
 	        assertEquals("p4DefaultValue", a.getP4());
 	        assertEquals("p5DefaultValue", a.getP5());
-	        
+	
 	    }
 	    catch (Exception e)
 	    {
 	        e.printStackTrace();
 	        fail("Exception occurs during the unit test : " + e);
 	    }
-	    
+	
 	}
 	
 	
@@ -109,13 +109,13 @@
         	nodeA.setProperty("ocm:p1", "p1Value");
         	ocm.getSession().save();
         	
-             
+
             // --------------------------------------------------------------------------------
             // Get the object
             // --------------------------------------------------------------------------------
             Default a = (Default) ocm.getObject( "/testDefault" );
             assertNotNull("a is null", a);
-            
+
             assertEquals("p1Value", a.getP1());
             assertNull(a.getP2());
             assertEquals("p3DescriptorDefaultValue", a.getP3());
@@ -128,7 +128,7 @@
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
-    
+
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationNullAtomicTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationNullAtomicTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationNullAtomicTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/AnnotationNullAtomicTest.java Sun Jan 27 13:08:08 2008
@@ -53,7 +53,7 @@
         // All methods starting with "test" will be executed in the test suite.
         return new RepositoryLifecycleTestSetup(new TestSuite(AnnotationNullAtomicTest.class));
     }
-    
+
 
     public void testNullValueAtomicFields()
     {
@@ -61,26 +61,26 @@
         {
 
         	ObjectContentManager ocm = getObjectContentManager();
-     
+
             // --------------------------------------------------------------------------------
             // Create and store an object graph in the repository
             // --------------------------------------------------------------------------------
             Atomic a = new Atomic();
             a.setPath("/test");
-            a.setIntegerObject(new Integer(100));            
+            a.setIntegerObject(new Integer(100));
             a.setDate(new Date());
             byte[] content = "Test Byte".getBytes();
             a.setByteArray(content);
             a.setCalendar(Calendar.getInstance());
             a.setDoubleObject(new Double(2.12));
             a.setDoublePrimitive(1.23);
-            
+
             ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream("Test Stream".getBytes());
             a.setInputStream(byteArrayInputStream);
-            
+
             ocm.insert(a);
             ocm.save();
-             
+
             // --------------------------------------------------------------------------------
             // Get the object
             // --------------------------------------------------------------------------------
@@ -88,32 +88,32 @@
             a = (Atomic) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             assertNull("Boolean object is not null", a.getBooleanObject());
-            
+
             assertFalse("Incorrect boolean primitive", a.isBooleanPrimitive());
             assertNotNull("Integer Object is null", a.getIntegerObject());
             assertTrue("Incorrect Integer object", a.getIntegerObject().intValue() == 100);
             assertTrue("Incorrect int primitive", a.getIntPrimitive() == 0);
-            assertNull("String object is not null", a.getString());            
+            assertNull("String object is not null", a.getString());
             assertNotNull("Byte array object is null", a.getByteArray());
             assertTrue("Incorrect byte object", new String(a.getByteArray()).equals("Test Byte"));
-            
+
             assertNotNull("date object is null", a.getDate());
             assertNotNull("calendar object is null", a.getCalendar());
-            
+
             assertNotNull("Double object is null", a.getDoubleObject());
             assertTrue("Incorrect double object", a.getDoubleObject().doubleValue() == 2.12);
             assertTrue("Incorrect double primitive", a.getDoublePrimitive() == 1.23);
-            
+
             assertNotNull("Incorrect input stream primitive", a.getInputStream());
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
-    
+
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterAtomicTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterAtomicTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterAtomicTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterAtomicTest.java Sun Jan 27 13:08:08 2008
@@ -54,7 +54,7 @@
         // All methods starting with "test" will be executed in the test suite.
         return new RepositoryLifecycleTestSetup(new TestSuite(DigesterAtomicTest.class));
     }
-    
+
     public void testAtomicFields()
     {
         try
@@ -74,7 +74,7 @@
             a.setString("Test String");
             a.setDate(date);
             a.setInt2boolean(true);
-            
+
             byte[] content = "Test Byte".getBytes();
             a.setByteArray(content);
             a.setCalendar(calendar);
@@ -82,17 +82,17 @@
             a.setDoublePrimitive(1.23);
             long now = System.currentTimeMillis();
             a.setTimestamp(new Timestamp(now));
-            
+
             ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream("Test Stream".getBytes());
             a.setInputStream(byteArrayInputStream);
             a.setNamedProperty("ocm:test");
             a.setPathProperty("/node1/node2");
             a.setUndefinedProperty("aStringData");
-            
+
             ocm.insert(a);
             ocm.save();
 
-             
+
             // --------------------------------------------------------------------------------
             // Get the object
             // --------------------------------------------------------------------------------
@@ -109,70 +109,70 @@
             assertTrue("Incorrect boolean object", a.getString().equals("Test String"));
             assertNotNull("Byte array object is null", a.getByteArray());
             assertTrue("Incorrect byte object", new String(a.getByteArray()).equals("Test Byte"));
-            
+
             assertNotNull("date object is null", a.getDate());
-            assertTrue("Invalid date", a.getDate().equals(date));            
+            assertTrue("Invalid date", a.getDate().equals(date));
             assertNotNull("calendar object is null", a.getCalendar());
-            
+
             log.debug("Calendar : " + a.getCalendar().get(Calendar.YEAR) + "-" + a.getCalendar().get(Calendar.MONTH) + "-" + a.getCalendar().get(Calendar.DAY_OF_MONTH));
             assertTrue("Invalid calendar object", a.getCalendar().equals(calendar));
-            
+
             assertNotNull("Double object is null", a.getDoubleObject());
             assertTrue("Incorrect double object", a.getDoubleObject().doubleValue() == 2.12);
             assertTrue("Incorrect double primitive", a.getDoublePrimitive() == 1.23);
-            
+
             assertNotNull("Incorrect input stream primitive", a.getInputStream());
             assertNotNull("Incorrect timestamp", a.getTimestamp());
-            assertTrue("Invalid timestamp value ", a.getTimestamp().getTime() == now);            
+            assertTrue("Invalid timestamp value ", a.getTimestamp().getTime() == now);
             assertTrue("Invalid int2boolean value ", a.isInt2boolean());
-            
+
             assertTrue("Invalid namedProperty value ", a.getNamedProperty().equals("ocm:test"));
             assertTrue("Invalid pathProperty value ", a.getPathProperty().equals("/node1/node2"));
             assertTrue("Invalid undefinedProperty value ", ((String) a.getUndefinedProperty()).equals("aStringData"));
             // --------------------------------------------------------------------------------
             // Update the property "namedProperty" with an invalid value
-            // --------------------------------------------------------------------------------            
-            try 
+            // --------------------------------------------------------------------------------
+            try
             {
                // update with an incorrect namespace - Should throws an exception
-               a.setNamedProperty("unknown:test");               
+               a.setNamedProperty("unknown:test");
                ocm.update(a);
                fail("Exception was not triggered with an invalid namespace");
                ocm.save();
             }
             catch (Exception e)
             {
-               
-                
+
+
             }
-            
+
             // --------------------------------------------------------------------------------
             // Update the property "pathProperty" with an invalid value
-            // --------------------------------------------------------------------------------            
-            try 
+            // --------------------------------------------------------------------------------
+            try
             {
                // update with an incorrect namespace - Should throws an exception
-               a.setPathProperty("//node1");               
+               a.setPathProperty("//node1");
                ocm.update(a);
                fail("Exception was not triggered with an invalid path");
                ocm.save();
             }
             catch (Exception e)
             {
-               
-                
+
+
             }
-            
+
             // --------------------------------------------------------------------------------
             // Update the property "undefinedProperty" with an invalid value
-            // --------------------------------------------------------------------------------            
+            // --------------------------------------------------------------------------------
             a = null;
             a = (Atomic) ocm.getObject( "/test");
 
             a.setUndefinedProperty(new Double(1.2));
             ocm.update(a);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Get the object
             // --------------------------------------------------------------------------------
@@ -180,14 +180,14 @@
             a = (Atomic) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             assertTrue("Invalid undefinedProperty value ", ((Double) a.getUndefinedProperty()).doubleValue() == 1.2);
-            
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
-    
+
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterDefaultValueTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterDefaultValueTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterDefaultValueTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterDefaultValueTest.java Sun Jan 27 13:08:08 2008
@@ -49,13 +49,13 @@
         // All methods starting with "test" will be executed in the test suite.
         return new RepositoryLifecycleTestSetup(new TestSuite(DigesterDefaultValueTest.class));
     }
-    
+
 	public void testDefaultValues()
 	{
 	    try
 	    {
 	        ObjectContentManager ocm = getObjectContentManager();
-	        
+	
 	        // --------------------------------------------------------------------------------
 	        // Create and store an object graph in the repository
 	        // --------------------------------------------------------------------------------
@@ -63,31 +63,31 @@
 	        a.setPath("/testDefault");
 	        a.setP1("p1Value");
 	        // do not set p2, p3, p4, p5
-	        
+	
 	        ocm.insert(a);
 	        ocm.save();
-	        
-	        
+	
+	
 	        // --------------------------------------------------------------------------------
 	        // Get the object
 	        // --------------------------------------------------------------------------------
 	        a = null;
 	        a = (Default) ocm.getObject( "/testDefault" );
 	        assertNotNull("a is null", a);
-	        
+	
 	        assertEquals("p1Value", a.getP1());
 	        assertNull(a.getP2());
 	        assertEquals("p3DescriptorDefaultValue", a.getP3());
 	        assertEquals("p4DefaultValue", a.getP4());
 	        assertEquals("p5DefaultValue", a.getP5());
-	        
+	
 	    }
 	    catch (Exception e)
 	    {
 	        e.printStackTrace();
 	        fail("Exception occurs during the unit test : " + e);
 	    }
-	    
+	
 	}
 	
 	
@@ -108,13 +108,13 @@
         	nodeA.setProperty("ocm:p1", "p1Value");
         	ocm.getSession().save();
         	
-             
+
             // --------------------------------------------------------------------------------
             // Get the object
             // --------------------------------------------------------------------------------
             Default a = (Default) ocm.getObject( "/testDefault" );
             assertNotNull("a is null", a);
-            
+
             assertEquals("p1Value", a.getP1());
             assertNull(a.getP2());
             assertEquals("p3DescriptorDefaultValue", a.getP3());
@@ -127,7 +127,7 @@
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
-    
+
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterNullAtomicTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterNullAtomicTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterNullAtomicTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/DigesterNullAtomicTest.java Sun Jan 27 13:08:08 2008
@@ -53,7 +53,7 @@
         // All methods starting with "test" will be executed in the test suite.
         return new RepositoryLifecycleTestSetup(new TestSuite(DigesterNullAtomicTest.class));
     }
-     
+
 
     public void testNullValueAtomicFields()
     {
@@ -61,26 +61,26 @@
         {
 
         	ObjectContentManager ocm = getObjectContentManager();
-     
+
             // --------------------------------------------------------------------------------
             // Create and store an object graph in the repository
             // --------------------------------------------------------------------------------
             Atomic a = new Atomic();
             a.setPath("/test");
-            a.setIntegerObject(new Integer(100));            
+            a.setIntegerObject(new Integer(100));
             a.setDate(new Date());
             byte[] content = "Test Byte".getBytes();
             a.setByteArray(content);
             a.setCalendar(Calendar.getInstance());
             a.setDoubleObject(new Double(2.12));
             a.setDoublePrimitive(1.23);
-            
+
             ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream("Test Stream".getBytes());
             a.setInputStream(byteArrayInputStream);
-            
+
             ocm.insert(a);
             ocm.save();
-             
+
             // --------------------------------------------------------------------------------
             // Get the object
             // --------------------------------------------------------------------------------
@@ -88,32 +88,32 @@
             a = (Atomic) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             assertNull("Boolean object is not null", a.getBooleanObject());
-            
+
             assertFalse("Incorrect boolean primitive", a.isBooleanPrimitive());
             assertNotNull("Integer Object is null", a.getIntegerObject());
             assertTrue("Incorrect Integer object", a.getIntegerObject().intValue() == 100);
             assertTrue("Incorrect int primitive", a.getIntPrimitive() == 0);
-            assertNull("String object is not null", a.getString());            
+            assertNull("String object is not null", a.getString());
             assertNotNull("Byte array object is null", a.getByteArray());
             assertTrue("Incorrect byte object", new String(a.getByteArray()).equals("Test Byte"));
-            
+
             assertNotNull("date object is null", a.getDate());
             assertNotNull("calendar object is null", a.getCalendar());
-            
+
             assertNotNull("Double object is null", a.getDoubleObject());
             assertTrue("Incorrect double object", a.getDoubleObject().doubleValue() == 2.12);
             assertTrue("Incorrect double primitive", a.getDoublePrimitive() == 1.23);
-            
+
             assertNotNull("Incorrect input stream primitive", a.getInputStream());
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
-    
+
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/Int2BooleanTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/Int2BooleanTypeConverterImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/Int2BooleanTypeConverterImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/atomic/Int2BooleanTypeConverterImpl.java Sun Jan 27 13:08:08 2008
@@ -27,12 +27,12 @@
  * This is a simple converter which convert a boolean field value into a jcr long property (int type is not defined in the jcr spec).
  *
  * @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- * 
+ *
  */
 public class Int2BooleanTypeConverterImpl implements AtomicTypeConverter
 {
 	/**
-	 * 
+	 *
 	 * @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
 	 */
 	public Value getValue(ValueFactory valueFactory, Object propValue)
@@ -53,7 +53,7 @@
 	
 
     /**
-     * 
+     *
      * @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
      */
 	public Object getObject(Value value)
@@ -77,13 +77,13 @@
     }
 	
 	/**
-	 * 
+	 *
 	 * @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
 	 */
 	public String getXPathQueryValue(ValueFactory valueFactory, Object object)
 	{
 		
-		return ((Boolean) object).booleanValue() ? "1" : "0"; 
+		return ((Boolean) object).booleanValue() ? "1" : "0";
 	}
 
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AllTests.java Sun Jan 27 13:08:08 2008
@@ -24,7 +24,7 @@
 
 /**
  * Package level tests.
- * 
+ *
  * @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
  */
 public class AllTests {

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AnnotationAutoTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AnnotationAutoTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AnnotationAutoTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/auto/AnnotationAutoTest.java Sun Jan 27 13:08:08 2008
@@ -77,28 +77,28 @@
 		//---------------------------------------------------------------------------------------------------------
 	    Folder  folder = new FolderImpl();
 	    folder.setPath("/folder2");
-	    folder.setName("folder2");        
+	    folder.setName("folder2");
 		
 	    Document document = new DocumentImpl();
 	    document.setPath("/folder2/document4");
 	    document.setName("document4");
-	    document.setContentType("plain/text"); 
+	    document.setContentType("plain/text");
 	    DocumentStream documentStream = new DocumentStream();
 	    documentStream.setEncoding("utf-8");
 	    documentStream.setContent("Test Content 4".getBytes());
-	    document.setDocumentStream(documentStream);       
+	    document.setDocumentStream(documentStream);
 
 	    Folder subFolder = new FolderImpl();
 	    subFolder.setName("subfolder");
 	    subFolder.setPath("/folder2/subfolder");
-	    	    	    
+	    	    	
 	    folder.addChild(document);
 	    folder.addChild(subFolder);
 	    ocm.insert(folder);               		
 		ocm.save();
 		
 		//---------------------------------------------------------------------------------------------------------	
-		// Retrieve folder2 
+		// Retrieve folder2
 		//---------------------------------------------------------------------------------------------------------	
 		Folder folder2 = (Folder) ocm.getObject( "/folder2");
 		assertNotNull("folder 2 is null", folder2);
@@ -112,14 +112,14 @@
 		ocm.save();
 		
 		//---------------------------------------------------------------------------------------------------------	
-		// Retrieve folder2 
+		// Retrieve folder2
 		//---------------------------------------------------------------------------------------------------------	
 		 folder2 = (Folder) ocm.getObject( "/folder2");
 		assertNotNull("folder 2 is null", folder2);
 		assertEquals("Invalid number of cms object  found in folder2 children", folder2.getChildren().size() ,0); // autoInsert = false
 
 		//---------------------------------------------------------------------------------------------------------	
-		// Retrieve children attribute 
+		// Retrieve children attribute
 		//---------------------------------------------------------------------------------------------------------			
 		ocm.retrieveMappedAttribute(folder2, "children");
 		assertNotNull("folder 2 is null", folder2);
@@ -128,14 +128,14 @@
 		assertTrue("Invalid item in the collection", this.contains(folder2.getChildren(), "/folder2/subfolder", FolderImpl.class));		
 		
 		//---------------------------------------------------------------------------------------------------------	
-		// Update 
+		// Update
 		//---------------------------------------------------------------------------------------------------------	
 		folder2.setChildren(null);
 		ocm.update(folder2); // autoupdate = false for the children attribute. So no update on the children collection
 		ocm.save();
 
 		//---------------------------------------------------------------------------------------------------------	
-		// Retrieve children attribute 
+		// Retrieve children attribute
 		//---------------------------------------------------------------------------------------------------------			
 		ocm.retrieveMappedAttribute(folder2, "children");
 		assertNotNull("folder 2 is null", folder2);

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/auto/DigesterAutoTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/auto/DigesterAutoTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/auto/DigesterAutoTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/auto/DigesterAutoTest.java Sun Jan 27 13:08:08 2008
@@ -71,28 +71,28 @@
 		//---------------------------------------------------------------------------------------------------------
 	    Folder  folder = new FolderImpl();
 	    folder.setPath("/folder2");
-	    folder.setName("folder2");        
+	    folder.setName("folder2");
 		
 	    Document document = new DocumentImpl();
 	    document.setPath("/folder2/document4");
 	    document.setName("document4");
-	    document.setContentType("plain/text"); 
+	    document.setContentType("plain/text");
 	    DocumentStream documentStream = new DocumentStream();
 	    documentStream.setEncoding("utf-8");
 	    documentStream.setContent("Test Content 4".getBytes());
-	    document.setDocumentStream(documentStream);       
+	    document.setDocumentStream(documentStream);
 
 	    Folder subFolder = new FolderImpl();
 	    subFolder.setName("subfolder");
 	    subFolder.setPath("/folder2/subfolder");
-	    	    	    
+	    	    	
 	    folder.addChild(document);
 	    folder.addChild(subFolder);
 	    ocm.insert(folder);               		
 		ocm.save();
 		
 		//---------------------------------------------------------------------------------------------------------	
-		// Retrieve folder2 
+		// Retrieve folder2
 		//---------------------------------------------------------------------------------------------------------	
 		Folder folder2 = (Folder) ocm.getObject( "/folder2");
 		assertNotNull("folder 2 is null", folder2);
@@ -106,14 +106,14 @@
 		ocm.save();
 		
 		//---------------------------------------------------------------------------------------------------------	
-		// Retrieve folder2 
+		// Retrieve folder2
 		//---------------------------------------------------------------------------------------------------------	
 		 folder2 = (Folder) ocm.getObject( "/folder2");
 		assertNotNull("folder 2 is null", folder2);
 		assertEquals("Invalid number of cms object  found in folder2 children", folder2.getChildren().size() ,0); // autoInsert = false
 
 		//---------------------------------------------------------------------------------------------------------	
-		// Retrieve children attribute 
+		// Retrieve children attribute
 		//---------------------------------------------------------------------------------------------------------			
 		ocm.retrieveMappedAttribute(folder2, "children");
 		assertNotNull("folder 2 is null", folder2);
@@ -122,14 +122,14 @@
 		assertTrue("Invalid item in the collection", this.contains(folder2.getChildren(), "/folder2/subfolder", FolderImpl.class));		
 		
 		//---------------------------------------------------------------------------------------------------------	
-		// Update 
+		// Update
 		//---------------------------------------------------------------------------------------------------------	
 		folder2.setChildren(null);
 		ocm.update(folder2); // autoupdate = true for the children attribute. So no update on the children collection
 		ocm.save();
 
 		//---------------------------------------------------------------------------------------------------------	
-		// Retrieve children attribute 
+		// Retrieve children attribute
 		//---------------------------------------------------------------------------------------------------------			
 		ocm.retrieveMappedAttribute(folder2, "children");
 		assertNotNull("folder 2 is null", folder2);

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AllTests.java Sun Jan 27 13:08:08 2008
@@ -24,7 +24,7 @@
 
 /**
  * Package level tests.
- * 
+ *
  * @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
  */
 public class AllTests {
@@ -41,12 +41,12 @@
         suite.addTestSuite(DigesterRemoveTest.class);
         suite.addTestSuite(DigesterSameNameSiblingTest.class);
         suite.addTestSuite(DigesterSimpleTest.class);
-        
+
         suite.addTestSuite(AnnotationAvoidRecursiveLoopTest.class);
         suite.addTestSuite(AnnotationCopyMoveTest.class);
         suite.addTestSuite(AnnotationRemoveTest.class);
         suite.addTestSuite(AnnotationSameNameSiblingTest.class);
-        suite.addTestSuite(AnnotationSimpleTest.class);        
+        suite.addTestSuite(AnnotationSimpleTest.class);
 
         //$JUnit-END$
 

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationAvoidRecursiveLoopTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationAvoidRecursiveLoopTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationAvoidRecursiveLoopTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationAvoidRecursiveLoopTest.java Sun Jan 27 13:08:08 2008
@@ -50,7 +50,7 @@
 
 /**
  * Basic test for ObjectContentManager
- * Test when objects are cross referenced 
+ * Test when objects are cross referenced
  * eg. object 'a' contains a reference to an object 'b' and object 'b' contains a reference to 'a'.
  *
  * @author <a href="mailto:christophe.lombart@gmail.com>Christophe Lombart</a>
@@ -75,7 +75,7 @@
                 new TestSuite(AnnotationAvoidRecursiveLoopTest.class));
     }
 
-    
+
     public void testCrossReferences()
     {
         try
@@ -88,59 +88,59 @@
             a.setPath("/test");
             a.setA1("a1");
             a.setA2("a2");
-            
+
             ocm.insert(a);
             ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
-            
+
             B b = new B();
             b.setB1("b1");
             b.setB2("b2");
-            // Add crossreference between b and a 
+            // Add crossreference between b and a
             a.setB(b);
-            b.setA(a); 
+            b.setA(a);
 
             B b1 = new B();
             b1.setB1("b1.1");
-            b1.setB2("b1.2");            
+            b1.setB2("b1.2");
             b1.setA(a);
             a.addB(b1);
 
             B b2 = new B();
             b2.setB1("b2.1");
-            b2.setB2("b2.2");            
+            b2.setB2("b2.2");
             b2.setA(a);
             a.addB(b2);
 
             ocm.update(a);
             ocm.save();
-            
+
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             assertTrue("Duplicate instance a", a == a.getB().getA());
-            
+
             Collection collection = a.getCollection();
             assertTrue("Invalid number of items in the collection", collection.size() == 2);
             B[] bs = (B[]) collection.toArray(new B[2]);
             assertTrue("Duplicate instance a", a == bs[0].getA());
             assertTrue("Duplicate instance a", a == bs[1].getA());
-            
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
 	
@@ -158,6 +158,6 @@
 		
 	}	
 
-    
+
 
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationCopyMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationCopyMoveTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationCopyMoveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationCopyMoveTest.java Sun Jan 27 13:08:08 2008
@@ -68,7 +68,7 @@
     {
         super.setUp();
 
-        
+
     }
 
 	public void testCopy()
@@ -85,36 +85,36 @@
         b.setB1("b1");
         b.setB2("b2");
         a.setB(b);
-        
+
         C c1 = new C();
         c1.setId("first");
         c1.setName("First Element");
         C c2 = new C();
         c2.setId("second");
         c2.setName("Second Element");
-        
+
         C c3 = new C();
         c3.setId("third");
         c3.setName("Third Element");
-        
-        
+
+
         Collection collection = new ArrayList();
         collection.add(c1);
         collection.add(c2);
         collection.add(c3);
-        
+
         a.setCollection(collection);
-        
+
         ocm.insert(a);
         ocm.save();
 		
         // --------------------------------------------------------------------------------
-        // Copy the object 
+        // Copy the object
         // --------------------------------------------------------------------------------
-        ocm.copy("/test", "/test2");      
-        
+        ocm.copy("/test", "/test2");
+
         // --------------------------------------------------------------------------------
-        // Get the object 
+        // Get the object
         // --------------------------------------------------------------------------------
         a = (A) ocm.getObject("/test2");
         assertNotNull("a is null", a);
@@ -122,36 +122,36 @@
         assertTrue("Invalid field b.b1", a.getB().getB1().equals("b1"));
         assertTrue("Invalid number of items in field collection", a.getCollection().size() == 3);
 
-        
+
         // --------------------------------------------------------------------------------
-        // Check exceptions 
+        // Check exceptions
         // --------------------------------------------------------------------------------
-       
-        try 
+
+        try
         {
 			ocm.copy("/incorrectpath", "/test2");			
 			fail("the copy method accepts an incorrect source path");
-		} catch (ObjectContentManagerException e) 
+		} catch (ObjectContentManagerException e)
 		{
 			// Nothing to do  - Expected behaviour
-		}       
+		}
 
-        try 
+        try
         {
 			ocm.copy("/test", "incorrectpath");			
 			fail("the copy method accepts an incorrect destination path");
-		} catch (ObjectContentManagerException e) 
+		} catch (ObjectContentManagerException e)
 		{
 			// Nothing to do  - Expected behaviour
 		}
 		
         // --------------------------------------------------------------------------------
-        // Remove objects 
+        // Remove objects
         // --------------------------------------------------------------------------------
         ocm.remove("/test");
         ocm.remove("/test2");
         ocm.save();
-        
+
 	}
 
 	public void testSimpleMove()
@@ -169,53 +169,53 @@
         	ocm.save();
 			
 			// --------------------------------------------------------------------------------
-			// Copy the object 
+			// Copy the object
 			// --------------------------------------------------------------------------------
         	ocm.move("/source", "/result");
 
 			// --------------------------------------------------------------------------------
-			// Get the object 
+			// Get the object
 			// --------------------------------------------------------------------------------
 			atomic = (Atomic) ocm.getObject("/result");
 			assertNotNull("atomic is null", atomic);
-			assertTrue("Invalid field a1", atomic.getString().equals("test atomic"));			        
+			assertTrue("Invalid field a1", atomic.getString().equals("test atomic"));			
 
 			assertFalse("Object with path /source still exists", ocm.objectExists("/source"));
 
 			// --------------------------------------------------------------------------------
-			// Check exceptions 
-			// --------------------------------------------------------------------------------      
-			try 
+			// Check exceptions
+			// --------------------------------------------------------------------------------
+			try
 			{
 				ocm.move("/incorrectpath", "/test2");			
 				fail("the copy method accepts an incorrect source path");
-			} catch (ObjectContentManagerException e) 
+			} catch (ObjectContentManagerException e)
 			{
 				// Nothing to do  - Expected behaviour
-			}       
+			}
 
-			try 
+			try
 			{
 				ocm.move("/test", "incorrectpath");			
 				fail("the copy method accepts an incorrect destination path");
-			} catch (ObjectContentManagerException e) 
+			} catch (ObjectContentManagerException e)
 			{
 				// Nothing to do  - Expected behaviour
 			}
 			
 			// --------------------------------------------------------------------------------
-			// Remove objects 
+			// Remove objects
 			// --------------------------------------------------------------------------------
 			ocm.remove("/result");
 			ocm.save();
-		} 
-        catch (Exception e) 
+		}
+        catch (Exception e)
 		{
         	e.printStackTrace();
         	fail();
 		}
 		
-        
+
 	}
 	
 	public void testObjectGraphMove()
@@ -257,27 +257,27 @@
         	ocm.save();
 			
 			// --------------------------------------------------------------------------------
-			// Copy the object 
+			// Copy the object
 			// --------------------------------------------------------------------------------			
-        	ocm.move("/source", "/result");            
+        	ocm.move("/source", "/result");
         	// --------------------------------------------------------------------------------
-			// Get the object 
+			// Get the object
 			// --------------------------------------------------------------------------------
 			a = (A) ocm.getObject("/result");
 			assertNotNull("a is null", a);
 			assertTrue("Invalid field a1", a.getA1().equals("a1"));
 			assertTrue("Invalid field b.b1", a.getB().getB1().equals("b1"));
 			assertTrue("Invalid number of items in field collection", a.getCollection().size() == 3);
-			        
+			
 			assertFalse("Object with path /source still exists", ocm.objectExists("/source"));
 			
 			// --------------------------------------------------------------------------------
-			// Remove objects 
+			// Remove objects
 			// --------------------------------------------------------------------------------
 			ocm.remove("/result");
 			ocm.save();
-		} 
-        catch (Exception e) 
+		}
+        catch (Exception e)
 		{
         	e.printStackTrace();
         	fail();

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationRemoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationRemoveTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationRemoveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationRemoveTest.java Sun Jan 27 13:08:08 2008
@@ -69,7 +69,7 @@
     {
         super.setUp();
 		this.importData(date);
-        
+
     }
 	
 

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSameNameSiblingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSameNameSiblingTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSameNameSiblingTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSameNameSiblingTest.java Sun Jan 27 13:08:08 2008
@@ -78,22 +78,22 @@
 			this.importData(date);
 			ObjectContentManager ocm = this.getObjectContentManager();
 				
-			// Query all objects 
+			// Query all objects
 			QueryManager queryManager = this.getQueryManager();
 			Filter filter = queryManager.createFilter(Atomic.class);	
 			filter.setScope("/");
 			Query query = queryManager.createQuery(filter);
 			Collection result = ocm.getObjects(query);
             assertEquals("Incorrect number of objects found", 10, result.size());
-                         
+
             // Get objects
             Atomic atomic = (Atomic) ocm.getObject( "/test[2]");
             assertNotNull("Object /test[2] not found", atomic);
-            
+
             atomic = (Atomic) ocm.getObject( "/test[10]");
-            assertNotNull("Object /test[2] not found", atomic);            
-            
-            // Update the object 
+            assertNotNull("Object /test[2] not found", atomic);
+
+            // Update the object
             atomic.setString("Modified Test String 10");
             ocm.update(atomic);
             ocm.save();
@@ -105,23 +105,23 @@
 			query = queryManager.createQuery(filter);
 			result = ocm.getObjects(query);
 			assertTrue("Incorrect number of objects found", result.size() == 1);
-            
+
 			atomic = (Atomic) ocm.getObject(query);
 			assertNotNull("Object not found", atomic);
-			assertTrue("Incorrect Object", atomic.getString().equals("Modified Test String 10"));   
+			assertTrue("Incorrect Object", atomic.getString().equals("Modified Test String 10"));
 			
             // Delete all objects
             queryManager = this.getQueryManager();
 			filter = queryManager.createFilter(Atomic.class);	
 			filter.setScope("/");
-			query = queryManager.createQuery(filter) ;           
+			query = queryManager.createQuery(filter) ;
             ocm.remove(query);
             ocm.save();
 
 			result = ocm.getObjects(query);
             assertTrue("Incorrect number of objects found", result.size() == 0);
-            
-            
+
+
 		}
 		catch (Exception e)
 		{
@@ -136,22 +136,22 @@
 		     ObjectContentManager ocm = getObjectContentManager();
              try
              {
-            	 
+            	
             	 Page page = new Page();
             	 page.setPath("/page");
-            	 page.setTitle("Page Title");            	 
+            	 page.setTitle("Page Title");            	
             	 ocm.insert(page);
             	 ocm.save();
-            	 
+            	
             	 Paragraph p1 = new Paragraph("para1");
             	 p1.setPath("/page/paragraph");
             	 ocm.insert(p1);
-            	 
+            	
             	 Paragraph p2 = new Paragraph("para1");
             	 p2.setPath("/page/paragraph");
             	 ocm.insert(p2);
-             fail();            	 
-            	 
+             fail();            	
+            	
              }
              catch(Exception e)
              {

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSimpleTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSimpleTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSimpleTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/AnnotationSimpleTest.java Sun Jan 27 13:08:08 2008
@@ -57,7 +57,7 @@
                 new TestSuite(AnnotationSimpleTest.class));
     }
 
-    
+
     public void testClassA()
     {
         try
@@ -76,33 +76,33 @@
             b.setB1("b1");
             b.setB2("b2");
             a.setB(b);
-            
+
             C c1 = new C();
             c1.setId("first");
             c1.setName("First Element");
             C c2 = new C();
             c2.setId("second");
             c2.setName("Second Element");
-            
+
             C c3 = new C();
             c3.setId("third");
             c3.setName("Third Element");
-            
-            
+
+
             Collection collection = new ArrayList();
             collection.add(c1);
             collection.add(c2);
             collection.add(c3);
-            
+
             a.setCollection(collection);
-            
+
             ocm.insert(a);
             ocm.save();
-            
+
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             assertTrue("Incorrect a1", a.getA1().equals("a1"));
@@ -110,7 +110,7 @@
             assertTrue("Incorrect a.b.b1", a.getB().getB1().equals("b1"));
             assertNotNull("a.collection is null", a.getCollection());
             assertTrue("Incorrect a.collection", ((C) a.getCollection().iterator().next()).getId().equals("first"));
-            
+
             // --------------------------------------------------------------------------------
             // Update the object
             // --------------------------------------------------------------------------------
@@ -119,31 +119,31 @@
             newB.setB1("new B1");
             newB.setB2("new B2");
             a.setB(newB);
-            
-            
+
+
             ocm.update(a);
             ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject("/test");
             assertNotNull("a is null", a);
             assertTrue("Incorrect a1", a.getA1().equals("new value"));
             assertNotNull("a.b is null", a.getB());
             assertTrue("Incorrect a.b.b1", a.getB().getB1().equals("new B1"));
-            
 
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
-    
+
     /**
      * Test an persistent object mapped with a discriminator and with a nodetype
      *
@@ -161,34 +161,34 @@
          	Discriminator discriminatorObject = new Discriminator();
          	discriminatorObject.setPath("/test");
          	discriminatorObject.setContent("This is my content");
-             ocm.insert(discriminatorObject);             
+             ocm.insert(discriminatorObject);
              ocm.save();
-             
+
 
              // --------------------------------------------------------------------------------
              // Get the object
-             // --------------------------------------------------------------------------------           
+             // --------------------------------------------------------------------------------
              discriminatorObject = (Discriminator) ocm.getObject( "/test");
              assertNotNull("discriminator object  is null", discriminatorObject );
              assertTrue("Incorrect content", discriminatorObject.getContent().equals("This is my content"));
-             
+
              // --------------------------------------------------------------------------------
              // Update the object
              // --------------------------------------------------------------------------------
-             discriminatorObject.setContent("new content");             
-             
+             discriminatorObject.setContent("new content");
+
              ocm.update(discriminatorObject);
              ocm.save();
 
              // --------------------------------------------------------------------------------
              // Get the object
-             // --------------------------------------------------------------------------------           
+             // --------------------------------------------------------------------------------
              discriminatorObject = (Discriminator) ocm.getObject( "/test");
              assertNotNull("discriminator object  is null", discriminatorObject );
              assertTrue("Incorrect content", discriminatorObject.getContent().equals("new content"));
-             
 
-             
+
+
          }
          catch (Exception e)
          {
@@ -196,13 +196,13 @@
              fail("Exception occurs during the unit test : " + e);
          }	
     }
-    
+
     public void testIsPersistent()
-    {    
+    {
     	ObjectContentManager ocm = getObjectContentManager();
     	assertTrue("Class A is not persistent ", ocm.isPersistent(A.class));
     	assertFalse("Class String is  persistent - hum ? ", ocm.isPersistent(String.class));
     }
-    
+
 
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterAvoidRecursiveLoopTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterAvoidRecursiveLoopTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterAvoidRecursiveLoopTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/basic/DigesterAvoidRecursiveLoopTest.java Sun Jan 27 13:08:08 2008
@@ -37,7 +37,7 @@
 
 /**
  * Basic test for ObjectContentManager
- * Test when objects are cross referenced 
+ * Test when objects are cross referenced
  * eg. object 'a' contains a reference to an object 'b' and object 'b' contains a reference to 'a'.
  *
  * @author <a href="mailto:christophe.lombart@gmail.com>Christophe Lombart</a>
@@ -62,7 +62,7 @@
                 new TestSuite(DigesterAvoidRecursiveLoopTest.class));
     }
 
-    
+
     public void testCrossReferences()
     {
         try
@@ -75,59 +75,59 @@
             a.setPath("/test");
             a.setA1("a1");
             a.setA2("a2");
-            
+
             ocm.insert(a);
             ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
-            
+
             B b = new B();
             b.setB1("b1");
             b.setB2("b2");
-            // Add crossreference between b and a 
+            // Add crossreference between b and a
             a.setB(b);
-            b.setA(a); 
+            b.setA(a);
 
             B b1 = new B();
             b1.setB1("b1.1");
-            b1.setB2("b1.2");            
+            b1.setB2("b1.2");
             b1.setA(a);
             a.addB(b1);
 
             B b2 = new B();
             b2.setB1("b2.1");
-            b2.setB2("b2.2");            
+            b2.setB2("b2.2");
             b2.setA(a);
             a.addB(b2);
 
             ocm.update(a);
             ocm.save();
-            
+
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             assertTrue("Duplicate instance a", a == a.getB().getA());
-            
+
             Collection collection = a.getCollection();
             assertTrue("Invalid number of items in the collection", collection.size() == 2);
             B[] bs = (B[]) collection.toArray(new B[2]);
             assertTrue("Duplicate instance a", a == bs[0].getA());
             assertTrue("Duplicate instance a", a == bs[1].getA());
-            
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
 	
@@ -136,11 +136,11 @@
 		Repository repository = RepositoryUtil.getRepository("repositoryTest");
 		String[] files = { "./src/test/test-config/jcrmapping-avoidrecursiveloop.xml" };
 		session = RepositoryUtil.login(repository, "superuser", "superuser");
-       
+
 		ocm = new ObjectContentManagerImpl(session, files);
 		
 	}	
 
-    
+
 
 }



Mime
View raw message