You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/01/27 22:08:36 UTC
svn commit: r615649 [13/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/ jackr...
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/version/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/version/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/version/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/version/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 {
@@ -38,7 +38,7 @@
//$JUnit-BEGIN$
suite.addTestSuite(AnnotationBasicVersionningTest.class);
suite.addTestSuite(DigesterBasicVersionningTest.class);
-
+
//$JUnit-END$
return suite;
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/version/AnnotationBasicVersionningTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/version/AnnotationBasicVersionningTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/version/AnnotationBasicVersionningTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/version/AnnotationBasicVersionningTest.java Sun Jan 27 13:08:08 2008
@@ -64,39 +64,39 @@
ObjectContentManager ocm = getObjectContentManager();
try
{
-
+
Page page = new Page();
page.setPath("/page");
- page.setTitle("Page Title");
+ page.setTitle("Page Title");
page.addParagraph(new Paragraph("para1"));
page.addParagraph(new Paragraph("para2"));
ocm.insert(page);
ocm.save();
-
-
+
+
page.addParagraph(new Paragraph("para3"));
ocm.checkout("/page");
ocm.update(page);
ocm.save();
ocm.checkin("/page");
-
+
page.addParagraph(new Paragraph("para4"));
ocm.checkout("/page");
ocm.update(page);
ocm.save();
- ocm.checkin("/page");
+ ocm.checkin("/page");
VersionIterator versionIterator = ocm.getAllVersions("/page");
assertNotNull("VersionIterator is null", versionIterator);
assertTrue("Invalid number of versions found", versionIterator.getSize() == 3);
-
+
while (versionIterator.hasNext())
{
Version version = (Version) versionIterator.next();
log.info("version found : "+ version.getName() + " - " + version.getPath() + " - " + version.getCreated().getTime());
-
+
}
-
+
Version baseVersion = ocm.getBaseVersion("/page");
System.out.println("Base version : " + baseVersion.getName());
@@ -104,13 +104,13 @@
System.out.println("Root version : " + rootVersion.getName());
//this.exportDocument("/home/christophe/export.xml", "/jcr:system/jcr:versionStorage", true, false);
- //Get the latest version
+ //Get the latest version
page = (Page) ocm.getObject( "/page");
assertNotNull("Last version is nulll", page);
assertTrue("Invalid number of paragraph found in the last version", page.getParagraphs().size() == 4);
-
- //Get the object matching to the first version
+
+ //Get the object matching to the first version
Page page1 = (Page) ocm.getObject( "/page", "1.0");
assertNotNull("version 1.0 object is null", page1);
assertTrue("Invalid number of paragraph found in the root version", page1.getParagraphs().size() == 3);
@@ -120,7 +120,7 @@
{
e.printStackTrace();
fail(e.getMessage());
-
+
}
}
@@ -130,27 +130,27 @@
ObjectContentManager ocm = getObjectContentManager();
try
{
-
+
Page page = new Page();
page.setPath("/page");
- page.setTitle("Page Title");
+ page.setTitle("Page Title");
page.addParagraph(new Paragraph("para1"));
page.addParagraph(new Paragraph("para2"));
ocm.insert(page);
ocm.save();
-
-
+
+
page.addParagraph(new Paragraph("para3"));
ocm.checkout("/page");
ocm.update(page);
ocm.save();
ocm.checkin("/page", new String[] {"A", "B"});
-
+
page.addParagraph(new Paragraph("para4"));
ocm.checkout("/page");
ocm.update(page);
ocm.save();
- ocm.checkin("/page", new String[] {"C", "D"});
+ ocm.checkin("/page", new String[] {"C", "D"});
String[] allLabels = ocm.getAllVersionLabels("/page");
assertTrue("Incorrect number of labels", allLabels.length == 4);
@@ -165,7 +165,7 @@
catch(Exception e)
{
e.printStackTrace();
- fail();
+ fail();
}
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/version/DigesterBasicVersionningTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/version/DigesterBasicVersionningTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/version/DigesterBasicVersionningTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/version/DigesterBasicVersionningTest.java Sun Jan 27 13:08:08 2008
@@ -64,39 +64,39 @@
ObjectContentManager ocm = getObjectContentManager();
try
{
-
+
Page page = new Page();
page.setPath("/page");
- page.setTitle("Page Title");
+ page.setTitle("Page Title");
page.addParagraph(new Paragraph("para1"));
page.addParagraph(new Paragraph("para2"));
ocm.insert(page);
ocm.save();
-
-
+
+
page.addParagraph(new Paragraph("para3"));
ocm.checkout("/page");
ocm.update(page);
ocm.save();
ocm.checkin("/page");
-
+
page.addParagraph(new Paragraph("para4"));
ocm.checkout("/page");
ocm.update(page);
ocm.save();
- ocm.checkin("/page");
+ ocm.checkin("/page");
VersionIterator versionIterator = ocm.getAllVersions("/page");
assertNotNull("VersionIterator is null", versionIterator);
assertTrue("Invalid number of versions found", versionIterator.getSize() == 3);
-
+
while (versionIterator.hasNext())
{
Version version = (Version) versionIterator.next();
log.info("version found : "+ version.getName() + " - " + version.getPath() + " - " + version.getCreated().getTime());
-
+
}
-
+
Version baseVersion = ocm.getBaseVersion("/page");
System.out.println("Base version : " + baseVersion.getName());
@@ -104,13 +104,13 @@
System.out.println("Root version : " + rootVersion.getName());
//this.exportDocument("/home/christophe/export.xml", "/jcr:system/jcr:versionStorage", true, false);
- //Get the latest version
+ //Get the latest version
page = (Page) ocm.getObject( "/page");
assertNotNull("Last version is nulll", page);
assertTrue("Invalid number of paragraph found in the last version", page.getParagraphs().size() == 4);
-
- //Get the object matching to the first version
+
+ //Get the object matching to the first version
Page page1 = (Page) ocm.getObject( "/page", "1.0");
assertNotNull("version 1.0 object is null", page1);
assertTrue("Invalid number of paragraph found in the root version", page1.getParagraphs().size() == 3);
@@ -120,7 +120,7 @@
{
e.printStackTrace();
fail(e.getMessage());
-
+
}
}
@@ -130,27 +130,27 @@
ObjectContentManager ocm = getObjectContentManager();
try
{
-
+
Page page = new Page();
page.setPath("/page");
- page.setTitle("Page Title");
+ page.setTitle("Page Title");
page.addParagraph(new Paragraph("para1"));
page.addParagraph(new Paragraph("para2"));
ocm.insert(page);
ocm.save();
-
-
+
+
page.addParagraph(new Paragraph("para3"));
ocm.checkout("/page");
ocm.update(page);
ocm.save();
ocm.checkin("/page", new String[] {"A", "B"});
-
+
page.addParagraph(new Paragraph("para4"));
ocm.checkout("/page");
ocm.update(page);
ocm.save();
- ocm.checkin("/page", new String[] {"C", "D"});
+ ocm.checkin("/page", new String[] {"C", "D"});
String[] allLabels = ocm.getAllVersionLabels("/page");
assertTrue("Incorrect number of labels", allLabels.length == 4);
@@ -165,7 +165,7 @@
catch(Exception e)
{
e.printStackTrace();
- fail();
+ fail();
}
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/mapper/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/mapper/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/mapper/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/mapper/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/mapper/AnnotationMapperImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/mapper/AnnotationMapperImplTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/mapper/AnnotationMapperImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/mapper/AnnotationMapperImplTest.java Sun Jan 27 13:08:08 2008
@@ -417,7 +417,7 @@
/**
* Test interface setting
*/
- public void testInterfaceWithoutDiscriminator()
+ public void testInterfaceWithoutDiscriminator()
{
try {
Mapper mapper = getMapper();
@@ -455,7 +455,7 @@
assertEquals("Invalid number of implemented interface", classDescriptor.getImplements().size(), 1);
assertFalse("Invalid extend strategy", classDescriptor.usesNodeTypePerHierarchyStrategy());
assertTrue("Invalid extend strategy", classDescriptor.usesNodeTypePerConcreteClassStrategy());
-
+
} catch (JcrMappingException e) {
e.printStackTrace();
@@ -464,7 +464,7 @@
}
/**
- *
+ *
* Test Node Type per concrete class setting
*/
public void testProxy() {
@@ -484,7 +484,7 @@
}
}
- private Mapper getMapper()
+ private Mapper getMapper()
{
List<Class> classes = new ArrayList<Class>();
classes.add( org.apache.jackrabbit.ocm.testmodel.A.class);
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java Sun Jan 27 13:08:08 2008
@@ -433,7 +433,7 @@
/**
* Test interface setting
*/
- public void testInterfaceWithoutDiscriminator()
+ public void testInterfaceWithoutDiscriminator()
{
try {
String[] files = {"./src/test/test-config/jcrmapping-inheritance.xml"};
@@ -473,7 +473,7 @@
assertEquals("Invalid number of implemented interface", classDescriptor.getImplements().size(), 1);
assertFalse("Invalid extend strategy", classDescriptor.usesNodeTypePerHierarchyStrategy());
assertTrue("Invalid extend strategy", classDescriptor.usesNodeTypePerConcreteClassStrategy());
-
+
} catch (JcrMappingException e) {
e.printStackTrace();
@@ -482,7 +482,7 @@
}
/**
- *
+ *
* Test Node Type per concrete class setting
*/
public void testProxy() {
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/querymanager/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/querymanager/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/querymanager/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/querymanager/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 {
@@ -38,8 +38,8 @@
//$JUnit-BEGIN$
suite.addTestSuite(AnnotationQueryManagerTest.class);
suite.addTestSuite(DigesterQueryManagerTest.class);
-
-
+
+
//$JUnit-END$
return suite;
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/querymanager/AnnotationQueryManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/querymanager/AnnotationQueryManagerTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/querymanager/AnnotationQueryManagerTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/querymanager/AnnotationQueryManagerTest.java Sun Jan 27 13:08:08 2008
@@ -63,7 +63,7 @@
filter.addEqualTo("name", "a test value")
.addEqualTo("id", new Integer(1));
filter.setScope("/test//");
-
+
Query query = queryManager.createQuery(filter);
String jcrExpression = queryManager.buildJCRExpression(query);
assertNotNull("jcrExpression is null", jcrExpression);
@@ -74,7 +74,7 @@
e.printStackTrace();
fail("Exception occurs during the unit test : " + e);
}
-
+
}
public void testBuildExpression2()
@@ -86,7 +86,7 @@
Filter filter = queryManager.createFilter(C.class);
filter.addEqualTo("name", "a test value")
.addEqualTo("id", new Integer(1));
-
+
Query query = queryManager.createQuery(filter);
String jcrExpression = queryManager.buildJCRExpression(query);
assertNotNull("jcrExpression is null", jcrExpression);
@@ -97,8 +97,8 @@
e.printStackTrace();
fail("Exception occurs during the unit test : " + e);
}
-
+
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/querymanager/DigesterQueryManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/querymanager/DigesterQueryManagerTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/querymanager/DigesterQueryManagerTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/querymanager/DigesterQueryManagerTest.java Sun Jan 27 13:08:08 2008
@@ -63,7 +63,7 @@
filter.addEqualTo("name", "a test value")
.addEqualTo("id", new Integer(1));
filter.setScope("/test//");
-
+
Query query = queryManager.createQuery(filter);
String jcrExpression = queryManager.buildJCRExpression(query);
assertNotNull("jcrExpression is null", jcrExpression);
@@ -74,7 +74,7 @@
e.printStackTrace();
fail("Exception occurs during the unit test : " + e);
}
-
+
}
public void testBuildExpression2()
@@ -86,7 +86,7 @@
Filter filter = queryManager.createFilter(C.class);
filter.addEqualTo("name", "a test value")
.addEqualTo("id", new Integer(1));
-
+
Query query = queryManager.createQuery(filter);
String jcrExpression = queryManager.buildJCRExpression(query);
assertNotNull("jcrExpression is null", jcrExpression);
@@ -97,8 +97,8 @@
e.printStackTrace();
fail("Exception occurs during the unit test : " + e);
}
-
+
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/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 {
@@ -38,8 +38,8 @@
//$JUnit-BEGIN$
suite.addTestSuite(RepositoryUtilTest.class);
suite.addTestSuite(NodeUtilTest.class);
-
-
+
+
//$JUnit-END$
return suite;
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/NodeUtilTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/NodeUtilTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/NodeUtilTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/NodeUtilTest.java Sun Jan 27 13:08:08 2008
@@ -22,7 +22,7 @@
import junit.framework.TestSuite;
/** Testcase for RepositoryUtil.
- *
+ *
* @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
@@ -56,7 +56,7 @@
public static Test suite()
{
- TestSuite suite = new TestSuite(NodeUtilTest.class);
+ TestSuite suite = new TestSuite(NodeUtilTest.class);
// All methods starting with "test" will be executed in the test suite.
return new TestSetup(suite) {
protected void setUp() throws Exception {
@@ -68,13 +68,13 @@
RepositoryUtil.unRegisterRepository("repositoryTest");
super.tearDown();
}
-
+
};
}
/**
- * Test for getParentPath()
+ * Test for getParentPath()
*
*/
public void testGetParentPath()
@@ -88,7 +88,7 @@
parentPath = NodeUtil.getParentPath("/test/test2");
assertNotNull("parent path is null for /test/test2", parentPath);
assertTrue("parent path is incorrect for /test/test2", parentPath.equals("/test"));
-
+
}
catch (Exception e)
{
@@ -96,9 +96,9 @@
fail("Unable to find the repository : " + e);
}
}
-
+
/**
- * Test for getNodeName()
+ * Test for getNodeName()
*
*/
public void testGetNodeName()
@@ -108,18 +108,18 @@
String nodeName = NodeUtil.getNodeName("/test");
assertNotNull("node name is null for /test", nodeName);
assertTrue("node name is incorrect for /test", nodeName.equals("test"));
-
+
nodeName = NodeUtil.getNodeName("/test/test2");
assertNotNull("node name is null for /test/test2", nodeName);
assertTrue("node name is incorrect for /test/test2", nodeName.equals("test2"));
-
+
}
catch (Exception e)
{
e.printStackTrace();
fail("Unable to find the repository : " + e);
}
- }
-
-
+ }
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/RepositoryUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/RepositoryUtil.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/RepositoryUtil.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/RepositoryUtil.java Sun Jan 27 13:08:08 2008
@@ -42,25 +42,25 @@
*/
public class RepositoryUtil
{
-
+
/** namespace prefix constant */
public static final String OCM_NAMESPACE_PREFIX = "ocm";
/** namespace constant */
- public static final String OCM_NAMESPACE = "http://jackrabbit.apache.org/ocm";
-
+ public static final String OCM_NAMESPACE = "http://jackrabbit.apache.org/ocm";
+
/** Item path separator */
public static final String PATH_SEPARATOR = "/";
-
+
private final static Log log = LogFactory.getLog(RepositoryUtil.class);
-
+
/**
- * Register a new repository
- *
+ * Register a new repository
+ *
* @param repositoryName The repository unique name
* @param configFile The JCR config file
* @param homeDir The directory containing the complete repository settings (workspace, node types, ...)
- *
+ *
* @throws RepositoryException when it is not possible to register the repository
*/
public static void registerRepository(String repositoryName, String configFile, String homeDir) throws RepositoryException
@@ -75,19 +75,19 @@
RegistryHelper.registerRepository(ctx, repositoryName, configFile, homeDir, true);
}
catch (Exception e)
- {
- throw new RepositoryException("Impossible to register the respository : " +
+ {
+ throw new RepositoryException("Impossible to register the respository : " +
repositoryName + " - config file : " + configFile, e);
- }
-
+ }
+
}
-
-
+
+
/**
- * Unregister a repository
- *
+ * Unregister a repository
+ *
* @param repositoryName The repository unique name
- *
+ *
* @throws RepositoryException when it is not possible to unregister the repository
*/
public static void unRegisterRepository(String repositoryName) throws RepositoryException
@@ -103,19 +103,19 @@
}
catch (Exception e)
{
- throw new RepositoryException("Impossible to unregister the respository : " +
+ throw new RepositoryException("Impossible to unregister the respository : " +
repositoryName , e);
- }
-
+ }
+
}
-
+
/**
* Get a repository
- *
+ *
* @param repositoryName The repository name
* @return a JCR repository reference
- *
- * @throws RepositoryException when it is not possible to get the repository.
+ *
+ * @throws RepositoryException when it is not possible to get the repository.
* Before calling this method, the repository has to be registered (@see RepositoryUtil#registerRepository(String, String, String)
*/
public static Repository getRepository(String repositoryName) throws RepositoryException
@@ -126,49 +126,49 @@
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory");
env.put(Context.PROVIDER_URL, "localhost");
InitialContext ctx = new InitialContext(env);
-
+
Repository repository = (Repository) ctx.lookup(repositoryName);
return repository;
}
catch (Exception e)
{
throw new RepositoryException("Impossible to get the repository : " + repositoryName, e);
- }
+ }
}
-
+
/**
* Connect to a JCR repository
- *
- * @param repository The JCR repository
+ *
+ * @param repository The JCR repository
* @param user The user name
* @param password The password
- * @return a valid JCR session
- *
- * @throws RepositoryException when it is not possible to connect to the JCR repository
+ * @return a valid JCR session
+ *
+ * @throws RepositoryException when it is not possible to connect to the JCR repository
*/
public static Session login(Repository repository, String user, String password) throws RepositoryException
{
try
{
Session session = repository.login(new SimpleCredentials(user, password.toCharArray()), null);
-
-
- return session;
+
+
+ return session;
}
catch (Exception e)
{
throw new RepositoryException("Impossible to login ", e);
}
}
-
-
-
-
+
+
+
+
/**
- * Setup the session.
+ * Setup the session.
* Until now, we check only if the namespace prefix exist in the repository
- *
+ *
*/
public static void setupSession(Session session) throws RepositoryException
{
@@ -186,18 +186,18 @@
log.debug("Jackrabbit OCM namespace exists.");
}
}
-
+
if (createNamespace)
{
session.getWorkspace().getNamespaceRegistry().registerNamespace(OCM_NAMESPACE_PREFIX, OCM_NAMESPACE);
log.info("Successfully created Jackrabbit OCM namespace.");
}
-
+
if (session.getRootNode() != null)
{
log.info("Jcr session setup successfull.");
}
-
+
}
catch (Exception e)
@@ -208,12 +208,12 @@
}
/**
- * Encode a path
+ * Encode a path
* @TODO : drop Jackrabbit dependency
- *
+ *
* @param path the path to encode
- * @return the encoded path
- *
+ * @return the encoded path
+ *
*/
public static String encodePath(String path)
{
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/RepositoryUtilTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/RepositoryUtilTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/RepositoryUtilTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/repository/RepositoryUtilTest.java Sun Jan 27 13:08:08 2008
@@ -32,7 +32,7 @@
import org.apache.jackrabbit.ocm.transaction.jackrabbit.UserTransactionImpl;
/** Testcase for RepositoryUtil.
- *
+ *
* @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
@@ -67,7 +67,7 @@
public static Test suite()
{
- TestSuite suite = new TestSuite(RepositoryUtilTest.class);
+ TestSuite suite = new TestSuite(RepositoryUtilTest.class);
// All methods starting with "test" will be executed in the test suite.
return new TestSetup(suite) {
protected void setUp() throws Exception {
@@ -79,7 +79,7 @@
RepositoryUtil.unRegisterRepository("repositoryTest");
super.tearDown();
}
-
+
};
}
@@ -96,11 +96,11 @@
Session session = RepositoryUtil.login(repository, "superuser", "superuser");
Node root = session.getRootNode();
assertNotNull("Root node is null", root);
-
+
Session session2 = RepositoryUtil.login(repository, "superuser", "superuser");
root = session2.getRootNode();
assertNotNull("Root node is null", root);
-
+
session.logout();
session2.logout();
}
@@ -111,7 +111,7 @@
}
}
-
+
/**
* Simple unit test to check if custome node types are well defined
*
@@ -120,15 +120,15 @@
{
try
{
- Repository repository = RepositoryUtil.getRepository("repositoryTest");
+ Repository repository = RepositoryUtil.getRepository("repositoryTest");
Session session = RepositoryUtil.login(repository, "superuser", "superuser");
NodeTypeManager nodeTypeManager = session.getWorkspace().getNodeTypeManager();
-
+
// TODO custom node types not implemented yet
-
+
//NodeType nodeType = nodeTypeManager.getNodeType("ocm:folder");
//assertNotNull("Root node is null", nodeType);
-
+
session.logout();
}
catch (Exception e)
@@ -138,8 +138,8 @@
}
}
-
-
+
+
public void testEncodePath()
{
String encodedPath = RepositoryUtil.encodePath("/files/test/1.0");
@@ -149,7 +149,7 @@
assertTrue("Incorrect encoded path", encodedPath.equals("/files/test/_x0031_2aa/b/_x0033_4/rrr/_x0031_.0"));
}
-
+
public void testUserTransaction()
{
try
@@ -197,5 +197,5 @@
fail("Unable to run user transaction : " + e);
}
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/A.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/A.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/A.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/A.java Sun Jan 27 13:08:08 2008
@@ -32,16 +32,16 @@
@Node(jcrMixinTypes="mix:lockable" )
public class A
{
- @Field(path=true) private String path;
+ @Field(path=true) private String path;
@Field private String a1;
@Field private String a2;
@Bean private B b;
-
+
private B emptyB;
@Collection(elementClassName=C.class, jcrType="ocm:C") private java.util.Collection collection;
- @Collection(elementClassName=C.class) private java.util.Collection emptyCollection;
-
+ @Collection(elementClassName=C.class) private java.util.Collection emptyCollection;
+
public String getPath() {
return path;
}
@@ -90,8 +90,8 @@
{
this.b = b;
}
-
-
+
+
/**
* @return Returns the collection.
*/
@@ -99,7 +99,7 @@
{
return collection;
}
-
+
/**
* @param collection The collection to set.
*/
@@ -107,15 +107,15 @@
{
this.collection = collection;
}
-
+
public void addC(C c)
{
if (collection == null )
{
collection = new ArrayList();
}
-
- collection.add(c);
+
+ collection.add(c);
}
public java.util.Collection getEmptyCollection()
{
@@ -133,6 +133,6 @@
{
this.emptyB = emptyB;
}
-
-
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Atomic.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Atomic.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Atomic.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Atomic.java Sun Jan 27 13:08:08 2008
@@ -35,7 +35,7 @@
* @version $Id: Exp $
*/
@Node
-public class Atomic
+public class Atomic
{
@Field(path=true) protected String path;
@Field private String string;
@@ -51,20 +51,20 @@
@Field private InputStream inputStream;
@Field private Timestamp timestamp;
- @Field (converter = Int2BooleanTypeConverterImpl.class)
+ @Field (converter = Int2BooleanTypeConverterImpl.class)
private boolean int2boolean;
-
+
@Field (converter = NameTypeConverterImpl.class)
private String namedProperty;
-
+
@Field (converter = PathTypeConverterImpl.class)
private String pathProperty; // used to refer another node
-
+
@Field (converter = UndefinedTypeConverterImpl.class)
private Object undefinedProperty;
-
-
-
+
+
+
public String getPath() {
return path;
}
@@ -82,41 +82,41 @@
{
this.booleanObject = booleanObject;
}
-
-
+
+
public boolean isBooleanPrimitive()
{
return booleanPrimitive;
}
-
+
public void setBooleanPrimitive(boolean booleanPrimitive)
{
this.booleanPrimitive = booleanPrimitive;
}
-
-
+
+
public Integer getIntegerObject()
{
return integerObject;
-
+
}
public void setIntegerObject(Integer integerObject)
{
this.integerObject = integerObject;
}
-
-
+
+
public int getIntPrimitive()
{
return intPrimitive;
}
-
+
public void setIntPrimitive(int intPrimitive)
{
this.intPrimitive = intPrimitive;
}
-
-
+
+
public String getString()
{
return string;
@@ -125,64 +125,64 @@
{
this.string = string;
}
-
-
+
+
public byte[] getByteArray()
{
return byteArray;
}
-
+
public void setByteArray(byte[] byteArray)
{
this.byteArray = byteArray;
}
-
-
+
+
public Calendar getCalendar()
{
return calendar;
}
-
-
+
+
public void setCalendar(Calendar calandar)
{
this.calendar = calandar;
}
-
-
+
+
public Date getDate()
{
return date;
}
-
+
public void setDate(Date date)
{
this.date = date;
}
-
-
+
+
public Double getDoubleObject()
{
return doubleObject;
}
-
+
public void setDoubleObject(Double doubleObject)
{
this.doubleObject = doubleObject;
}
-
-
+
+
public double getDoublePrimitive()
{
return doublePrimitive;
}
-
+
public void setDoublePrimitive(double doublePrimitive)
{
this.doublePrimitive = doublePrimitive;
}
-
-
+
+
public InputStream getInputStream()
{
return inputStream;
@@ -191,24 +191,24 @@
{
this.inputStream = inputStream;
}
-
-
+
+
public Timestamp getTimestamp()
{
return timestamp;
}
-
+
public void setTimestamp(Timestamp timestamp)
{
this.timestamp = timestamp;
}
-
- public boolean isInt2boolean()
+
+ public boolean isInt2boolean()
{
return int2boolean;
}
- public void setInt2boolean(boolean int2boolean)
+ public void setInt2boolean(boolean int2boolean)
{
this.int2boolean = int2boolean;
}
@@ -219,31 +219,31 @@
}
- public void setNamedProperty(String namedProperty)
+ public void setNamedProperty(String namedProperty)
{
this.namedProperty = namedProperty;
}
- public String getPathProperty()
+ public String getPathProperty()
{
return pathProperty;
}
- public void setPathProperty(String pathProperty)
+ public void setPathProperty(String pathProperty)
{
this.pathProperty = pathProperty;
}
- public Object getUndefinedProperty()
+ public Object getUndefinedProperty()
{
return undefinedProperty;
}
- public void setUndefinedProperty(Object undefinedProperty)
+ public void setUndefinedProperty(Object undefinedProperty)
{
this.undefinedProperty = undefinedProperty;
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/B.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/B.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/B.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/B.java Sun Jan 27 13:08:08 2008
@@ -30,8 +30,8 @@
@Field private String b1;
@Field private String b2;
private A a;
-
-
+
+
/**
* @return Returns the b1.
*/
@@ -66,6 +66,6 @@
public void setA(A a) {
this.a = a;
}
-
-
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/C.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/C.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/C.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/C.java Sun Jan 27 13:08:08 2008
@@ -30,7 +30,7 @@
@Field(jcrName="ocm:id", id=true) private String id;
@Field(jcrName="ocm:name") private String name;
-
+
/**
* @return Returns the id.
*/
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Default.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Default.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Default.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Default.java Sun Jan 27 13:08:08 2008
@@ -24,7 +24,7 @@
* Simple object used to test default value assignement
*/
@Node(jcrType="ocm:DefTestPrimary", discriminator=false)
-public class Default
+public class Default
{
@Field(path=true) private String path;
@@ -39,7 +39,7 @@
@Field(jcrName="ocm:p5") private String p5;
-
+
public String getPath() {
return path;
}
@@ -50,7 +50,7 @@
/**
* @return the p1
- */
+ */
public String getP1() {
return p1;
}
@@ -64,7 +64,7 @@
/**
* @return the p2
- */
+ */
public String getP2() {
return p2;
}
@@ -78,7 +78,7 @@
/**
* @return the p3
- */
+ */
public String getP3() {
return p3;
}
@@ -92,7 +92,7 @@
/**
* @return the p4
- */
+ */
public String getP4() {
return p4;
}
@@ -106,7 +106,7 @@
/**
* @return the p5
- */
+ */
public String getP5() {
return p5;
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Discriminator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Discriminator.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Discriminator.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Discriminator.java Sun Jan 27 13:08:08 2008
@@ -35,7 +35,7 @@
public void setPath(String path) {
this.path = path;
}
-
-
-
+
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/E.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/E.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/E.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/E.java Sun Jan 27 13:08:08 2008
@@ -26,7 +26,7 @@
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
@Node
-public class E
+public class E
{
@Field(path=true) private String path;
@Field private String d1;
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/File.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/File.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/File.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/File.java Sun Jan 27 13:08:08 2008
@@ -29,16 +29,16 @@
{
@Bean(jcrName="jcr:content") private Resource resource;
-
- public Resource getResource()
+
+ public Resource getResource()
{
return resource;
}
- public void setResource(Resource resource)
+ public void setResource(Resource resource)
{
this.resource = resource;
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Folder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Folder.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Folder.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Folder.java Sun Jan 27 13:08:08 2008
@@ -31,15 +31,15 @@
public class Folder extends HierarchyNode
{
@Collection(autoUpdate=false, elementClassName=HierarchyNode.class , collectionConverter=NTCollectionConverterImpl.class)
- private java.util.Collection children;
-
+ private java.util.Collection children;
- public java.util.Collection getChildren()
+
+ public java.util.Collection getChildren()
{
return children;
}
- public void setChildren(java.util.Collection children)
+ public void setChildren(java.util.Collection children)
{
this.children = children;
}
@@ -52,5 +52,5 @@
}
children.add(node);
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/HierarchyNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/HierarchyNode.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/HierarchyNode.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/HierarchyNode.java Sun Jan 27 13:08:08 2008
@@ -33,22 +33,22 @@
@Field(jcrName="jcr:created") private Calendar creationDate;
- public String getPath()
+ public String getPath()
{
return path;
}
- public void setPath(String path)
+ public void setPath(String path)
{
this.path = path;
}
- public Calendar getCreationDate()
+ public Calendar getCreationDate()
{
return creationDate;
}
- public void setCreationDate(Calendar creationDate)
+ public void setCreationDate(Calendar creationDate)
{
this.creationDate = creationDate;
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Lockable.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Lockable.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Lockable.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Lockable.java Sun Jan 27 13:08:08 2008
@@ -23,17 +23,17 @@
/**
*
* @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
- *
+ *
*/
-@Node(jcrType="ocm:TestLockable")
+@Node(jcrType="ocm:TestLockable")
public class Lockable
{
- @Field(path=true) private String path;
+ @Field(path=true) private String path;
@Field(jcrName="ocm:a1") private String a1;
@Field(jcrName="ocm:a2") private String a2;
@Field(jcrName="jcr:lockOwner") private String lockOwner;
-
-
+
+
public String getPath() {
return path;
}
@@ -68,16 +68,16 @@
{
this.a2 = a2;
}
-
- public String getLockOwner()
+
+ public String getLockOwner()
{
return lockOwner;
}
- public void setLockOwner(String lockOwner)
+ public void setLockOwner(String lockOwner)
{
this.lockOwner = lockOwner;
}
-
-
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/MultiValue.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/MultiValue.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/MultiValue.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/MultiValue.java Sun Jan 27 13:08:08 2008
@@ -24,9 +24,9 @@
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
/**
- *
+ *
* Simple object used to test multivalue properties
- *
+ *
* @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart
* Christophe </a>
* @version $Id: Exp $
@@ -38,7 +38,7 @@
@Field private String name;
- @Collection(elementClassName=String.class, collectionConverter=MultiValueCollectionConverterImpl.class)
+ @Collection(elementClassName=String.class, collectionConverter=MultiValueCollectionConverterImpl.class)
private java.util.Collection multiValues;
@Collection(elementClassName=String.class, collectionConverter=MultiValueCollectionConverterImpl.class)
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Page.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Page.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Page.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Page.java Sun Jan 27 13:08:08 2008
@@ -24,25 +24,25 @@
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-/**
+/**
*
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- *
+ *
*/
@Node(jcrType="ocm:page", discriminator=false)
public class Page
{
@Field(path=true) String path;
@Field(jcrName="ocm:title") String title;
-
- @Collection(elementClassName=Paragraph.class, collectionConverter=NTCollectionConverterImpl.class)
+
+ @Collection(elementClassName=Paragraph.class, collectionConverter=NTCollectionConverterImpl.class)
java.util.Collection paragraphs;
-
+
public String getPath()
{
return path;
}
- public void setPath(String path)
+ public void setPath(String path)
{
this.path = path;
}
@@ -74,7 +74,7 @@
{
this.title = title;
}
-
+
public void addParagraph(Paragraph paragraph)
{
if (paragraphs == null)
@@ -84,7 +84,7 @@
paragraphs.add(paragraph);
}
-
-
-
+
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Paragraph.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Paragraph.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Paragraph.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Paragraph.java Sun Jan 27 13:08:08 2008
@@ -21,10 +21,10 @@
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-/**
+/**
*
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- *
+ *
*/
@Node(jcrType="ocm:paragraph", discriminator=false)
public class Paragraph
@@ -32,16 +32,16 @@
@Field(path=true) private String path;
@Field(jcrName="ocm:text") private String text;
- // The converter ParentBeanConverterImpl can be used to have a simple reference
+ // The converter ParentBeanConverterImpl can be used to have a simple reference
// to the page containing this pararaph (parent node) - cannot be updated
- @Bean(proxy=true, converter=ParentBeanConverterImpl.class) private Page page;
+ @Bean(proxy=true, converter=ParentBeanConverterImpl.class) private Page page;
- public String getPath()
+ public String getPath()
{
return path;
}
- public void setPath(String path)
+ public void setPath(String path)
{
this.path = path;
}
@@ -72,7 +72,7 @@
this.text = text;
}
- public Page getPage()
+ public Page getPage()
{
return page;
}
@@ -82,6 +82,6 @@
}
-
-
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/PropertyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/PropertyTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/PropertyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/PropertyTest.java Sun Jan 27 13:08:08 2008
@@ -23,7 +23,7 @@
/**
*
* @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
- *
+ *
*/
@Node(jcrType="ocm:propertytest")
public class PropertyTest
@@ -34,7 +34,7 @@
@Field(jcrName="ocm:autoCreatedProp", jcrDefaultValue="aaa") private String autoCreatedProp;
@Field(jcrName="ocm:autoCreatedWithConstraintsProp", jcrDefaultValue="ccc", jcrValueConstraints="bbb,ccc,ddd") private String autoCreatedWithConstraintsProp;
@Field(jcrName="ocm:mandatoryProp", jcrMandatory=true) private String mandatoryProp;
- @Field(jcrName="ocm:mandatoryWithConstaintsProp", jcrMandatory=true, jcrValueConstraints="xx,yy") private String mandatoryWithConstaintsProp;
+ @Field(jcrName="ocm:mandatoryWithConstaintsProp", jcrMandatory=true, jcrValueConstraints="xx,yy") private String mandatoryWithConstaintsProp;
@Field(jcrName="ocm:protectedWithDefaultValueProp", jcrProtected=true) private String protectedWithDefaultValueProp;
public String getPath() {
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Residual.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Residual.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Residual.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Residual.java Sun Jan 27 13:08:08 2008
@@ -26,19 +26,19 @@
/**
*
* @author <a href="mailto:fmeschbe[at]apache[dot]com">Felix Meschberger</a>
- *
- * Note :
+ *
+ * Note :
* If the annotation are defined on the field declaration, it is mandatory to register the ancestor classes.
- * Otherwise, the annotation mapper will not map the fields defined in the ancester classes.
- *
+ * Otherwise, the annotation mapper will not map the fields defined in the ancester classes.
+ *
*/
@Node
public class Residual
{
@Field(path=true) private String path;
-
+
private ManagedHashMap elements;
-
+
/**
* @return Returns the elements.
*/
@@ -54,29 +54,29 @@
this.elements = elements;
}
-
- @Node(extend=Residual.class) public static class ResidualProperties extends Residual
+
+ @Node(extend=Residual.class) public static class ResidualProperties extends Residual
{
- @Collection( jcrName="value*",elementClassName=String.class,collectionConverter=ResidualPropertiesCollectionConverterImpl.class,
+ @Collection( jcrName="value*",elementClassName=String.class,collectionConverter=ResidualPropertiesCollectionConverterImpl.class,
collectionClassName=ManagedHashMap.class)
- private ManagedHashMap elements;
-
-
+ private ManagedHashMap elements;
+
+
}
-
- @Node(extend=Residual.class) public static class ResidualNodes extends Residual
+
+ @Node(extend=Residual.class) public static class ResidualNodes extends Residual
{
- @Collection( jcrName="value*",elementClassName=Object.class,collectionConverter=ResidualNodesCollectionConverterImpl.class,
+ @Collection( jcrName="value*",elementClassName=Object.class,collectionConverter=ResidualNodesCollectionConverterImpl.class,
collectionClassName=ManagedHashMap.class)
private ManagedHashMap elements;
-
+
}
-
+
protected Residual() {}
-
-
+
+
public String getPath() {
return path;
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Resource.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Resource.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Resource.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/Resource.java Sun Jan 27 13:08:08 2008
@@ -31,10 +31,10 @@
public class Resource
{
- @Field( jcrName="jcr:mimeType") private String mimeType;
+ @Field( jcrName="jcr:mimeType") private String mimeType;
@Field( jcrName="jcr:data") private InputStream data;
@Field( jcrName="jcr:lastModified") private Calendar lastModified;
-
+
public InputStream getData()
{
return data;
@@ -60,6 +60,6 @@
{
this.mimeType = mimeType;
}
-
-
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/CmsObjectImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/CmsObjectImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/CmsObjectImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/CmsObjectImpl.java Sun Jan 27 13:08:08 2008
@@ -27,33 +27,33 @@
/**
* CmsObject test
- *
+ *
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- *
- *
+ *
+ *
*/
@Node(jcrType="ocm:cmsobjectimpl", discriminator=false, isAbstract=true)
public abstract class CmsObjectImpl implements CmsObject
{
-
+
@Field(path=true) protected String path;
-
+
@Field(jcrName="ocm:name", id=true) protected String name;
-
+
@Bean(converter=ParentBeanConverterImpl.class)
protected Folder parentFolder;
-
+
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject#getName()
- */
+ */
public String getName() {
return name;
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject#setName(java.lang.String)
*/
public void setName(String name) {
@@ -61,7 +61,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject#getPath()
*/
@@ -69,14 +69,14 @@
return path;
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject#setPath(java.lang.String)
*/
public void setPath(String path) {
this.path = path;
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject#getParentFolder()
*/
@@ -84,7 +84,7 @@
return parentFolder;
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject#setParentFolder(org.apache.jackrabbit.ocm.testmodel.interfaces.Folder)
*/
public void setParentFolder(Folder parentFolder) {
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/ContentImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/ContentImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/ContentImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/ContentImpl.java Sun Jan 27 13:08:08 2008
@@ -23,7 +23,7 @@
* Content implementation
*
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- *
+ *
*/
@Node(jcrType="ocm:contentimpl", isAbstract=true, extend=CmsObjectImpl.class, discriminator=false)
public abstract class ContentImpl extends CmsObjectImpl implements Content
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/DocumentImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/DocumentImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/DocumentImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/DocumentImpl.java Sun Jan 27 13:08:08 2008
@@ -29,7 +29,7 @@
* Document implementation.
*
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- *
+ *
*/
@Node(jcrType="ocm:documentimpl", extend=ContentImpl.class, discriminator=false)
@@ -37,16 +37,16 @@
public class DocumentImpl extends ContentImpl implements Document
{
protected final static Log log = LogFactory.getLog(DocumentImpl.class);
-
+
@Field(jcrName="ocm:size") protected long size;
- @Field(jcrName="ocm:contenttype") protected String contentType;
-
- @Bean(jcrName="ocm:documentstream", autoUpdate=false, autoInsert=false, autoRetrieve=false )
+ @Field(jcrName="ocm:contenttype") protected String contentType;
+
+ @Bean(jcrName="ocm:documentstream", autoUpdate=false, autoInsert=false, autoRetrieve=false )
protected DocumentStream documentStream;
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Document#getContentType()
*/
public String getContentType()
@@ -55,7 +55,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Document#setContentType(java.lang.String)
*/
public void setContentType(String contentType)
@@ -64,7 +64,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Document#getSize()
*/
public long getSize()
@@ -73,7 +73,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Document#setSize(long)
*/
public void setSize(long size)
@@ -82,7 +82,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Document#getDocumentStream()
*/
public DocumentStream getDocumentStream() {
@@ -90,13 +90,13 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Document#setDocumentStream(org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentStream)
*/
public void setDocumentStream(DocumentStream documentStream) {
this.documentStream = documentStream;
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/DocumentStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/DocumentStream.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/DocumentStream.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/DocumentStream.java Sun Jan 27 13:08:08 2008
@@ -29,16 +29,16 @@
* Document Content
*
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- *
+ *
*/
@Node(jcrType="ocm:documentstream", discriminator=false)
-public class DocumentStream
+public class DocumentStream
{
protected final static Log log = LogFactory.getLog(DocumentStream.class);
-
- @Field( jcrName="ocm:binarycontent") protected byte[] content;
- @Field( jcrName="ocm:encoding") protected String encoding;
+
+ @Field( jcrName="ocm:binarycontent") protected byte[] content;
+ @Field( jcrName="ocm:encoding") protected String encoding;
@Field(path=true) protected String path;
@@ -47,7 +47,7 @@
*/
public InputStream getContentStream()
{
- return new ByteArrayInputStream(content);
+ return new ByteArrayInputStream(content);
}
/**
@@ -55,7 +55,7 @@
*/
public byte[] getContent()
{
-
+
return content;
}
@@ -65,11 +65,11 @@
*/
public void setContent(byte[] stream)
{
-
+
content = stream;
}
-
+
/**
* @return Returns the encoding.
*/
@@ -77,7 +77,7 @@
{
return encoding;
}
-
+
/**
* @param encoding The encoding to set.
*/
@@ -93,8 +93,8 @@
public void setPath(String path) {
this.path = path;
}
-
-
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/FolderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/FolderImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/FolderImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/auto/impl/FolderImpl.java Sun Jan 27 13:08:08 2008
@@ -30,19 +30,19 @@
* Forlder implementation
*
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- *
+ *
*/
@Node(jcrType="ocm:folderimpl", extend=CmsObjectImpl.class ,discriminator=false)
@Implement(interfaceName=Folder.class)
-public class FolderImpl extends CmsObjectImpl implements Folder
+public class FolderImpl extends CmsObjectImpl implements Folder
{
- @Collection(proxy=true, autoUpdate=false, autoInsert=false, autoRetrieve=false,
- elementClassName=CmsObjectImpl.class,
+ @Collection(proxy=true, autoUpdate=false, autoInsert=false, autoRetrieve=false,
+ elementClassName=CmsObjectImpl.class,
collectionConverter=NTCollectionConverterImpl.class)
protected List children = new ArrayList();
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Folder#getChildren()
*/
public List getChildren() {
@@ -50,15 +50,15 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Folder#setChildren(java.util.List)
*/
public void setChildren(List children) {
this.children = children;
}
-
+
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Folder#addChild(org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject)
*/
public void addChild(CmsObject child)
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/ArrayListElement.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/ArrayListElement.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/ArrayListElement.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/ArrayListElement.java Sun Jan 27 13:08:08 2008
@@ -21,10 +21,10 @@
import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection;
-/**
+/**
*
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- *
+ *
*/
public class ArrayListElement extends ArrayList implements ManageableCollection
{
@@ -47,12 +47,12 @@
{
return this.iterator();
}
-
+
public int getSize()
{
return this.size();
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/Element.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/Element.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/Element.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/Element.java Sun Jan 27 13:08:08 2008
@@ -30,8 +30,8 @@
{
@Field(jcrName="ocm:id") private String id;
@Field(jcrName="ocm:text") private String text;
-
-
+
+
/**
* @return Returns the id.
*/
@@ -59,7 +59,7 @@
public void setText(String text)
{
this.text = text;
- }
-
-
+ }
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/HashMapElement.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/HashMapElement.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/HashMapElement.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/HashMapElement.java Sun Jan 27 13:08:08 2008
@@ -21,10 +21,10 @@
import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableCollection;
-/**
+/**
*
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- *
+ *
*/
public class HashMapElement extends HashMap implements ManageableCollection
{
@@ -47,12 +47,12 @@
{
return this.values().iterator();
}
-
+
public int getSize()
{
return this.size();
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/Main.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/Main.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/collection/Main.java Sun Jan 27 13:08:08 2008
@@ -31,12 +31,12 @@
{
@Field(path=true) private String path;
@Field private String text;
- @Collection (elementClassName=Element.class, collectionClassName=HashMapElement.class)
+ @Collection (elementClassName=Element.class, collectionClassName=HashMapElement.class)
private HashMapElement hashMap;
-
+
@Collection (elementClassName=Element.class, collectionClassName=ArrayListElement.class)
private ArrayListElement list;
-
+
public String getPath() {
return path;
}
@@ -57,13 +57,13 @@
{
this.hashMap = hashMap;
}
-
- public ArrayListElement getList()
+
+ public ArrayListElement getList()
{
return list;
}
- public void setList(ArrayListElement list)
+ public void setList(ArrayListElement list)
{
this.list = list;
}
@@ -80,7 +80,7 @@
public void setText(String text)
{
this.text = text;
- }
-
-
+ }
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/A.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/A.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/A.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/A.java Sun Jan 27 13:08:08 2008
@@ -28,21 +28,21 @@
/**
*
* @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
- *
+ *
*/
@Node(jcrType="nt:unstructured", jcrMixinTypes="mix:referenceable")
public class A
{
- @Field(path=true) private String path;
- @Field(uuid=true) private String uuid;
+ @Field(path=true) private String path;
+ @Field(uuid=true) private String uuid;
@Field private String a1;
@Field private String a2;
@Bean private B b;
-
- @Collection(elementClassName=B.class)
+
+ @Collection(elementClassName=B.class)
java.util.Collection collection;
-
-
+
+
public String getPath() {
return path;
}
@@ -102,8 +102,8 @@
{
this.b = b;
}
-
-
+
+
/**
* @return Returns the collection.
*/
@@ -111,7 +111,7 @@
{
return collection;
}
-
+
/**
* @param collection The collection to set.
*/
@@ -119,15 +119,15 @@
{
this.collection = collection;
}
-
+
public void addB(B b)
{
if (collection == null )
{
collection = new ArrayList();
}
-
- collection.add(b);
+
+ collection.add(b);
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/B.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/B.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/B.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/crossreference/B.java Sun Jan 27 13:08:08 2008
@@ -24,7 +24,7 @@
/**
*
* @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
- *
+ *
*/
@Node
@@ -33,8 +33,8 @@
@Field private String b1;
@Field private String b2;
@Bean(converter=ReferenceBeanConverterImpl.class)private A a;
-
-
+
+
/**
* @return Returns the b1.
*/
@@ -69,6 +69,6 @@
public void setA(A a) {
this.a = a;
}
-
-
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Ancestor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Ancestor.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Ancestor.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/Ancestor.java Sun Jan 27 13:08:08 2008
@@ -41,7 +41,7 @@
public void setAncestorField(String ancestorField) {
this.ancestorField = ancestorField;
}
-
+
public String getDiscriminator() {
return discriminator;
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/CmsObjectImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/CmsObjectImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/CmsObjectImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/CmsObjectImpl.java Sun Jan 27 13:08:08 2008
@@ -28,22 +28,22 @@
/**
* CmsObject test
- *
+ *
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- *
- *
+ *
+ *
*/
@Node(jcrType="ocm:cmsobjectimpl", discriminator=false, isAbstract=true)
@Implement(interfaceName=CmsObject.class)
public class CmsObjectImpl implements CmsObject
{
-
- @Field(path=true) protected String path;
+
+ @Field(path=true) protected String path;
@Field(jcrName="ocm:name", id=true) protected String name;
@Bean(converter=ParentBeanConverterImpl.class) protected Folder parentFolder;
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject#getName()
*/
public String getName() {
@@ -51,7 +51,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject#setName(java.lang.String)
*/
public void setName(String name) {
@@ -59,28 +59,28 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject#getPath()
*/
public String getPath() {
return path;
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject#setPath(java.lang.String)
*/
public void setPath(String path) {
this.path = path;
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject#getParentFolder()
*/
public Folder getParentFolder() {
return parentFolder;
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject#setParentFolder(org.apache.jackrabbit.ocm.testmodel.interfaces.Folder)
*/
public void setParentFolder(Folder parentFolder) {
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/ContentImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/ContentImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/ContentImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/ContentImpl.java Sun Jan 27 13:08:08 2008
@@ -24,7 +24,7 @@
* Content object
*
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- *
+ *
*/
@Node(jcrType="ocm:contentimpl", isAbstract=true, extend=CmsObjectImpl.class, discriminator=false )
@Implement(interfaceName=Content.class)
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentImpl.java Sun Jan 27 13:08:08 2008
@@ -29,22 +29,22 @@
* CMS VersionnedDocument implementation.
*
* @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
- *
+ *
*/
@Node(jcrType="ocm:documentimpl", extend=ContentImpl.class, discriminator=false)
@Implement(interfaceName=Document.class)
public class DocumentImpl extends ContentImpl implements Document
{
protected final static Log log = LogFactory.getLog(DocumentImpl.class);
-
+
@Field(jcrName="ocm:size") protected long size;
- @Field(jcrName="ocm:contenttype") protected String contentType;
-
+ @Field(jcrName="ocm:contenttype") protected String contentType;
+
@Bean(jcrName="ocm:documentstream", proxy=true) protected DocumentStream documentStream;
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Document#getContentType()
*/
public String getContentType()
@@ -53,7 +53,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Document#setContentType(java.lang.String)
*/
public void setContentType(String contentType)
@@ -62,7 +62,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Document#getSize()
*/
public long getSize()
@@ -71,7 +71,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Document#setSize(long)
*/
public void setSize(long size)
@@ -80,7 +80,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Document#getDocumentStream()
*/
public DocumentStream getDocumentStream() {
@@ -88,13 +88,13 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Document#setDocumentStream(org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentStream)
*/
public void setDocumentStream(DocumentStream documentStream) {
this.documentStream = documentStream;
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentStream.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentStream.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/DocumentStream.java Sun Jan 27 13:08:08 2008
@@ -31,17 +31,17 @@
* Document Steam
*
* @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
- *
+ *
*/
@Node(jcrType="ocm:documentstream", discriminator=false)
-public class DocumentStream
+public class DocumentStream
{
protected final static Log log = LogFactory.getLog(DocumentStream.class);
-
+
@Field(jcrName="ocm:binarycontent") protected byte[] content;
-
+
@Field(jcrName="ocm:encoding") protected String encoding;
-
+
@Field(path=true) protected String path;
@@ -50,7 +50,7 @@
*/
public InputStream getContentStream()
{
- return new ByteArrayInputStream(content);
+ return new ByteArrayInputStream(content);
}
/**
@@ -58,7 +58,7 @@
*/
public byte[] getContent()
{
-
+
return content;
}
@@ -68,11 +68,11 @@
*/
public void setContent(byte[] stream)
{
-
+
content = stream;
}
-
+
/**
* @return Returns the encoding.
*/
@@ -80,7 +80,7 @@
{
return encoding;
}
-
+
/**
* @param encoding The encoding to set.
*/
@@ -96,8 +96,8 @@
public void setPath(String path) {
this.path = path;
}
-
-
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/FolderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/FolderImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/FolderImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/inheritance/impl/FolderImpl.java Sun Jan 27 13:08:08 2008
@@ -31,18 +31,18 @@
*
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
* @version $Id: Folder.java,v 1.1 2004/12/22 20:36:59 christophe Exp $
- */
+ */
@Node(jcrType="ocm:folderimpl" , extend=CmsObjectImpl.class, discriminator=false)
@Implement(interfaceName=Folder.class)
-public class FolderImpl extends CmsObjectImpl implements Folder
+public class FolderImpl extends CmsObjectImpl implements Folder
{
-
- @Collection(proxy=true,
+
+ @Collection(proxy=true,
elementClassName=CmsObjectImpl.class, collectionConverter=NTCollectionConverterImpl.class)
protected List children = new ArrayList();
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Folder#getChildren()
*/
public List getChildren() {
@@ -50,15 +50,15 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Folder#setChildren(java.util.List)
*/
public void setChildren(List children) {
this.children = children;
}
-
+
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.testmodel.interfaces.Folder#addChild(org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject)
*/
public void addChild(CmsObject child)
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Detail.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Detail.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Detail.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Detail.java Sun Jan 27 13:08:08 2008
@@ -20,12 +20,12 @@
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
@Node
-public class Detail
+public class Detail
{
@Field(path=true) private String path;
@Field private String field;
-
+
public String getPath() {
return path;
}
@@ -40,7 +40,7 @@
public void setField(String field) {
this.field = field;
- }
-
-
+ }
+
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Main.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Main.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/testmodel/proxy/Main.java Sun Jan 27 13:08:08 2008
@@ -24,17 +24,17 @@
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
@Node
-public class Main
+public class Main
{
@Field(path=true) private String path;
@Bean(proxy=true) private Detail proxyDetail;
- @Bean(proxy=true) private Detail nullDetail;
+ @Bean(proxy=true) private Detail nullDetail;
@Bean private Detail detail;
@Collection(proxy=true, elementClassName=Detail.class) private java.util.Collection proxyCollection;
@Collection(proxy=true, elementClassName=Detail.class) private java.util.Collection nullProxyCollection;
-
+
public String getPath() {
return path;
}
@@ -84,5 +84,5 @@
}
-
+
}