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 [6/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...
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java Sun Jan 27 13:08:08 2008
@@ -62,16 +62,16 @@
* Logging.
*/
private static Log log = LogFactory.getLog(NodeTypeManagerImpl.class);
-
+
/** Namespace helper class for Jackrabbit.
*/
private NamespaceHelper namespaceHelper = new NamespaceHelper();
-
+
/** Creates a new instance of NodeTypeManagerImpl. */
public NodeTypeManagerImpl()
{
}
-
+
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#createNamespace
*/
@@ -92,26 +92,26 @@
}
}
}
-
+
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#createNodeTypes
- */
+ */
public void createNodeTypes(Session session, MappingDescriptor mappingDescriptor)
throws NodeTypeCreationException
{
if (mappingDescriptor != null && mappingDescriptor.getClassDescriptorsByClassName().size() > 0)
{
-
+
}
else
{
throw new NodeTypeCreationException("The MappingDescriptor can't be null or empty.");
}
}
-
+
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#createNodeTypes
- */
+ */
public void createNodeTypes(Session session, ClassDescriptor[] classDescriptors)
throws NodeTypeCreationException
{
@@ -132,16 +132,16 @@
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#createNodeTypesFromMappingFiles
- */
+ */
public void createNodeTypesFromMappingFiles(Session session,
InputStream[] mappingXmlFiles)
throws NodeTypeCreationException
{
}
-
+
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#createSingleNodeType
- */
+ */
public void createSingleNodeType(Session session, ClassDescriptor classDescriptor)
throws NodeTypeCreationException
{
@@ -149,14 +149,14 @@
{
getNamespaceHelper().setRegistry(session.getWorkspace().getNamespaceRegistry());
ArrayList list = new ArrayList();
-
+
if (classDescriptor.getJcrType() != null &&
(classDescriptor.getJcrType().startsWith("nt:")
|| classDescriptor.getJcrType().startsWith("mix:")))
{
throw new NodeTypeCreationException("Namespace nt and mix are reserved namespaces. Please specify your own.");
}
-
+
if (checkSuperTypes(session.getWorkspace().getNodeTypeManager(),
classDescriptor.getJcrSuperTypes()))
{
@@ -189,7 +189,7 @@
}
}
}
-
+
if (classDescriptor.getCollectionDescriptors() != null) {
Iterator collectionIterator = classDescriptor.getCollectionDescriptors().iterator();
while (collectionIterator.hasNext()) {
@@ -224,7 +224,7 @@
}
/** Checks if all JCR super types for a given node type exist.
- *
+ *
* @param ntMgr NodeTypeManager
* @param superTypes Comma separated String with JCR node types
* @return true/false
@@ -255,9 +255,9 @@
return exists;
}
-
+
/** Creates a NodeTypeDef object.
- *
+ *
* @param jcrNodeType Name of JCR node type
* @param jcrSuperTypes JCR node super types
* @return type
@@ -267,7 +267,7 @@
{
NodeTypeDef type = new NodeTypeDef();
type.setMixin(false);
-
+
if (jcrNodeType != null && (! jcrNodeType.equals("")))
{
type.setName(getNamespaceHelper().getName(jcrNodeType));
@@ -276,14 +276,14 @@
{
type.setName(getNamespaceHelper().getName(className));
}
-
+
type.setSupertypes(getJcrSuperTypes(jcrSuperTypes));
type.setPrimaryItemName(getNamespaceHelper().getName(jcrNodeType));
return type;
}
-
+
/** Creates a PropDefImpl object.
- *
+ *
* @param fieldName The name of the field
* @param field property definition descriptor
* @param declaringNodeType Node Type QName where the property belongs to
@@ -293,7 +293,7 @@
PropertyDefDescriptor field, Name declaringNodeType)
{
PropDefImpl property = new PropDefImpl();
-
+
if (field.getJcrName() != null)
{
property.setName(getNamespaceHelper().getName(field.getJcrName()));
@@ -303,7 +303,7 @@
{
property.setName(getNamespaceHelper().getName(fieldName));
}
-
+
if (field.getJcrType() != null)
{
property.setRequiredType(PropertyType.valueFromName(field.getJcrType()));
@@ -319,19 +319,19 @@
property.setAutoCreated(field.isJcrAutoCreated());
property.setMandatory(field.isJcrMandatory());
property.setMultiple(field.isJcrMultiple());
-
+
if (field.getJcrOnParentVersion() != null &&
field.getJcrOnParentVersion().length() > 0)
{
property.setOnParentVersion(OnParentVersionAction.valueFromName(field.getJcrOnParentVersion()));
}
-
+
property.setProtected(field.isJcrProtected());
return property;
}
/** Creates a NodeDefImpl object.
- *
+ *
* @param fieldName Name of the field
* @param field child node definition descriptor
* @param declaringNodeType Node Type QName where the chid node belongs to
@@ -339,7 +339,7 @@
*/
private NodeDefImpl getNodeDefinition(String fieldName,
ChildNodeDefDescriptor field, Name declaringNodeType) {
-
+
NodeDefImpl node = new NodeDefImpl();
if (field.getJcrName() != null) {
@@ -357,7 +357,7 @@
node.setMandatory(field.isJcrMandatory());
node.setAllowsSameNameSiblings(field.isJcrSameNameSiblings());
node.setDefaultPrimaryType( getNamespaceHelper().getName( field.getDefaultPrimaryType() ) );
-
+
if (field.getJcrOnParentVersion() != null
&& field.getJcrOnParentVersion().length() > 0) {
node.setOnParentVersion(OnParentVersionAction.valueFromName(field.getJcrOnParentVersion()));
@@ -368,9 +368,9 @@
}
/**
- *
- * @param propDef
- * @return
+ *
+ * @param propDef
+ * @return
*/
protected String showPropertyDefinition(PropertyDefinition propDef)
{
@@ -385,8 +385,8 @@
/** Creates a QName array from a comma separated list of JCR super types in
* a given String.
- *
- * @param superTypes JCR super types
+ *
+ * @param superTypes JCR super types
* @return qNameSuperTypes
*/
public Name[] getJcrSuperTypes(String superTypes)
@@ -410,25 +410,25 @@
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#createSingleNodeTypeFromMappingFile
- */
+ */
public void createSingleNodeTypeFromMappingFile(Session session,
InputStream mappingXmlFile, String jcrNodeType)
throws NodeTypeCreationException
{
}
-
+
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#createNodeTypeFromClass
- */
+ */
public void createNodeTypeFromClass(Session session, Class clazz,
String jcrNodeType, boolean reflectSuperClasses)
throws NodeTypeCreationException
{
}
-
+
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#createNodeTypesFromConfiguration
- */
+ */
public void createNodeTypesFromConfiguration(Session session,
InputStream jcrRepositoryConfigurationFile)
throws OperationNotSupportedException, NodeTypeCreationException
@@ -442,7 +442,7 @@
{
list.add(types[i]);
}
-
+
createNodeTypesFromList(session, list);
log.info("Registered " + list.size() + " nodetypes from xml configuration file.");
}
@@ -452,23 +452,23 @@
throw new NodeTypeCreationException(e);
}
}
-
+
/**
- *
- * @param session
- * @param nodeTypes
- * @throws org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException
- * @throws javax.jcr.RepositoryException
+ *
+ * @param session
+ * @param nodeTypes
+ * @throws org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException
+ * @throws javax.jcr.RepositoryException
*/
private void createNodeTypesFromList(Session session, List nodeTypes)
throws InvalidNodeTypeDefException, RepositoryException
{
getNodeTypeRegistry(session).registerNodeTypes(nodeTypes);
}
-
+
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#removeNodeTypes
- */
+ */
public void removeNodeTypesFromConfiguration(Session session, InputStream jcrRepositoryConfigurationFile)
throws NodeTypeRemovalException
{
@@ -481,7 +481,7 @@
{
list.add(types[i]);
}
-
+
removeNodeTypesFromList(session, list);
log.info("Registered " + list.size() + " nodetypes from xml configuration file.");
}
@@ -491,11 +491,11 @@
throw new NodeTypeRemovalException(e);
}
}
-
+
private void removeNodeTypesFromList(Session session, List nodeTypes)
throws NodeTypeRemovalException
{
- for (Iterator nodeTypeIterator = nodeTypes.iterator(); nodeTypeIterator.hasNext();)
+ for (Iterator nodeTypeIterator = nodeTypes.iterator(); nodeTypeIterator.hasNext();)
{
NodeTypeDef nodeTypeDef = (NodeTypeDef) nodeTypeIterator.next();
this.removeSingleNodeType(session, nodeTypeDef.getName());
@@ -506,12 +506,12 @@
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#createSingleNodeTypeFromMappingFile
- */
+ */
public void removeNodeTypesFromMappingFile(Session session, InputStream[] mappingXmlFile)
throws NodeTypeRemovalException
{
}
-
+
public void removeSingleNodeType(Session session, Name name)
throws NodeTypeRemovalException
{
@@ -522,12 +522,12 @@
catch (Exception e)
{
throw new NodeTypeRemovalException(e);
- }
+ }
}
-
+
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#removeSingleNodeType
- */
+ */
public void removeSingleNodeType(Session session, String jcrNodeType)
throws NodeTypeRemovalException
{
@@ -538,11 +538,11 @@
catch (Exception e)
{
throw new NodeTypeRemovalException(e);
- }
+ }
}
/** Returns the jackrabbit NodeTypeRegistry from an open session.
- *
+ *
* @param session Repository session
* @return nodeTypeRegistry
*/
@@ -558,22 +558,22 @@
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#getPrimaryNodeTypeNames
- */
+ */
public List getPrimaryNodeTypeNames(Session session, String namespace)
{
return null;
}
-
+
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#getAllPrimaryNodeTypeNames
- */
+ */
public List getAllPrimaryNodeTypeNames(Session session)
{
return null;
}
/** Getter for property namespaceHelper.
- *
+ *
* @return namespaceHelper
*/
public NamespaceHelper getNamespaceHelper()
@@ -582,14 +582,14 @@
}
/** Setter for property namespaceHelper.
- *
+ *
* @param object namespaceHelper
*/
public void setNamespaceHelper(NamespaceHelper object)
{
this.namespaceHelper = object;
}
-
+
private boolean isPropertyType(String type)
{
@@ -601,6 +601,6 @@
type.equals(PropertyType.TYPENAME_NAME) ||
type.equals(PropertyType.TYPENAME_PATH) ||
type.equals(PropertyType.TYPENAME_REFERENCE) ||
- type.equals(PropertyType.TYPENAME_STRING));
+ type.equals(PropertyType.TYPENAME_STRING));
}
}
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jeceira/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jeceira/NodeTypeManagerImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jeceira/NodeTypeManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jeceira/NodeTypeManagerImpl.java Sun Jan 27 13:08:08 2008
@@ -37,17 +37,17 @@
* @author <a href="mailto:okiessler@apache.org">Oliver Kiessler</a>
*/
public class NodeTypeManagerImpl implements NodeTypeManager {
-
+
/**
* Logging.
*/
private static Log log = LogFactory.getLog(NodeTypeManagerImpl.class);
-
+
/** Creates a new instance of NodeTypeManagerImpl. */
public NodeTypeManagerImpl()
{
}
-
+
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#createNamespace
*/
@@ -55,40 +55,40 @@
throws NamespaceCreationException
{
}
-
+
public void createNodeTypes(Session session, MappingDescriptor mappingDescriptor)
throws NodeTypeCreationException
{
}
-
+
public void createNodeTypes(Session session, ClassDescriptor[] classDescriptors)
throws NodeTypeCreationException
{
}
-
+
public void createNodeTypesFromMappingFiles(Session session,
InputStream[] mappingXmlFiles)
throws NodeTypeCreationException
{
}
-
+
public void createSingleNodeType(Session session, ClassDescriptor classDescriptor)
throws NodeTypeCreationException
{
}
-
+
public void createSingleNodeTypeFromMappingFile(Session session,
InputStream mappingXmlFile, String jcrNodeType)
throws NodeTypeCreationException
{
}
-
+
public void createNodeTypeFromClass(Session session, Class clazz,
String jcrNodeType, boolean reflectSuperClasses)
throws NodeTypeCreationException
{
}
-
+
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.NodeTypeManager#createNodeTypesFromConfiguration
*/
@@ -97,22 +97,22 @@
throws OperationNotSupportedException, NodeTypeCreationException
{
}
-
+
public void removeNodeTypes(Session session, InputStream[] mappingXmlFiles)
throws NodeTypeRemovalException
{
}
-
+
public void removeSingleNodeType(Session session, String jcrNodeType)
throws NodeTypeRemovalException
{
}
-
+
public List getPrimaryNodeTypeNames(Session session, String namespace)
{
return null;
}
-
+
public List getAllPrimaryNodeTypeNames(Session session)
{
return null;
@@ -122,6 +122,6 @@
}
public void removeNodeTypesFromMappingFile(Session session, InputStream[] mappingXmlFiles) throws NodeTypeRemovalException {
- }
-
+ }
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/TestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/TestBase.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/TestBase.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/TestBase.java Sun Jan 27 13:08:08 2008
@@ -31,7 +31,7 @@
public class TestBase extends TestCase
{
protected static Session session;
-
+
/**
* Setting up the testcase.
*
@@ -46,12 +46,12 @@
configuration.setRepositoryName("repositoryTest");
configuration.setRepositoryPath("./target/repository");
session = RepositorySessionFactory.getSession(RepositorySessionFactory.JACKRABBIT, "superuser", "superuser", configuration);
-
+
/*RepositoryConfiguration configuration = new RepositoryConfiguration();
configuration.setConfigurationFile("./src/config/jeceria/jeceira.xml");
configuration.setRepositoryName("test");
session = RepositorySessionFactory.getSession(RepositorySessionFactory.JECEIRA, null, null, configuration);*/
- }
+ }
}
/**
@@ -60,9 +60,9 @@
public void tearDown() throws Exception
{
}
-
+
/** Returns true if a property was found in an array of property defintions.
- *
+ *
* @param defintions PropertyDefinition[]
* @param propertyName Name of property to find
* @return true/false
@@ -71,7 +71,7 @@
String propertyName)
{
boolean found = false;
-
+
if (definitions != null && definitions.length > 0)
{
for (int i = 0; i < definitions.length; i++)
@@ -82,7 +82,7 @@
}
}
}
-
+
return found;
}
}
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java Sun Jan 27 13:08:08 2008
@@ -40,12 +40,12 @@
* @author <a href="mailto:okiessler@apache.org">Oliver Kiessler</a>
*/
public class NodeTypeManagerImplTest extends TestBase {
-
+
/** Class to test.
*/
private NodeTypeManagerImpl jackrabbitNodeTypeManagerImpl
= new NodeTypeManagerImpl();
-
+
/** Returns testsuite.
* @return suite
*/
@@ -59,12 +59,12 @@
{
getJackrabbitNodeTypeManagerImpl().createNamespace(session,
"test", "http://www.test.com/test-uri");
-
+
assertEquals(session.getWorkspace().getNamespaceRegistry().getPrefix("http://www.test.com/test-uri"), "test");
assertEquals(session.getWorkspace().getNamespaceRegistry().getURI("test"), "http://www.test.com/test-uri");
-
+
boolean failed = false;
-
+
try
{
getJackrabbitNodeTypeManagerImpl().createNamespace(session,
@@ -77,12 +77,12 @@
assertTrue(failed);
}
-
+
public void testCreateNodeTypesFromConfiguration() throws Exception
{
getJackrabbitNodeTypeManagerImpl().createNodeTypesFromConfiguration(session,
new FileInputStream("./src/test/config/jackrabbit/nodetypes_test1.xml"));
-
+
NodeType test1 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test1");
assertNotNull(test1);
assertFalse(test1.isMixin());
@@ -92,21 +92,21 @@
assertEquals(test1.getSupertypes()[0].getName(), "nt:base");
assertTrue(containsPropertyDefintion(test1.getPropertyDefinitions(), "ocm:testProperty"));
}
-
+
public void testCreateSingleNodeType() throws Exception
{
ClassDescriptor classDescriptor = new ClassDescriptor();
classDescriptor.setClassName("test.TestClass");
classDescriptor.setJcrType("ocm:test2");
classDescriptor.setJcrSuperTypes("nt:base");
-
+
FieldDescriptor field1 = new FieldDescriptor();
field1.setFieldName("a");
field1.setJcrName("ocm:a");
field1.setJcrType("String");
field1.setJcrAutoCreated(true);
field1.setJcrMandatory(true);
- field1.setJcrMultiple(true);
+ field1.setJcrMultiple(true);
classDescriptor.addFieldDescriptor(field1);
FieldDescriptor field2 = new FieldDescriptor();
@@ -115,11 +115,11 @@
field2.setJcrType("Long");
field1.setJcrAutoCreated(false);
field1.setJcrMandatory(true);
- field1.setJcrMultiple(false);
- classDescriptor.addFieldDescriptor(field2);
+ field1.setJcrMultiple(false);
+ classDescriptor.addFieldDescriptor(field2);
getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
-
+
NodeType testNodeType = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test2");
assertNotNull(testNodeType);
assertFalse(testNodeType.isMixin());
@@ -129,21 +129,21 @@
// 2 defined in ocm:test2 and 2 inherited from nt:base
assertEquals(testNodeType.getPropertyDefinitions().length, 4);
-
+
assertTrue(containsProperty("ocm:a", testNodeType.getPropertyDefinitions()));
assertTrue(containsProperty("ocm:b", testNodeType.getPropertyDefinitions()));
assertTrue(containsProperty("jcr:primaryType", testNodeType.getPropertyDefinitions()));
assertTrue(containsProperty("jcr:mixinTypes", testNodeType.getPropertyDefinitions()));
-
+
PropertyDefinition propDef1 = getPropertyDefinition(testNodeType.getPropertyDefinitions(), "ocm:a");
System.out.println(getJackrabbitNodeTypeManagerImpl().showPropertyDefinition(propDef1));
// TODO test all properties
-
+
PropertyDefinition propDef2 = getPropertyDefinition(testNodeType.getPropertyDefinitions(), "ocm:b");
System.out.println(getJackrabbitNodeTypeManagerImpl().showPropertyDefinition(propDef2));
// TODO test all properties
}
-
+
public void testCreateSingleNodeTypeNoNamespace() throws Exception
{
ClassDescriptor classDescriptor = new ClassDescriptor();
@@ -158,15 +158,15 @@
classDescriptor.addFieldDescriptor(field1);
getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
-
+
NodeType test3 = session.getWorkspace().getNodeTypeManager().getNodeType("test3");
assertNotNull(test3);
assertFalse(test3.isMixin());
assertEquals(test3.getName(), "test3");
assertEquals(test3.getSupertypes().length, 1);
- assertEquals(test3.getSupertypes()[0].getName(), "nt:base");
+ assertEquals(test3.getSupertypes()[0].getName(), "nt:base");
}
-
+
public void testCreateSingleNodeTypeNoJcrNodeTypeSet() throws Exception
{
ClassDescriptor classDescriptor = new ClassDescriptor();
@@ -180,28 +180,28 @@
classDescriptor.addFieldDescriptor(field1);
getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
-
+
NodeType test4 = session.getWorkspace().getNodeTypeManager().getNodeType("test.Test4Class");
assertNotNull(test4);
assertFalse(test4.isMixin());
assertEquals(test4.getName(), "test.Test4Class");
assertEquals(test4.getSupertypes().length, 1);
- assertEquals(test4.getSupertypes()[0].getName(), "nt:base");
+ assertEquals(test4.getSupertypes()[0].getName(), "nt:base");
}
-
+
public void testCreateSingleNodeTypeIncompleteFieldDescriptorProperties() throws Exception
{
ClassDescriptor classDescriptor = new ClassDescriptor();
classDescriptor.setClassName("test.Test5Class");
classDescriptor.setJcrType("ocm:test5");
classDescriptor.setJcrSuperTypes("ocm:test2");
-
+
FieldDescriptor field1 = new FieldDescriptor();
field1.setFieldName("abc");
classDescriptor.addFieldDescriptor(field1);
getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
-
+
NodeType test5 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test5");
assertNotNull(test5);
assertFalse(test5.isMixin());
@@ -212,7 +212,7 @@
assertTrue(containsSuperType("nt:base", test5.getSupertypes()));
assertTrue(containsProperty("abc", test5.getPropertyDefinitions()));
}
-
+
public void testCreateSingleNodeTypeNtNamespace() throws Exception
{
ClassDescriptor classDescriptor = new ClassDescriptor();
@@ -225,9 +225,9 @@
field1.setJcrName("a");
field1.setJcrType("String");
classDescriptor.addFieldDescriptor(field1);
-
+
boolean failed = false;
-
+
try
{
getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
@@ -237,62 +237,62 @@
// excepted
failed = true;
}
-
+
assertTrue(failed);
}
-
+
public void testCreateSingleNodeTypeWithPropertyForCollection() throws Exception
{
ClassDescriptor classDescriptor = new ClassDescriptor();
classDescriptor.setClassName("test.Test9Class");
classDescriptor.setJcrType("ocm:test9");
classDescriptor.setJcrSuperTypes("nt:base");
-
+
CollectionDescriptor collection1 = new CollectionDescriptor();
collection1.setFieldName("a");
collection1.setJcrName("a");
collection1.setJcrType("String");
-
+
classDescriptor.addCollectionDescriptor(collection1);
-
+
getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
-
+
NodeType test9 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test9");
assertNotNull(test9);
// not check node type definition, assuming other tests have done that
-
+
// assert property definition a
PropertyDefinition propDef = getPropertyDefinition(test9.getPropertyDefinitions(), "a");
assertNotNull(propDef);
assertEquals(propDef.getRequiredType(), PropertyType.STRING);
}
-
+
public void testCreateSingleNodeTypeWithPropertyForBean() throws Exception
{
ClassDescriptor classDescriptor = new ClassDescriptor();
classDescriptor.setClassName("test.Test10Class");
classDescriptor.setJcrType("ocm:test10");
classDescriptor.setJcrSuperTypes("nt:base");
-
+
BeanDescriptor bean1 = new BeanDescriptor();
bean1.setFieldName("a");
bean1.setJcrName("a");
bean1.setJcrType("String");
classDescriptor.addBeanDescriptor(bean1);
-
+
getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
-
+
NodeType test10 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test10");
assertNotNull(test10);
// not check node type definition, assuming other tests have done that
-
+
// assert property definition a
PropertyDefinition propDef = getPropertyDefinition(test10.getPropertyDefinitions(), "a");
assertNotNull(propDef);
assertEquals(propDef.getRequiredType(), PropertyType.STRING);
-
+
}
-
+
public void testCreateSingleNodeTypeWithPropertyForCollectionDefinitionConflict() throws Exception
{
ClassDescriptor classDescriptor = new ClassDescriptor();
@@ -303,21 +303,21 @@
CollectionDescriptor collection1 = new CollectionDescriptor();
collection1.setFieldName("a");
collection1.setJcrName("a");
- collection1.setJcrType("String");
+ collection1.setJcrType("String");
classDescriptor.addCollectionDescriptor(collection1);
getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
-
+
NodeType test13 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test13");
assertNotNull(test13);
// not check node type definition, assuming other tests have done that
-
+
// assert property definition a
PropertyDefinition propDef = getPropertyDefinition(test13.getPropertyDefinitions(), "a");
assertNotNull(propDef);
assertEquals(propDef.getRequiredType(), PropertyType.STRING);
}
-
+
public void testCreateSingleNodeTypeWithPropertyForBeanDefinitionConflict() throws Exception
{
ClassDescriptor classDescriptor = new ClassDescriptor();
@@ -328,22 +328,22 @@
BeanDescriptor bean1 = new BeanDescriptor();
bean1.setFieldName("a");
bean1.setJcrName("a");
- bean1.setJcrType("String");
+ bean1.setJcrType("String");
classDescriptor.addBeanDescriptor(bean1);
getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
-
+
NodeType test14 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test14");
assertNotNull(test14);
// not check node type definition, assuming other tests have done that
-
+
// assert property definition a
PropertyDefinition propDef = getPropertyDefinition(test14.getPropertyDefinitions(), "a");
assertNotNull(propDef);
assertEquals(propDef.getRequiredType(), PropertyType.STRING);
}
-
+
public void testCreateSingleNodeTypeWithChildNodeForCollection() throws Exception
{
ClassDescriptor classDescriptor = new ClassDescriptor();
@@ -358,11 +358,11 @@
classDescriptor.addCollectionDescriptor(collection1);
getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
-
+
NodeType test11 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test11");
assertNotNull(test11);
// not check node type definition, assuming other tests have done that
-
+
// assert child node definition a
NodeDefinition nodeDef = getChildNodeDefinition(test11.getChildNodeDefinitions(), "b");
assertNotNull(nodeDef);
@@ -370,7 +370,7 @@
assertEquals(nodeDef.getRequiredPrimaryTypes().length, 1);
assertEquals(nodeDef.getRequiredPrimaryTypes()[0].getName(), "nt:unstructured");
}
-
+
public void testCreateSingleNodeTypeWithChildNodeForBean() throws Exception
{
ClassDescriptor classDescriptor = new ClassDescriptor();
@@ -385,11 +385,11 @@
classDescriptor.addBeanDescriptor(bean1);
getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
-
+
NodeType test12 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test12");
assertNotNull(test12);
// not check node type definition, assuming other tests have done that
-
+
// assert property definition a
NodeDefinition nodeDef = getChildNodeDefinition(test12.getChildNodeDefinitions(), "b");
assertNotNull(nodeDef);
@@ -397,14 +397,14 @@
assertEquals(nodeDef.getRequiredPrimaryTypes().length, 1);
assertEquals(nodeDef.getRequiredPrimaryTypes()[0].getName(), "nt:unstructured");
}
-
+
public void testCreateNodeTypes() throws Exception
{
ClassDescriptor classDescriptor = new ClassDescriptor();
classDescriptor.setClassName("test.Test6Class");
classDescriptor.setJcrType("ocm:test6");
classDescriptor.setJcrSuperTypes("nt:base");
-
+
FieldDescriptor field1 = new FieldDescriptor();
field1.setFieldName("a");
field1.setJcrName("ocm:a");
@@ -416,12 +416,12 @@
field2.setJcrName("ocm:b");
field2.setJcrType("Long");
classDescriptor.addFieldDescriptor(field2);
-
+
ClassDescriptor classDescriptor2 = new ClassDescriptor();
classDescriptor2.setClassName("test.Test7Class");
classDescriptor2.setJcrType("ocm:test7");
classDescriptor2.setJcrSuperTypes("nt:base");
-
+
FieldDescriptor field3 = new FieldDescriptor();
field3.setFieldName("a");
field3.setJcrName("ocm:a");
@@ -433,20 +433,20 @@
field4.setJcrName("ocm:b");
field4.setJcrType("Long");
classDescriptor2.addFieldDescriptor(field4);
-
+
ClassDescriptor[] classDescriptorArray = new ClassDescriptor[2];
classDescriptorArray[0] = classDescriptor;
classDescriptorArray[1] = classDescriptor2;
-
+
getJackrabbitNodeTypeManagerImpl().createNodeTypes(session, classDescriptorArray);
-
+
NodeType test6 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test6");
assertNotNull(test6);
-
+
NodeType test7 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test7");
assertNotNull(test7);
}
-
+
public void testRemoveSingleNodeType() throws Exception
{
ClassDescriptor classDescriptor = new ClassDescriptor();
@@ -461,25 +461,25 @@
classDescriptor.addFieldDescriptor(field1);
getJackrabbitNodeTypeManagerImpl().createSingleNodeType(session, classDescriptor);
-
+
NodeType test8 = session.getWorkspace().getNodeTypeManager().getNodeType("ocm:test8");
assertNotNull(test8);
// not implemented yet in jackrabbit
- // getJackrabbitNodeTypeManagerImpl().removeSingleNodeType(session, "ocm:test8");
- }
+ // getJackrabbitNodeTypeManagerImpl().removeSingleNodeType(session, "ocm:test8");
+ }
/** Returns true if a given property is found in an array of property
* definitions.
- *
+ *
* @param propertyName Name of property to find
* @param propDefs Properties of a node type
- * @return true/false
+ * @return true/false
*/
protected boolean containsProperty(String propertyName,
PropertyDefinition[] propDefs)
{
boolean found = false;
-
+
for (int i = 0; i < propDefs.length; i++)
{
if (propDefs[i].getName().equals(propertyName))
@@ -488,12 +488,12 @@
break;
}
}
-
+
return found;
}
-
+
/** Returns a property defintion identified by its name.
- *
+ *
* @param propDefs All property definitions of a node type
* @param propertyName Name of property definition
* @return found
@@ -502,7 +502,7 @@
String propertyName)
{
PropertyDefinition found = null;
-
+
for (int i = 0; i < propDefs.length; i++)
{
if (propDefs[i].getName().equals(propertyName))
@@ -511,22 +511,22 @@
break;
}
}
-
+
return found;
}
-
+
/** Returns true if a given child node is found in an array of child node
* definitions.
- *
+ *
* @param childNodeName Name of child node to find
* @param childNodeDefs Child nodes of a node type
- * @return true/false
+ * @return true/false
*/
protected boolean containsChildNode(String childNodeName,
NodeDefinition[] childNodeDefs)
{
boolean found = false;
-
+
for (int i = 0; i < childNodeDefs.length; i++)
{
if (childNodeDefs[i].getName().equals(childNodeName))
@@ -538,9 +538,9 @@
return found;
}
-
+
/** Returns a property defintion identified by its name.
- *
+ *
* @param childNodeDefs Child nodes of a node type
* @param childNodeName Name of child node to find
* @return found
@@ -549,7 +549,7 @@
String childNodeName)
{
NodeDefinition found = null;
-
+
for (int i = 0; i < childNodeDefs.length; i++)
{
if (childNodeDefs[i].getName().equals(childNodeName))
@@ -561,18 +561,18 @@
return found;
}
-
+
/** Returns true if a given super type is found in an arry of super types.
- *
+ *
* @param superType Name of super type to find
* @param propDefs Properties of a node type
- * @return true/false
+ * @return true/false
*/
protected boolean containsSuperType(String superType,
NodeType[] nodeTypes)
{
boolean found = false;
-
+
for (int i = 0; i < nodeTypes.length; i++)
{
if (nodeTypes[i].getName().equals(superType))
@@ -583,10 +583,10 @@
}
return found;
- }
-
+ }
+
/** Getter for property jackrabbitNodeTypeManagerImpl.
- *
+ *
* @return jackrabbitNodeTypeManagerImpl
*/
public NodeTypeManagerImpl getJackrabbitNodeTypeManagerImpl()
@@ -595,7 +595,7 @@
}
/** Setter for property jackrabbitNodeTypeManagerImpl.
- *
+ *
* @param object jackrabbitNodeTypeManagerImpl
*/
public void setJackrabbitNodeTypeManagerImpl(NodeTypeManagerImpl object)
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/IncorrectPersistentClassException.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/IncorrectPersistentClassException.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/IncorrectPersistentClassException.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/IncorrectPersistentClassException.java Sun Jan 27 13:08:08 2008
@@ -24,8 +24,8 @@
* @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
*/
public class IncorrectPersistentClassException extends JcrMappingException {
-
-
+
+
public IncorrectPersistentClassException(String message, Throwable nested) {
super(message, nested);
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/InvalidQueryException.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/InvalidQueryException.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/InvalidQueryException.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/InvalidQueryException.java Sun Jan 27 13:08:08 2008
@@ -1,10 +1,10 @@
/*
* Copyright 2007 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
+ * You may obtain a copy of the License at
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@@ -29,7 +29,7 @@
/**
* Create an exception wrapping the given checked JCR exception
- *
+ *
* @param cause The wrapped JCR <code>InvalidQueryException</code>
*/
public InvalidQueryException(javax.jcr.query.InvalidQueryException cause) {
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/LockedException.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/LockedException.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/LockedException.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/LockedException.java Sun Jan 27 13:08:08 2008
@@ -17,8 +17,8 @@
package org.apache.jackrabbit.ocm.exception;
/**
- * Throwed if a path is locked and a operation cannot be performed
- *
+ * Throwed if a path is locked and a operation cannot be performed
+ *
* @author markoc
*/
@@ -35,7 +35,7 @@
}
/**
- *
+ *
* @return The JCR Lock Owner
*/
public String getLockOwner() {
@@ -43,8 +43,8 @@
}
/**
- *
- * @return The JCR locked node path
+ *
+ * @return The JCR locked node path
*/
public String getLockedNodePath() {
return lockedNodePath;
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/LockingException.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/LockingException.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/LockingException.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/LockingException.java Sun Jan 27 13:08:08 2008
@@ -17,8 +17,8 @@
package org.apache.jackrabbit.ocm.exception;
/**
- * Base exception for all exceptions related to JCR Locking feature.
- *
+ * Base exception for all exceptions related to JCR Locking feature.
+ *
* @author markoc
*/
abstract public class LockingException extends ObjectContentManagerException {
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/NestableRuntimeException.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/NestableRuntimeException.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/NestableRuntimeException.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/NestableRuntimeException.java Sun Jan 27 13:08:08 2008
@@ -87,8 +87,8 @@
if (getCause() == null) {
return super.getMessage();
} else {
- return super.getMessage()
- + "; nested exception is "
+ return super.getMessage()
+ + "; nested exception is "
+ getCause().getClass().getName()
+ ": " + getCause().getMessage();
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/ObjectContentManagerException.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/ObjectContentManagerException.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/ObjectContentManagerException.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/exception/ObjectContentManagerException.java Sun Jan 27 13:08:08 2008
@@ -32,7 +32,7 @@
*/
protected ObjectContentManagerException() {
}
-
+
/**
* Constructor with message.
*
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/lock/Lock.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/lock/Lock.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/lock/Lock.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/lock/Lock.java Sun Jan 27 13:08:08 2008
@@ -22,9 +22,9 @@
/**
* Wrapper class for a JCR Lock object
- *
+ *
* @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
- *
+ *
*/
public class Lock
{
@@ -53,7 +53,7 @@
}
public boolean isLive() {
- try
+ try
{
return lock.isLive();
}
@@ -68,7 +68,7 @@
}
public void refresh() {
- try
+ try
{
lock.refresh();
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/CustomNodeTypeCreator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/CustomNodeTypeCreator.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/CustomNodeTypeCreator.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/CustomNodeTypeCreator.java Sun Jan 27 13:08:08 2008
@@ -28,19 +28,19 @@
/** This method is supposed to create custom node types on repository
* setup.
- *
- * @throws org.apache.jackrabbit.ocm.exception.CustomNodeTypeCreationException
- * @return true/false True if custom node type creation succeeded
+ *
+ * @throws org.apache.jackrabbit.ocm.exception.CustomNodeTypeCreationException
+ * @return true/false True if custom node type creation succeeded
*/
boolean createInitialJcrCustomNodeTypes() throws CustomNodeTypeCreationException;
/** Method to add a jcr custom node type to an existing jcr repository.
- *
- * @throws org.apache.jackrabbit.ocm.exception.CustomNodeTypeCreationException
+ *
+ * @throws org.apache.jackrabbit.ocm.exception.CustomNodeTypeCreationException
* @return true/false True if custom node type creation succeeded
*/
boolean addJcrCustomNodeType() throws CustomNodeTypeCreationException;
-
+
/** Jcr session to be injected into implementation.
* @param jcrSession JcrSession
*/
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/ManagerConstant.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/ManagerConstant.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/ManagerConstant.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/ManagerConstant.java Sun Jan 27 13:08:08 2008
@@ -19,20 +19,20 @@
/**
- *
+ *
* General Object Content Manager Constants use in several classes
- *
+ *
* @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
- *
+ *
*/
public interface ManagerConstant
{
- public static final String NT_UNSTRUCTURED = "nt:unstructured";
+ public static final String NT_UNSTRUCTURED = "nt:unstructured";
public static final String DISCRIMINATOR_NODE_TYPE = "ocm:discriminator";
- public static final String DISCRIMINATOR_PROPERTY_NAME = "ocm:classname";
+ public static final String DISCRIMINATOR_PROPERTY_NAME = "ocm:classname";
public static final String FROZEN_NODE_TYPE = "nt:frozenNode";
public static final String FROZEN_PRIMARY_TYPE_PROPERTY = "jcr:frozenPrimaryType";
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/ObjectContentManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/ObjectContentManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/ObjectContentManager.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/ObjectContentManager.java Sun Jan 27 13:08:08 2008
@@ -34,17 +34,17 @@
/**
* The object content manager encapsulates a JCR session. This is the main
* component used to manage objects into the JCR repository.
- *
+ *
* @author Sandro Boehme
* @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart
* Christophe </a>
- *
+ *
*/
public interface ObjectContentManager {
/**
* Check if an object exists
- *
+ *
* @param path
* the object path
* @return true if the item exists
@@ -56,7 +56,7 @@
/**
* Can this object content manager insert, update, delete, ... that type?
- *
+ *
* @param clazz
* class for question
* @return <code>true</code> if the class is persistence
@@ -65,7 +65,7 @@
/**
* Insert an object into the JCR repository
- *
+ *
* @param object
* the object to add
* @throws ObjectContentManagerException
@@ -75,7 +75,7 @@
/**
* Update an object
- *
+ *
* @param object
* the object to update
* @throws ObjectContentManagerException
@@ -85,11 +85,11 @@
/**
* Get an object from the JCR repository
- *
+ *
* @param path
* the object path
* @return the object found or null
- *
+ *
* @throws ObjectContentManagerException
* when it is not possible to retrieve the object
*/
@@ -97,11 +97,11 @@
/**
* Get an object from the JCR repository
- *
+ *
* @param the
* object uuid
* @return the object found or null
- *
+ *
* @throws ObjectContentManagerException
* when it is not possible to retrieve the object
*/
@@ -110,13 +110,13 @@
/**
* Get an object from the JCR repository
- *
+ *
* @param path
* the object path
* @param versionNumber
* The desired object version number
* @return the object found or null
- *
+ *
* @throws ObjectContentManagerException
* when it is not possible to retrieve the object
*/
@@ -125,13 +125,13 @@
/**
* Get an object from the JCR repository
- *
+ *
* @param objectClass
* the object class
* @param path
* the object path
* @return the object found or null
- *
+ *
* @throws ObjectContentManagerException
* when it is not possible to retrieve the object
*/
@@ -140,7 +140,7 @@
/**
* Get an object from the JCR repository
- *
+ *
* @param objectClass
* the object class
* @param path
@@ -148,7 +148,7 @@
* @param versionNumber
* The desired object version number
* @return the object found or null
- *
+ *
* @throws ObjectContentManagerException
* when it is not possible to retrieve the object
*/
@@ -159,7 +159,7 @@
* Retrieve the specified attribute for the given persistent object. this
* attribute is either a bean or a collection. This method is usefull if the
* corresponding descriptor has an autoRetrieve="false"
- *
+ *
* @param object
* The persistent object
* @param attributeName
@@ -169,7 +169,7 @@
/**
* Retrieve all mapped attributes for the given persistent object.
- *
+ *
* @param object
* The persistent object
*/
@@ -177,79 +177,79 @@
/**
* Remove an object from a JCR repository
- *
+ *
* @param path
* the object path
* @throws ObjectContentManagerException
* when it is not possible to remove the object
- *
+ *
*/
public void remove(String path) throws ObjectContentManagerException;
/**
* Remove an object from a JCR repository
- *
+ *
* @param object
* the object to remove
* @throws ObjectContentManagerException
* when it is not possible to remove the object
- *
+ *
*/
public void remove(Object object) throws ObjectContentManagerException;
/**
* Remove all objects matching to a query
- *
+ *
* @param query
* The query used to find the objects to remove
* @throws ObjectContentManagerException
* when it is not possible to remove all objects
- *
+ *
*/
public void remove(Query query) throws ObjectContentManagerException;
/**
* Retrieve an object matching to a query
- *
+ *
* @param query
* The Query object used to seach the object
* @return The object found or null
* @throws ObjectContentManagerException
* when it is not possible to retrieve the object
- *
+ *
*/
public Object getObject(Query query) throws ObjectContentManagerException;
/**
* Retrieve some objects matching to a query
- *
+ *
* @param query
* The query used to seach the objects
* @return a collection of objects found
* @throws ObjectContentManagerException
* when it is not possible to retrieve the objects
- *
+ *
*/
public Collection getObjects(Query query)
throws ObjectContentManagerException;
/**
* Returns a list of objects of that particular class which are associated to a specific path.
- * This method is helpfull when same name sibling is used to create nodes.
+ * This method is helpfull when same name sibling is used to create nodes.
* This would not return the objects anywhere below the denoted path.
- *
- * @param objectClass
- * @param path Node path.
+ *
+ * @param objectClass
+ * @param path Node path.
* @return a collection of object found
*/
public Collection getObjects(Class objectClass, String path)
throws ObjectContentManagerException;
-
+
/**
* Return a list of object matching to a JCR query
- *
- * @param query the JCR query
+ *
+ * @param query the JCR query
* @param language the JCR Language ("XPATH" or "SQL").
* @return
*/
@@ -257,7 +257,7 @@
/**
* Retrieve some objects matching to a query.
- *
+ *
* @param query
* The query used to seach the objects
* @return an iterator of objects found
@@ -278,23 +278,23 @@
* The <code>language</code> must be a string from among those returned by
* <code>javax.jcr.QueryManager.getSupportedQueryLanguages()</code>; if
* it is not, then an <code>InvalidQueryException</code> is thrown.
- *
+ *
* @param query
* The query to execute to find the objects.
* @param language
* The language in which the query is written
- *
+ *
* @return An iterator of objects instances. Each entry in the iterator
* represents the mapping of a node returned by the query. If the
* query returns a node, which may not be mapped, the respective
* node is ignored.
- *
+ *
* @throws org.apache.jackrabbit.ocm.exception.InvalidQueryException
* If the query is not a valid JCR Query according to the
* specified language
* @throws ObjectContentManagerException
* If an error occurrs querying for the objects.
- *
+ *
* @see javax.jcr.query.QueryManager#createQuery(String, String)
* @see javax.jcr.query.QueryManager#getSupportedQueryLanguages()
*/
@@ -303,7 +303,7 @@
/**
* Checkout - Create a new version This is only possible if the object is
* based on mix:versionable node type
- *
+ *
* @param path
* The object path
* @throws VersionException
@@ -313,7 +313,7 @@
/**
* Checkin an object
- *
+ *
* @param path
* the object path
* @throws VersionException
@@ -324,7 +324,7 @@
/**
* Checkin an object and apply some labels to this new version Within a
* particular object path, a given label may appear a maximum of once
- *
+ *
* @param path
* The object path
* @param versionLabels
@@ -337,7 +337,7 @@
/**
* Get all version labels assigned to a particular object version
- *
+ *
* @param path
* the object path
* @param versionName
@@ -351,7 +351,7 @@
/**
* Get all version labels assigned to all versions
- *
+ *
* @param path
* the object path
* @return a array of string (version labels)
@@ -362,7 +362,7 @@
/**
* Add a new label to a particular version
- *
+ *
* @param path
* the object path
* @param versionName
@@ -378,7 +378,7 @@
/**
* Get all object versions
- *
+ *
* @param path
* the object path
* @return a version iterator
@@ -389,7 +389,7 @@
/**
* Get the first object version
- *
+ *
* @param path
* the object path
* @return the first version found
@@ -400,7 +400,7 @@
/**
* Get the lastest object version
- *
+ *
* @param path
* the object path
* @return the last version found
@@ -411,7 +411,7 @@
/**
* Get a particular version
- *
+ *
* @param path
* the object path
* @param versionName
@@ -425,7 +425,7 @@
/**
* Save all modifications made by the object content manager
- *
+ *
* @throws ObjectContentManagerException
* when it is not possible to save all pending operation into
* the JCR repo
@@ -434,7 +434,7 @@
/**
* Close the session
- *
+ *
* @throws ObjectContentManagerException
* when it is not possible to logout
*/
@@ -442,7 +442,7 @@
/**
* Lock object saved on {@param path }.
- *
+ *
* @param path
* path to saved object.
* @param isDeep
@@ -451,7 +451,7 @@
* is lock session scoped? See JCR spec: Session-scoped and
* Open-scoped Locks
* @return lock - Wrapper object for a JCR lock
- *
+ *
* @throws LockedException
* if path is locked (cannot lock same path again)
*/
@@ -460,14 +460,14 @@
/**
* Unlock object stored on {@param path }.
- *
+ *
* @param path
* path to stored object
- *
- *
+ *
+ *
* @param lockToken
* see JCR spec: 8.4.6 Lock Token; can be <code>null</code>
- *
+ *
* @throws IllegalUnlockException
* throws if the current operation does not own the current lock
*/
@@ -476,33 +476,33 @@
/**
* Is that path locked?
- *
+ *
* @param absPath
* @return <code>true</code> if path locked
*/
public boolean isLocked(String absPath);
/**
- *
+ *
* @return The query manager reference
*/
public QueryManager getQueryManager();
/**
* Refresh the underlying jcr session (see the jcr spec)
- *
+ *
* @param keepChanges
*/
public void refresh(boolean keepChanges);
/**
* Move an object
- *
+ *
* @param srcPath
* path of the object to move
* @param destPath
* destination path
- *
+ *
* @throws ObjectContentManagerException
*/
public void move(String srcPath, String destPath)
@@ -510,12 +510,12 @@
/**
* Copy an object
- *
+ *
* @param srcPath
* path of the object to copy
* @param destPath
* destination path
- *
+ *
* @throws ObjectContentManagerException
*/
public void copy(String srcPath, String destPath)
@@ -524,7 +524,7 @@
/**
* This method returns the JCR session. The JCR session could be used to
* make some JCR specific calls.
- *
+ *
* @return the associated JCR session
*/
public Session getSession();
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/AtomicTypeConverter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/AtomicTypeConverter.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/AtomicTypeConverter.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/AtomicTypeConverter.java Sun Jan 27 13:08:08 2008
@@ -21,13 +21,13 @@
import javax.jcr.ValueFactory;
/**
- *
+ *
* AtomicTypeConverter interface.
- *
+ *
* The Object converter used atomic type converters to map atomic fields to JCR Value objects.
* Amotic fields are primitive java types and their wrapper classes.
- *
- *
+ *
+ *
* @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>
*/
@@ -36,27 +36,27 @@
/**
* Convert an object into a JCR value.
*
- * @param valueFactory The JCR ValueFactory
+ * @param valueFactory The JCR ValueFactory
* @param object The object to convert
* @return the corresponding JCR value
- *
+ *
*/
public Value getValue(ValueFactory valueFactory, Object object);
/**
* Convert a jcr property value into an object
- *
+ *
* @param value The JCR property value
* @return the corresponding object
*/
public Object getObject(Value value);
/**
- * Get the string converted value. This is mainly used to build xpath expressions
- *
+ * Get the string converted value. This is mainly used to build xpath expressions
+ *
* @param valueFactory The JCR ValueFactory
* @param object The object value
- * @return The string converted value
+ * @return The string converted value
*/
public String getXPathQueryValue(ValueFactory valueFactory, Object object);
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/AtomicTypeConverterProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/AtomicTypeConverterProvider.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/AtomicTypeConverterProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/AtomicTypeConverterProvider.java Sun Jan 27 13:08:08 2008
@@ -22,13 +22,13 @@
/**
* This interface defines a provider for accessing
* {@link org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter}
- *
+ *
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
public interface AtomicTypeConverterProvider {
/**
* Retrieves the <code>AtomicTypeConverter</code> associated with a class.
- *
+ *
* @param clazz a class
* @return the corresponding <code>AtomicTypeConverter</code> or <tt>null</tt>
* if the class has no <code>AtomicTypeConverter</code> associated
@@ -37,7 +37,7 @@
/**
* Returns a map of all registered <code>AtomicTypeConverter<code>s.
- *
+ *
* @return <code>Map<Class, AtomicTypeConverter></code>
*/
Map getAtomicTypeConverters();
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/AtomicTypeConverterProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/AtomicTypeConverterProviderImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/AtomicTypeConverterProviderImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/AtomicTypeConverterProviderImpl.java Sun Jan 27 13:08:08 2008
@@ -27,39 +27,39 @@
/**
* Implementation of {@link AtomicTypeConverterProvider}.
- *
+ *
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
public class AtomicTypeConverterProviderImpl implements AtomicTypeConverterProvider {
protected Map m_converters;
protected Map m_converterInstances = new HashMap();
-
+
/**
* No-arg constructor.
*/
public AtomicTypeConverterProviderImpl() {
}
-
+
/**
* Full constructor.
- *
+ *
* @param converters a map of classes and their associated <code>AtomicTypeConverter</code>
* classes.
*/
public AtomicTypeConverterProviderImpl(Map converters) {
m_converters= converters;
}
-
+
/**
* Sets the associations of classes and their <code>AtomicTypeConverter</code>
* classes.
- *
+ *
* @param converters <code>Map<Class, Class></code>
*/
public void setAtomicTypeConvertors(Map converters) {
m_converters= converters;
}
-
+
/**
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverterProvider#getAtomicTypeConverter(java.lang.Class)
*/
@@ -72,7 +72,7 @@
if(null == converterClass) {
throw new IncorrectAtomicTypeException("No registered converter for a field based on the class :'" + clazz + "'");
}
-
+
try {
converter= (AtomicTypeConverter) converterClass.newInstance();
m_converterInstances.put(clazz, converter);
@@ -80,12 +80,12 @@
catch(Exception ex) {
throw new IncorrectAtomicTypeException(
"Cannot create converter instance from class '" + clazz + "'", ex);
-
+
}
-
+
return converter;
}
-
+
/**
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverterProvider#getAtomicTypeConverters()
*/
@@ -95,7 +95,7 @@
Class clazz= (Class) it.next();
result.put(clazz, getAtomicTypeConverter(clazz));
}
-
+
return result;
}
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/BinaryTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/BinaryTypeConverterImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/BinaryTypeConverterImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/BinaryTypeConverterImpl.java Sun Jan 27 13:08:08 2008
@@ -27,16 +27,16 @@
import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter;
/**
- *
+ *
* Binary Type Converter
- *
+ *
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
public class BinaryTypeConverterImpl implements AtomicTypeConverter
{
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
*/
public Value getValue(ValueFactory valueFactory, Object propValue)
@@ -49,7 +49,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
*/
public Object getObject(Value value)
@@ -66,7 +66,7 @@
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
*/
public String getXPathQueryValue(ValueFactory valueFactory,Object object)
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/BooleanTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/BooleanTypeConverterImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/BooleanTypeConverterImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/BooleanTypeConverterImpl.java Sun Jan 27 13:08:08 2008
@@ -25,14 +25,14 @@
/**
* Boolean Type Converter
- *
+ *
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
public class BooleanTypeConverterImpl implements AtomicTypeConverter
{
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
*/
public Value getValue(ValueFactory valueFactory, Object propValue)
@@ -47,7 +47,7 @@
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
*/
public Object getObject(Value value)
@@ -63,12 +63,12 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
*/
public String getXPathQueryValue(ValueFactory valueFactory,Object object)
{
- return ((Boolean) object).booleanValue() ? "true()" : "false()";
+ return ((Boolean) object).booleanValue() ? "true()" : "false()";
}
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/ByteArrayTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/ByteArrayTypeConverterImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/ByteArrayTypeConverterImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/ByteArrayTypeConverterImpl.java Sun Jan 27 13:08:08 2008
@@ -30,16 +30,16 @@
import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter;
/**
- *
+ *
* Byte Array Type Converter
- *
+ *
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
public class ByteArrayTypeConverterImpl implements AtomicTypeConverter
{
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
*/
public Value getValue(ValueFactory valueFactory, Object propValue)
@@ -54,7 +54,7 @@
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
*/
public Object getObject(Value value)
@@ -70,7 +70,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
*/
public String getXPathQueryValue(ValueFactory valueFactory, Object object)
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/CalendarTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/CalendarTypeConverterImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/CalendarTypeConverterImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/CalendarTypeConverterImpl.java Sun Jan 27 13:08:08 2008
@@ -28,14 +28,14 @@
/**
* Calendar Type Converter
- *
+ *
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
public class CalendarTypeConverterImpl implements AtomicTypeConverter
{
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
*/
public Value getValue(ValueFactory valueFactory, Object propValue)
@@ -44,12 +44,12 @@
{
return null;
}
-
+
return valueFactory.createValue(((Calendar) propValue).getTimeInMillis());
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
*/
public Object getObject(Value value)
@@ -67,7 +67,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
*/
public String getXPathQueryValue(ValueFactory valueFactory, Object object)
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/Date2LongTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/Date2LongTypeConverterImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/Date2LongTypeConverterImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/Date2LongTypeConverterImpl.java Sun Jan 27 13:08:08 2008
@@ -28,14 +28,14 @@
/**
* Util Date Converter
- *
+ *
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
public class Date2LongTypeConverterImpl implements AtomicTypeConverter
{
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
*/
public Value getValue(ValueFactory valueFactory, Object propValue)
@@ -49,7 +49,7 @@
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
*/
public Object getObject(Value value)
@@ -67,7 +67,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
*/
public String getXPathQueryValue(ValueFactory valueFactory, Object object)
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/DefaultAtomicTypeConverterProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/DefaultAtomicTypeConverterProvider.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/DefaultAtomicTypeConverterProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/DefaultAtomicTypeConverterProvider.java Sun Jan 27 13:08:08 2008
@@ -28,7 +28,7 @@
/**
* An <code>AtomicTypeConverterProvider</code> that registers by default the
* convertes available in OCM.
- *
+ *
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
public class DefaultAtomicTypeConverterProvider extends AtomicTypeConverterProviderImpl {
@@ -38,10 +38,10 @@
public DefaultAtomicTypeConverterProvider() {
m_converters= registerDefaultAtomicTypeConverters();
}
-
+
/**
* Full constructor.
- *
+ *
* @param converters a map of classes and their associated <code>AtomicTypeConverter</code>
* classes.
*/
@@ -49,17 +49,17 @@
this();
m_converters.putAll(converters);
}
-
+
/**
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.AtomicTypeConverterProviderImpl#setAtomicTypeConvertors(java.util.Map)
*/
public void setAtomicTypeConvertors(Map converters) {
m_converters.putAll(converters);
}
-
+
protected Map registerDefaultAtomicTypeConverters() {
Map converters= new HashMap();
-
+
converters.put(String.class, StringTypeConverterImpl.class);
converters.put(InputStream.class, BinaryTypeConverterImpl.class);
converters.put(long.class, LongTypeConverterImpl.class);
@@ -75,7 +75,7 @@
converters.put(Date.class, UtilDateTypeConverterImpl.class);
converters.put(byte[].class, ByteArrayTypeConverterImpl.class);
converters.put(Timestamp.class, TimestampTypeConverterImpl.class);
-
+
return converters;
}
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/DoubleTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/DoubleTypeConverterImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/DoubleTypeConverterImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/DoubleTypeConverterImpl.java Sun Jan 27 13:08:08 2008
@@ -25,15 +25,15 @@
import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter;
/**
- * Double Type Converter
- *
+ * Double Type Converter
+ *
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
public class DoubleTypeConverterImpl implements AtomicTypeConverter
{
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
*/
public Value getValue(ValueFactory valueFactory, Object propValue)
@@ -42,13 +42,13 @@
{
return null;
}
-
+
double value = ((Double) propValue).doubleValue();
return valueFactory.createValue(value);
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
*/
public Object getObject(Value value)
@@ -65,7 +65,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
*/
public String getXPathQueryValue(ValueFactory valueFactory, Object object)
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/IntTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/IntTypeConverterImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/IntTypeConverterImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/IntTypeConverterImpl.java Sun Jan 27 13:08:08 2008
@@ -26,14 +26,14 @@
/**
* Int Type Converter
- *
+ *
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
public class IntTypeConverterImpl implements AtomicTypeConverter
{
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
*/
public Value getValue(ValueFactory valueFactory, Object propValue)
@@ -47,7 +47,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
*/
public Object getObject(Value value)
@@ -64,7 +64,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
*/
public String getXPathQueryValue(ValueFactory valueFactory, Object object)
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/LongTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/LongTypeConverterImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/LongTypeConverterImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/LongTypeConverterImpl.java Sun Jan 27 13:08:08 2008
@@ -25,16 +25,16 @@
import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter;
/**
- *
+ *
* Long Type Converter
- *
+ *
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
* @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
*/
public class LongTypeConverterImpl implements AtomicTypeConverter
{
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
*/
public Value getValue(ValueFactory valueFactory, Object propValue)
@@ -49,7 +49,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
*/
public Object getObject(Value value)
@@ -66,7 +66,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
*/
public String getXPathQueryValue(ValueFactory valueFactory, Object object)
Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/NameTypeConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/NameTypeConverterImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/NameTypeConverterImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/manager/atomictypeconverter/impl/NameTypeConverterImpl.java Sun Jan 27 13:08:08 2008
@@ -26,29 +26,29 @@
import org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter;
/**
- *
- * Name Type Converter
- *
+ *
+ * Name Type Converter
+ *
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
- *
+ *
*/
public class NameTypeConverterImpl implements AtomicTypeConverter
{
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getValue(java.lang.Object)
*/
public Value getValue(ValueFactory valueFactory, Object propValue)
{
- try
+ try
{
- if (propValue == null)
+ if (propValue == null)
{
return null;
}
return valueFactory.createValue((String) propValue, PropertyType.NAME);
- }
- catch (RepositoryException e)
+ }
+ catch (RepositoryException e)
{
throw new IncorrectAtomicTypeException("Impossible to convert the value : " + propValue.toString(), e);
}
@@ -56,7 +56,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getObject(javax.jcr.Value)
*/
public Object getObject(Value value)
@@ -73,7 +73,7 @@
}
/**
- *
+ *
* @see org.apache.jackrabbit.ocm.manager.atomictypeconverter.AtomicTypeConverter#getStringValue(java.lang.Object)
*/
public String getXPathQueryValue(ValueFactory valueFactory, Object object)