Author: clombart Date: Mon Aug 6 13:06:59 2007 New Revision: 563250 URL: http://svn.apache.org/viewvc?view=rev&rev=563250 Log: Code clean-up Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/transaction/jackrabbit/UserTransactionImpl.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/AllTests.java jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/transaction/jackrabbit/UserTransactionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/transaction/jackrabbit/UserTransactionImpl.java?view=diff&rev=563250&r1=563249&r2=563250 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/transaction/jackrabbit/UserTransactionImpl.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/transaction/jackrabbit/UserTransactionImpl.java Mon Aug 6 13:06:59 2007 @@ -16,17 +16,17 @@ */ package org.apache.jackrabbit.ocm.transaction.jackrabbit; -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; -import javax.transaction.xa.XAException; -import javax.transaction.UserTransaction; -import javax.transaction.Status; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; +import javax.jcr.Session; import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; +import javax.transaction.NotSupportedException; import javax.transaction.RollbackException; -import javax.jcr.Session; +import javax.transaction.Status; +import javax.transaction.SystemException; +import javax.transaction.UserTransaction; +import javax.transaction.xa.XAException; +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; import org.apache.jackrabbit.core.XASession; Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/AllTests.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/AllTests.java?view=diff&rev=563250&r1=563249&r2=563250 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/AllTests.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/AllTests.java Mon Aug 6 13:06:59 2007 @@ -19,10 +19,6 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jackrabbit.ocm.mapper.DigesterMapperImplTest; -import org.apache.jackrabbit.ocm.querymanager.QueryManagerTest; -import org.apache.jackrabbit.ocm.repository.RepositoryUtilTest; - /** * OCM suite definition. Bundles together all independent and package level test suites. Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java?view=diff&rev=563250&r1=563249&r2=563250 ============================================================================== --- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java (original) +++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/TestBase.java Mon Aug 6 13:06:59 2007 @@ -22,14 +22,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.sql.Timestamp; -import java.util.Calendar; import java.util.Collection; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.HashMap; import java.util.Iterator; -import java.util.Map; import javax.jcr.ImportUUIDBehavior; import javax.jcr.Node; @@ -51,29 +45,11 @@ import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry; import org.apache.jackrabbit.core.nodetype.xml.NodeTypeReader; import org.apache.jackrabbit.ocm.manager.ObjectContentManager; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverterProvider; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.BinaryTypeConverterImpl; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.BooleanTypeConverterImpl; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.ByteArrayTypeConverterImpl; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.CalendarTypeConverterImpl; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.DefaultAtomicTypeConverterProvider; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.DoubleTypeConverterImpl; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.IntTypeConverterImpl; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.LongTypeConverterImpl; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.StringTypeConverterImpl; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.TimestampTypeConverterImpl; -import org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.UtilDateTypeConverterImpl; import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl; -import org.apache.jackrabbit.ocm.manager.inheritance.ObjectContentManagerInheritanceHierarchyTest; -import org.apache.jackrabbit.ocm.manager.objectconverter.ObjectConverter; -import org.apache.jackrabbit.ocm.manager.objectconverter.impl.ObjectConverterImpl; import org.apache.jackrabbit.ocm.mapper.Mapper; -import org.apache.jackrabbit.ocm.mapper.impl.DigesterMapperImpl; import org.apache.jackrabbit.ocm.query.QueryManager; -import org.apache.jackrabbit.ocm.query.impl.QueryManagerImpl; import org.apache.jackrabbit.ocm.reflection.ReflectionUtils; import org.apache.jackrabbit.ocm.repository.RepositoryUtil; -import org.apache.jackrabbit.ocm.testmodel.inheritance.Ancestor; import org.xml.sax.ContentHandler; /**