You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ar...@apache.org on 2012/06/08 17:36:13 UTC
svn commit: r1348119 - in /jackrabbit/commons/ocm/trunk: ./
src/test/config/jackrabbit/ src/test/java/org/apache/jackrabbit/ocm/
src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/
src/test/java/org/apache/jackrabbit/ocm/mapper/ src/test/java/...
Author: ard
Date: Fri Jun 8 15:36:12 2012
New Revision: 1348119
URL: http://svn.apache.org/viewvc?rev=1348119&view=rev
Log:
OCM-47 bump version numbers of some projects. Bump of junit to 4.6 resulted in failure on PropertyTest class. TestProperty is not allowed either, hence, called it OcmTestProperty.
Added:
jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/OcmTestProperty.java
- copied, changed from r1342541, jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/PropertyTest.java
Removed:
jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/PropertyTest.java
Modified:
jackrabbit/commons/ocm/trunk/pom.xml
jackrabbit/commons/ocm/trunk/src/test/config/jackrabbit/nodetypes_test1.xml
jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java
jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java
jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java
jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/mapper/AnnotationMapperImplTest.java
jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java
jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java
jackrabbit/commons/ocm/trunk/src/test/test-config/jcrmapping-jcrnodetypes.xml
jackrabbit/commons/ocm/trunk/src/test/test-config/nodetypes/custom_nodetypes.xml
Modified: jackrabbit/commons/ocm/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/pom.xml?rev=1348119&r1=1348118&r2=1348119&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/pom.xml (original)
+++ jackrabbit/commons/ocm/trunk/pom.xml Fri Jun 8 15:36:12 2012
@@ -42,6 +42,18 @@
also features like version support and object locking.
</description>
+ <properties>
+ <javax.jcr.version>2.0</javax.jcr.version>
+ <apache.jackrabbit.version>2.4.1</apache.jackrabbit.version>
+ <commons.digester.version>1.7</commons.digester.version>
+ <commons.lang.version>2.1</commons.lang.version>
+ <commons.collection.version>3.1</commons.collection.version>
+ <commons.beanutils.version>1.7.0</commons.beanutils.version>
+ <org.slf4j.version>1.6.4</org.slf4j.version>
+ <junit.version>4.7</junit.version>
+ <xerces.version>2.9.1</xerces.version>
+ </properties>
+
<!-- ====================================================================== -->
<!-- B U I L D -->
<!-- ====================================================================== -->
@@ -78,12 +90,12 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
+ <version>${javax.jcr.version}</version>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.7</version>
+ <version>${commons.digester.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -94,18 +106,18 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.1</version>
+ <version>${commons.collection.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.1</version>
+ <version>${commons.lang.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.4</version>
+ <version>${org.slf4j.version}</version>
</dependency>
<dependency>
@@ -113,10 +125,11 @@
<artifactId>cglib</artifactId>
<version>2.2</version>
</dependency>
+
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
+ <version>${commons.beanutils.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -128,33 +141,27 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <version>2.4.1</version>
- <optional>true</optional>
+ <version>${apache.jackrabbit.version}</version>
+ <!--<scope>test</scope>-->
</dependency>
<!-- Test -->
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- <version>1.0-M1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
+ <version>${org.slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
+ <version>${xerces.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: jackrabbit/commons/ocm/trunk/src/test/config/jackrabbit/nodetypes_test1.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/config/jackrabbit/nodetypes_test1.xml?rev=1348119&r1=1348118&r2=1348119&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/config/jackrabbit/nodetypes_test1.xml (original)
+++ jackrabbit/commons/ocm/trunk/src/test/config/jackrabbit/nodetypes_test1.xml Fri Jun 8 15:36:12 2012
@@ -29,7 +29,7 @@
<supertype>nt:base</supertype>
</supertypes>
- <propertyDefinition name="ocm:testProperty" requiredType="String" autoCreated="false" mandatory="false"
+ <propertyDefinition name="ocm:ocmtestproperty" requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="IGNORE" protected="false" multiple="false"/>
</nodeType>
</nodeTypes>
Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java?rev=1348119&r1=1348118&r2=1348119&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/AnnotationTestBase.java Fri Jun 8 15:36:12 2012
@@ -40,9 +40,9 @@ import org.apache.jackrabbit.ocm.testmod
import org.apache.jackrabbit.ocm.testmodel.Lockable;
import org.apache.jackrabbit.ocm.testmodel.MultiValue;
import org.apache.jackrabbit.ocm.testmodel.MultiValueWithObjectCollection;
+import org.apache.jackrabbit.ocm.testmodel.OcmTestProperty;
import org.apache.jackrabbit.ocm.testmodel.Page;
import org.apache.jackrabbit.ocm.testmodel.Paragraph;
-import org.apache.jackrabbit.ocm.testmodel.PropertyTest;
import org.apache.jackrabbit.ocm.testmodel.Residual;
import org.apache.jackrabbit.ocm.testmodel.Residual.ResidualNodes;
import org.apache.jackrabbit.ocm.testmodel.Residual.ResidualProperties;
@@ -151,7 +151,7 @@ public abstract class AnnotationTestBase
classes.add(File.class);
classes.add(org.apache.jackrabbit.ocm.testmodel.Folder.class);
classes.add(Resource.class);
- classes.add(PropertyTest.class);
+ classes.add(OcmTestProperty.class);
classes.add(Lockable.class);
Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java?rev=1348119&r1=1348118&r2=1348119&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java Fri Jun 8 15:36:12 2012
@@ -21,7 +21,7 @@ import junit.framework.TestSuite;
import org.apache.jackrabbit.ocm.AnnotationTestBase;
import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
-import org.apache.jackrabbit.ocm.testmodel.PropertyTest;
+import org.apache.jackrabbit.ocm.testmodel.OcmTestProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,14 +58,14 @@ public class AnnotationJcrPropertyTest e
// Insert without the mandatory field
//---------------------------------------------------------------------------------------------------------
- PropertyTest propertyTest = new PropertyTest();
- propertyTest.setPath("/test");
- propertyTest.setRequiredProp("requiredPropValue");
- propertyTest.setRequiredWithConstraintsProp("abc");
+ OcmTestProperty ocmTestProperty = new OcmTestProperty();
+ ocmTestProperty.setPath("/test");
+ ocmTestProperty.setRequiredProp("requiredPropValue");
+ ocmTestProperty.setRequiredWithConstraintsProp("abc");
try
{
- ocm.insert(propertyTest);
+ ocm.insert(ocmTestProperty);
fail("Incorrect insert operation - the mandatory fields have no value");
}
catch(Exception e)
@@ -77,29 +77,29 @@ public class AnnotationJcrPropertyTest e
//---------------------------------------------------------------------------------------------------------
// Insert with the mandatory fields
//---------------------------------------------------------------------------------------------------------
- propertyTest.setMandatoryProp("mandatoryValue");
- propertyTest.setMandatoryWithConstaintsProp("xx");
- ocm.insert(propertyTest);
+ ocmTestProperty.setMandatoryProp("mandatoryValue");
+ ocmTestProperty.setMandatoryWithConstaintsProp("xx");
+ ocm.insert(ocmTestProperty);
ocm.save();
//---------------------------------------------------------------------------------------------------------
// Retrieve
//---------------------------------------------------------------------------------------------------------
- propertyTest = (PropertyTest) ocm.getObject("/test");
- assertTrue("Invalid required property", propertyTest.getRequiredProp().equals("requiredPropValue"));
- assertTrue("Invalid required property with constraints", propertyTest.getRequiredWithConstraintsProp().equals("abc"));
- assertTrue("Invalid autocreated property", propertyTest.getAutoCreatedProp().equals("aaa"));
- assertTrue("Invalid autocreated property", propertyTest.getAutoCreatedWithConstraintsProp().equals("ccc"));
- assertTrue("Invalid protected property", propertyTest.getProtectedWithDefaultValueProp().equals("protectedValue"));
+ ocmTestProperty = (OcmTestProperty) ocm.getObject("/test");
+ assertTrue("Invalid required property", ocmTestProperty.getRequiredProp().equals("requiredPropValue"));
+ assertTrue("Invalid required property with constraints", ocmTestProperty.getRequiredWithConstraintsProp().equals("abc"));
+ assertTrue("Invalid autocreated property", ocmTestProperty.getAutoCreatedProp().equals("aaa"));
+ assertTrue("Invalid autocreated property", ocmTestProperty.getAutoCreatedWithConstraintsProp().equals("ccc"));
+ assertTrue("Invalid protected property", ocmTestProperty.getProtectedWithDefaultValueProp().equals("protectedValue"));
//---------------------------------------------------------------------------------------------------------
// update the property requiredWithConstraintsProp with bad value
//---------------------------------------------------------------------------------------------------------
- propertyTest = (PropertyTest) ocm.getObject("/test");
- propertyTest.setRequiredWithConstraintsProp("invalid value");
+ ocmTestProperty = (OcmTestProperty) ocm.getObject("/test");
+ ocmTestProperty.setRequiredWithConstraintsProp("invalid value");
try
{
- ocm.update(propertyTest);
+ ocm.update(ocmTestProperty);
ocm.save();
fail("Invalid value was accepted for requiredWithConstraintsProp");
}
@@ -111,11 +111,11 @@ public class AnnotationJcrPropertyTest e
//---------------------------------------------------------------------------------------------------------
// update the property AutoCreatedWithConstraintsProp with bad value
//---------------------------------------------------------------------------------------------------------
- propertyTest = (PropertyTest) ocm.getObject("/test");
- propertyTest.setAutoCreatedWithConstraintsProp("invalid value");
+ ocmTestProperty = (OcmTestProperty) ocm.getObject("/test");
+ ocmTestProperty.setAutoCreatedWithConstraintsProp("invalid value");
try
{
- ocm.update(propertyTest);
+ ocm.update(ocmTestProperty);
ocm.save();
fail("Invalid value was accepted for autoCreatedWithConstraintsProp ");
}
@@ -128,11 +128,11 @@ public class AnnotationJcrPropertyTest e
//---------------------------------------------------------------------------------------------------------
// update the property mandatoryWithConstaintsProp with bad value
//---------------------------------------------------------------------------------------------------------
- propertyTest = (PropertyTest) ocm.getObject("/test");
- propertyTest.setMandatoryWithConstaintsProp("yy");
+ ocmTestProperty = (OcmTestProperty) ocm.getObject("/test");
+ ocmTestProperty.setMandatoryWithConstaintsProp("yy");
try
{
- ocm.update(propertyTest);
+ ocm.update(ocmTestProperty);
ocm.save();
fail("Invalid value was accepted for mandatoryWithConstaintsProp");
}
Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java?rev=1348119&r1=1348118&r2=1348119&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java Fri Jun 8 15:36:12 2012
@@ -21,7 +21,7 @@ import junit.framework.TestSuite;
import org.apache.jackrabbit.ocm.DigesterTestBase;
import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
-import org.apache.jackrabbit.ocm.testmodel.PropertyTest;
+import org.apache.jackrabbit.ocm.testmodel.OcmTestProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,14 +57,14 @@ public class DigesterJcrPropertyTest ext
// Insert without the mandatory field
//---------------------------------------------------------------------------------------------------------
- PropertyTest propertyTest = new PropertyTest();
- propertyTest.setPath("/test");
- propertyTest.setRequiredProp("requiredPropValue");
- propertyTest.setRequiredWithConstraintsProp("abc");
+ OcmTestProperty ocmTestProperty = new OcmTestProperty();
+ ocmTestProperty.setPath("/test");
+ ocmTestProperty.setRequiredProp("requiredPropValue");
+ ocmTestProperty.setRequiredWithConstraintsProp("abc");
try
{
- ocm.insert(propertyTest);
+ ocm.insert(ocmTestProperty);
fail("Incorrect insert operation - the mandatory fields have no value");
}
catch(Exception e)
@@ -76,29 +76,29 @@ public class DigesterJcrPropertyTest ext
//---------------------------------------------------------------------------------------------------------
// Insert with the mandatory fields
//---------------------------------------------------------------------------------------------------------
- propertyTest.setMandatoryProp("mandatoryValue");
- propertyTest.setMandatoryWithConstaintsProp("xx");
- ocm.insert(propertyTest);
+ ocmTestProperty.setMandatoryProp("mandatoryValue");
+ ocmTestProperty.setMandatoryWithConstaintsProp("xx");
+ ocm.insert(ocmTestProperty);
ocm.save();
//---------------------------------------------------------------------------------------------------------
// Retrieve
//---------------------------------------------------------------------------------------------------------
- propertyTest = (PropertyTest) ocm.getObject("/test");
- assertTrue("Invalid required property", propertyTest.getRequiredProp().equals("requiredPropValue"));
- assertTrue("Invalid required property with constraints", propertyTest.getRequiredWithConstraintsProp().equals("abc"));
- assertTrue("Invalid autocreated property", propertyTest.getAutoCreatedProp().equals("aaa"));
- assertTrue("Invalid autocreated property", propertyTest.getAutoCreatedWithConstraintsProp().equals("ccc"));
- assertTrue("Invalid protected property", propertyTest.getProtectedWithDefaultValueProp().equals("protectedValue"));
+ ocmTestProperty = (OcmTestProperty) ocm.getObject("/test");
+ assertTrue("Invalid required property", ocmTestProperty.getRequiredProp().equals("requiredPropValue"));
+ assertTrue("Invalid required property with constraints", ocmTestProperty.getRequiredWithConstraintsProp().equals("abc"));
+ assertTrue("Invalid autocreated property", ocmTestProperty.getAutoCreatedProp().equals("aaa"));
+ assertTrue("Invalid autocreated property", ocmTestProperty.getAutoCreatedWithConstraintsProp().equals("ccc"));
+ assertTrue("Invalid protected property", ocmTestProperty.getProtectedWithDefaultValueProp().equals("protectedValue"));
//---------------------------------------------------------------------------------------------------------
// update the property requiredWithConstraintsProp with bad value
//---------------------------------------------------------------------------------------------------------
- propertyTest = (PropertyTest) ocm.getObject("/test");
- propertyTest.setRequiredWithConstraintsProp("invalid value");
+ ocmTestProperty = (OcmTestProperty) ocm.getObject("/test");
+ ocmTestProperty.setRequiredWithConstraintsProp("invalid value");
try
{
- ocm.update(propertyTest);
+ ocm.update(ocmTestProperty);
ocm.save();
fail("Invalid value was accepted for requiredWithConstraintsProp");
}
@@ -110,11 +110,11 @@ public class DigesterJcrPropertyTest ext
//---------------------------------------------------------------------------------------------------------
// update the property AutoCreatedWithConstraintsProp with bad value
//---------------------------------------------------------------------------------------------------------
- propertyTest = (PropertyTest) ocm.getObject("/test");
- propertyTest.setAutoCreatedWithConstraintsProp("invalid value");
+ ocmTestProperty = (OcmTestProperty) ocm.getObject("/test");
+ ocmTestProperty.setAutoCreatedWithConstraintsProp("invalid value");
try
{
- ocm.update(propertyTest);
+ ocm.update(ocmTestProperty);
ocm.save();
fail("Invalid value was accepted for autoCreatedWithConstraintsProp ");
}
@@ -127,11 +127,11 @@ public class DigesterJcrPropertyTest ext
//---------------------------------------------------------------------------------------------------------
// update the property mandatoryWithConstaintsProp with bad value
//---------------------------------------------------------------------------------------------------------
- propertyTest = (PropertyTest) ocm.getObject("/test");
- propertyTest.setMandatoryWithConstaintsProp("yy");
+ ocmTestProperty = (OcmTestProperty) ocm.getObject("/test");
+ ocmTestProperty.setMandatoryWithConstaintsProp("yy");
try
{
- ocm.update(propertyTest);
+ ocm.update(ocmTestProperty);
ocm.save();
fail("Invalid value was accepted for mandatoryWithConstaintsProp");
}
Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/mapper/AnnotationMapperImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/mapper/AnnotationMapperImplTest.java?rev=1348119&r1=1348118&r2=1348119&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/mapper/AnnotationMapperImplTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/mapper/AnnotationMapperImplTest.java Fri Jun 8 15:36:12 2012
@@ -33,7 +33,7 @@ import org.apache.jackrabbit.ocm.mapper.
import org.apache.jackrabbit.ocm.testmodel.A;
import org.apache.jackrabbit.ocm.testmodel.B;
import org.apache.jackrabbit.ocm.testmodel.C;
-import org.apache.jackrabbit.ocm.testmodel.PropertyTest;
+import org.apache.jackrabbit.ocm.testmodel.OcmTestProperty;
import org.apache.jackrabbit.ocm.testmodel.SimpleAnnotedAbstractClass;
import org.apache.jackrabbit.ocm.testmodel.SimpleAnnotedClass;
import org.apache.jackrabbit.ocm.testmodel.SimpleInterface;
@@ -210,7 +210,7 @@ public class AnnotationMapperImplTest ex
assertFalse(collectionDescriptor.isJcrSameNameSiblings());
assertEquals(collectionDescriptor.getJcrOnParentVersion(), "IGNORE");
- classDescriptor = mapper.getClassDescriptorByClass(PropertyTest.class);
+ classDescriptor = mapper.getClassDescriptorByClass(OcmTestProperty.class);
assertNotNull(classDescriptor);
FieldDescriptor fieldDescriptor = classDescriptor.getFieldDescriptor("requiredWithConstraintsProp");
assertNotNull(fieldDescriptor.getJcrValueConstraints());
@@ -550,7 +550,7 @@ public class AnnotationMapperImplTest ex
classes.add( org.apache.jackrabbit.ocm.testmodel.A.class);
classes.add(org.apache.jackrabbit.ocm.testmodel.B.class);
classes.add( org.apache.jackrabbit.ocm.testmodel.C.class);
- classes.add(org.apache.jackrabbit.ocm.testmodel.PropertyTest.class);
+ classes.add(OcmTestProperty.class);
classes.add(org.apache.jackrabbit.ocm.testmodel.inheritance.Ancestor.class);
classes.add(org.apache.jackrabbit.ocm.testmodel.inheritance.AnotherDescendant.class);
classes.add( org.apache.jackrabbit.ocm.testmodel.inheritance.Descendant.class);
Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java?rev=1348119&r1=1348118&r2=1348119&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java Fri Jun 8 15:36:12 2012
@@ -31,7 +31,7 @@ import org.apache.jackrabbit.ocm.mapper.
import org.apache.jackrabbit.ocm.testmodel.A;
import org.apache.jackrabbit.ocm.testmodel.B;
import org.apache.jackrabbit.ocm.testmodel.C;
-import org.apache.jackrabbit.ocm.testmodel.PropertyTest;
+import org.apache.jackrabbit.ocm.testmodel.OcmTestProperty;
import org.apache.jackrabbit.ocm.testmodel.inheritance.Ancestor;
import org.apache.jackrabbit.ocm.testmodel.inheritance.AnotherDescendant;
import org.apache.jackrabbit.ocm.testmodel.inheritance.Descendant;
@@ -210,7 +210,7 @@ public class DigesterMapperImplTest exte
assertFalse(collectionDescriptor.isJcrSameNameSiblings());
assertEquals(collectionDescriptor.getJcrOnParentVersion(), "IGNORE");
- classDescriptor = mapper.getClassDescriptorByClass(PropertyTest.class);
+ classDescriptor = mapper.getClassDescriptorByClass(OcmTestProperty.class);
assertNotNull(classDescriptor);
FieldDescriptor fieldDescriptor = classDescriptor.getFieldDescriptor("requiredWithConstraintsProp");
assertNotNull(fieldDescriptor.getJcrValueConstraints());
Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java?rev=1348119&r1=1348118&r2=1348119&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImplTest.java Fri Jun 8 15:36:12 2012
@@ -97,7 +97,7 @@ public class NodeTypeManagerImplTest ext
assertEquals(test1.getPrimaryItemName(), "test1");
assertEquals(test1.getSupertypes().length, 1);
assertEquals(test1.getSupertypes()[0].getName(), "nt:base");
- assertTrue(containsPropertyDefintion(test1.getPropertyDefinitions(), "ocm:testProperty"));
+ assertTrue(containsPropertyDefintion(test1.getPropertyDefinitions(), "ocm:ocmtestproperty"));
}
public void testCreateSingleNodeType() throws Exception
Copied: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/OcmTestProperty.java (from r1342541, jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/PropertyTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/OcmTestProperty.java?p2=jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/OcmTestProperty.java&p1=jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/PropertyTest.java&r1=1342541&r2=1348119&rev=1348119&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/PropertyTest.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/testmodel/OcmTestProperty.java Fri Jun 8 15:36:12 2012
@@ -25,8 +25,8 @@ import org.apache.jackrabbit.ocm.mapper.
* @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
*
*/
-@Node(jcrType="ocm:propertytest")
-public class PropertyTest
+@Node(jcrType="ocm:ocmtestproperty")
+public class OcmTestProperty
{
@Field(path=true) private String path;
@Field(jcrName="ocm:requiredProp") private String requiredProp;
Modified: jackrabbit/commons/ocm/trunk/src/test/test-config/jcrmapping-jcrnodetypes.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/test-config/jcrmapping-jcrnodetypes.xml?rev=1348119&r1=1348118&r2=1348119&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/test-config/jcrmapping-jcrnodetypes.xml (original)
+++ jackrabbit/commons/ocm/trunk/src/test/test-config/jcrmapping-jcrnodetypes.xml Fri Jun 8 15:36:12 2012
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<jackrabbit-ocm>
@@ -45,7 +45,7 @@
<field-descriptor fieldName="lastModified" jcrName="jcr:lastModified"/>
</class-descriptor>
- <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.PropertyTest" jcrType="ocm:propertytest" >
+ <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.OcmTestProperty" jcrType="ocm:ocmtestproperty" >
<field-descriptor fieldName="path" path="true" />
<field-descriptor fieldName="requiredProp" jcrName="ocm:requiredProp" />
<field-descriptor fieldName="requiredWithConstraintsProp" jcrName="ocm:requiredWithConstraintsProp" jcrValueConstraints="abc,def,ghi" />
Modified: jackrabbit/commons/ocm/trunk/src/test/test-config/nodetypes/custom_nodetypes.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/test-config/nodetypes/custom_nodetypes.xml?rev=1348119&r1=1348118&r2=1348119&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/test-config/nodetypes/custom_nodetypes.xml (original)
+++ jackrabbit/commons/ocm/trunk/src/test/test-config/nodetypes/custom_nodetypes.xml Fri Jun 8 15:36:12 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,7 +14,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
+-->
<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
xmlns:sv="http://www.jcp.org/jcr/sv/1.0"
@@ -37,23 +37,23 @@
<propertyDefinition name="ocm:a1" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
<propertyDefinition name="ocm:a2" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
</nodeType>
-
- <nodeType name="ocm:C" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>mix:versionable</supertype>
- <supertype>nt:base</supertype>
- </supertypes>
- <propertyDefinition name="ocm:id" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
- <propertyDefinition name="ocm:name" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
- </nodeType>
-
- <nodeType name="ocm:paragraph" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>mix:versionable</supertype>
- <supertype>nt:base</supertype>
- </supertypes>
- <propertyDefinition name="ocm:text" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
- </nodeType>
+
+ <nodeType name="ocm:C" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>mix:versionable</supertype>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <propertyDefinition name="ocm:id" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+ <propertyDefinition name="ocm:name" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+ </nodeType>
+
+ <nodeType name="ocm:paragraph" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>mix:versionable</supertype>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <propertyDefinition name="ocm:text" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+ </nodeType>
<nodeType name="ocm:page" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
<supertypes>
@@ -61,10 +61,10 @@
<supertype>nt:base</supertype>
</supertypes>
<propertyDefinition name="ocm:title" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
- <childNodeDefinition name="*" defaultPrimaryType="ocm:paragraph" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="true">
+ <childNodeDefinition name="*" defaultPrimaryType="ocm:paragraph" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="true">
<requiredPrimaryTypes>
<requiredPrimaryType>ocm:paragraph</requiredPrimaryType>
- </requiredPrimaryTypes>
+ </requiredPrimaryTypes>
</childNodeDefinition>
</nodeType>
@@ -80,14 +80,14 @@
</requiredPrimaryTypes>
</childNodeDefinition>
</nodeType>
-
- <nodeType name="ocm:element" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>mix:versionable</supertype>
- <supertype>nt:base</supertype>
- </supertypes>
- <propertyDefinition name="ocm:id" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
- <propertyDefinition name="ocm:text" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+
+ <nodeType name="ocm:element" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>mix:versionable</supertype>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <propertyDefinition name="ocm:id" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+ <propertyDefinition name="ocm:text" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
</nodeType>
<nodeType name="ocm:cmsobjectimpl" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
@@ -157,7 +157,7 @@
<supertypes>
<supertype>nt:base</supertype>
</supertypes>
- </nodeType>
+ </nodeType>
<nodeType name="ocm:folder" isMixin="true">
<supertypes>
@@ -178,7 +178,7 @@
</nodeType>
- <nodeType name="ocm:propertytest" >
+ <nodeType name="ocm:ocmtestproperty" >
<supertypes>
<supertype>nt:base</supertype>
</supertypes>
@@ -264,5 +264,5 @@
</propertyDefinition>
</nodeType>
<!-- END Node Types for testing default simple values -->
-</nodeTypes>
-
+</nodeTypes>
+