incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From okiess...@apache.org
Subject svn commit: r349258 - in /incubator/graffito/trunk/jcr-mapping/src: dtd/graffito-jcr-mapping.dtd test-config/jcrmapping.xml test/org/apache/portals/graffito/jcr/mapper/DigesterMapperImplTest.java
Date Sun, 27 Nov 2005 16:58:42 GMT
Author: okiessler
Date: Sun Nov 27 08:58:36 2005
New Revision: 349258

URL: http://svn.apache.org/viewcvs?rev=349258&view=rev
Log:
Issue: GRFT-78

Modified:
    incubator/graffito/trunk/jcr-mapping/src/dtd/graffito-jcr-mapping.dtd
    incubator/graffito/trunk/jcr-mapping/src/test-config/jcrmapping.xml
    incubator/graffito/trunk/jcr-mapping/src/test/org/apache/portals/graffito/jcr/mapper/DigesterMapperImplTest.java

Modified: incubator/graffito/trunk/jcr-mapping/src/dtd/graffito-jcr-mapping.dtd
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jcr-mapping/src/dtd/graffito-jcr-mapping.dtd?rev=349258&r1=349257&r2=349258&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr-mapping/src/dtd/graffito-jcr-mapping.dtd (original)
+++ incubator/graffito/trunk/jcr-mapping/src/dtd/graffito-jcr-mapping.dtd Sun Nov 27 08:58:36
2005
@@ -51,7 +51,7 @@
 	jcrName CDATA #IMPLIED 
 	id (true | false) "false"
 	path (true | false) "false"
-        jcrType (STRING | DATE | LONG | DOUBLE | BOOLEAN) #IMPLIED
+        jcrType (String | Date | Long | Double | Boolean | Binary) #IMPLIED
         jcrAutoCreated (true | false) "false"
         jcrMandatory (true | false) "false"
         jcrOnParentVersion (COPY | VERSION | INITIALIZE | COMPUTE | IGNORE | ABORT) "IGNORE"

Modified: incubator/graffito/trunk/jcr-mapping/src/test-config/jcrmapping.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jcr-mapping/src/test-config/jcrmapping.xml?rev=349258&r1=349257&r2=349258&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr-mapping/src/test-config/jcrmapping.xml (original)
+++ incubator/graffito/trunk/jcr-mapping/src/test-config/jcrmapping.xml Sun Nov 27 08:58:36
2005
@@ -55,10 +55,10 @@
 	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.B"  jcrNodeType="nt:unstructured"
jcrSuperTypes="nt:base">
 		<!-- Field-descriptor is used to map simple attributes to jcr property -->
 
-		<field-descriptor fieldName="b1" jcrName="b1" jcrType="STRING" jcrAutoCreated="false"
jcrMandatory="false"
+		<field-descriptor fieldName="b1" jcrName="b1" jcrType="String" jcrAutoCreated="false"
jcrMandatory="false"
         jcrOnParentVersion="IGNORE" jcrProtected="false" jcrMultiple="false" />
 		
-        <field-descriptor fieldName="b2" jcrName="b2" jcrType="STRING" jcrAutoCreated="true"
jcrMandatory="true"
+        <field-descriptor fieldName="b2" jcrName="b2" jcrType="String" jcrAutoCreated="true"
jcrMandatory="true"
         jcrOnParentVersion="COPY" jcrProtected="true" jcrMultiple="true" />
 
 	</class-descriptor>

Modified: incubator/graffito/trunk/jcr-mapping/src/test/org/apache/portals/graffito/jcr/mapper/DigesterMapperImplTest.java
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jcr-mapping/src/test/org/apache/portals/graffito/jcr/mapper/DigesterMapperImplTest.java?rev=349258&r1=349257&r2=349258&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr-mapping/src/test/org/apache/portals/graffito/jcr/mapper/DigesterMapperImplTest.java
(original)
+++ incubator/graffito/trunk/jcr-mapping/src/test/org/apache/portals/graffito/jcr/mapper/DigesterMapperImplTest.java
Sun Nov 27 08:58:36 2005
@@ -123,7 +123,7 @@
             FieldDescriptor b1Field = classDescriptor.getFieldDescriptor("b1");
             assertNotNull("FieldDescriptor is null", b1Field);
             assertEquals(b1Field.getFieldName(), "b1");
-            assertEquals(b1Field.getJcrType(), "STRING");
+            assertEquals(b1Field.getJcrType(), "String");
             assertFalse(b1Field.isJcrAutoCreated());
             assertFalse(b1Field.isJcrMandatory());
             assertFalse(b1Field.isJcrProtected());
@@ -133,7 +133,7 @@
             FieldDescriptor b2Field = classDescriptor.getFieldDescriptor("b2");
             assertNotNull("FieldDescriptor is null", b2Field);
             assertEquals(b2Field.getFieldName(), "b2");
-            assertEquals(b2Field.getJcrType(), "STRING");
+            assertEquals(b2Field.getJcrType(), "String");
             assertTrue(b2Field.isJcrAutoCreated());
             assertTrue(b2Field.isJcrMandatory());
             assertTrue(b2Field.isJcrProtected());



Mime
View raw message