jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r563631 - in /jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping: src/dtd/ src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/ src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ src/main/jav...
Date Tue, 07 Aug 2007 19:26:03 GMT
Author: clombart
Date: Tue Aug  7 12:25:48 2007
New Revision: 563631

URL: http://svn.apache.org/viewvc?view=rev&rev=563631
Log:
fix for issue JCR-1054 (2 different attributes are used in BeanDescriptor and CollectionDescriptor to store the jcr type (jcrType and jcrNodeType).

Removed:
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/graffito-jcr-mapping.dtd.txt
Modified:
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/dtd/jackrabbit-ocm.dtd
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/BeanDescriptor.java
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ChildNodeDefDescriptor.java
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/CollectionDescriptor.java
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-proxy.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/introduction-strategies.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/atomic-strategy.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/bean-strategy.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/collection-strategy.xml
    jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/introduction-strategies.xml

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/dtd/jackrabbit-ocm.dtd
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/dtd/jackrabbit-ocm.dtd?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/dtd/jackrabbit-ocm.dtd (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/dtd/jackrabbit-ocm.dtd Tue Aug  7 12:25:48 2007
@@ -24,7 +24,7 @@
 <!--
     Class descriptor - Each class descriptor describes the mapping strategy used for one a java class
     * className : the class name
-    * jcrNodeType : the primary jcr node type, it can be nt:unstructured
+    * jcrType : the primary jcr node type, optional, default is nt:unstructured
     * jcrSuperTypes : the jcr super types, optional
     * jcrMixinTypes: the jcr mixin types (comma separated list) (optional)
     * extends: name of super class (optional)
@@ -35,7 +35,7 @@
 
 <!ATTLIST class-descriptor
 	className CDATA #REQUIRED
-	jcrNodeType CDATA #IMPLIED
+	jcrType CDATA #IMPLIED
     jcrSuperTypes CDATA #IMPLIED
     jcrMixinTypes CDATA #IMPLIED
     extend CDATA #IMPLIED
@@ -99,7 +99,7 @@
     * autoUpdate : If false, the bean associated to this descriptor is not updated when the main ojbect is updated
     * autoInsert : If false, the bean associated to this descriptor is not inserted  when the main ojbect is inserted    
     * converter: fully qualified name of the converter class to be used (default is ObjectConverterImpl)
-    * jcrNodeType: defines the child node type, optional
+    * jcrType: defines the node type, optional, nt:unstructured by default
     * jcrAutoCreated (boolean) default is "false"
     * jcrMandatory (boolean) default is "false"
     * jcrOnParentVersion default is "COPY"
@@ -115,7 +115,7 @@
 	autoUpdate (true|false) "true"
 	autoInsert (true|false) "true"	
 	converter CDATA #IMPLIED
-	jcrNodeType CDATA #IMPLIED
+	jcrType CDATA #IMPLIED
     jcrAutoCreated (true | false) "false"   
     jcrMandatory (true | false) "false"
     jcrOnParentVersion (COPY | VERSION | INITIALIZE | COMPUTE | IGNORE | ABORT) "COPY"
@@ -137,7 +137,7 @@
                             The declared class must implement ManageableCollection to let the ocm engine handles this type of collection.
     * collectionConverter : The class name converter. This is the collection mapping strategy to used. 
                             If this attribute is not specify, the default collection mapping strategy is used (DefaultCollectionConverterImpl)                            
-    * jcrNodeType: defines the child node type, optional
+    * jcrType: defines the node type used for the collection elements, optional
     * jcrAutoCreated (boolean) default is "false"
     * jcrMandatory (boolean) default is "false"
     * jcrOnParentVersion default is "COPY"
@@ -156,7 +156,7 @@
 	elementClassName CDATA #IMPLIED
 	collectionClassName CDATA #IMPLIED
 	collectionConverter CDATA #IMPLIED
-	jcrNodeType CDATA #IMPLIED
+	jcrType CDATA #IMPLIED
     jcrAutoCreated (true | false) "false"   
     jcrMandatory (true | false) "false"
     jcrOnParentVersion (COPY | VERSION | INITIALIZE | COMPUTE | IGNORE | ABORT) "COPY"

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/collectionconverter/impl/NTCollectionConverterImpl.java Tue Aug  7 12:25:48 2007
@@ -138,7 +138,7 @@
         if (collection == null || !elementClassDescriptor.hasIdField()) {
             this.deleteCollectionItems(session,
                                        parentNode,
-                                       elementClassDescriptor.getJcrNodeType());
+                                       elementClassDescriptor.getJcrType());
         }
 
         if (collection == null) {
@@ -176,7 +176,7 @@
         // Delete JCR nodes that are not present in the collection
         if (elementClassDescriptor.hasIdField()) {
             Iterator nodeIterator = this.getCollectionNodes(session, parentNode,
-                    elementClassDescriptor.getJcrNodeType()).iterator();
+                    elementClassDescriptor.getJcrType()).iterator();
 
             while (nodeIterator.hasNext()) {
                 Node child = (Node) nodeIterator.next();
@@ -198,7 +198,7 @@
 	    ClassDescriptor elementClassDescriptor = mapper.getClassDescriptorByClass( ReflectionUtils.forName(collectionDescriptor.getElementClassName())); 
         ManageableCollection collection = ManageableCollectionUtil.getManageableCollection(collectionFieldClass);
         //Class elementClass = ReflectionUtils.forName(collectionDescriptor.getElementClassName());
-        Collection nodes = this.getCollectionNodes(session, parentNode, elementClassDescriptor.getJcrNodeType());
+        Collection nodes = this.getCollectionNodes(session, parentNode, elementClassDescriptor.getJcrType());
         
         if (nodes == null)
         {

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/manager/objectconverter/impl/ObjectConverterImpl.java Tue Aug  7 12:25:48 2007
@@ -160,19 +160,19 @@
 	public void insert(Session session, Node parentNode, String nodeName, Object object) {
 		ClassDescriptor classDescriptor = mapper.getClassDescriptorByClass(object.getClass());
 
-		String jcrNodeType = classDescriptor.getJcrNodeType();
-		if ((jcrNodeType == null) || jcrNodeType.equals("")) {
-			jcrNodeType = ManagerConstant.NT_UNSTRUCTURED;
+		String jcrType = classDescriptor.getJcrType();
+		if ((jcrType == null) || jcrType.equals("")) {
+			jcrType = ManagerConstant.NT_UNSTRUCTURED;
 		}
 
 		Node objectNode = null;
 		try {
-			objectNode = parentNode.addNode(nodeName, jcrNodeType);
+			objectNode = parentNode.addNode(nodeName, jcrType);
 
 		} catch (NoSuchNodeTypeException nsnte) {
-			throw new JcrMappingException("Unknown node type " + jcrNodeType + " for mapped class " + object.getClass(), nsnte);
+			throw new JcrMappingException("Unknown node type " + jcrType + " for mapped class " + object.getClass(), nsnte);
 		} catch (RepositoryException re) {
-			throw new ObjectContentManagerException("Cannot create new node of type " + jcrNodeType + " from mapped class "
+			throw new ObjectContentManagerException("Cannot create new node of type " + jcrType + " from mapped class "
 					+ object.getClass(), re);
 		}
 
@@ -195,7 +195,7 @@
 					String interfaceName = (String) interfacesIterator.next();
 					ClassDescriptor interfaceDescriptor = mapper
 							.getClassDescriptorByClass(ReflectionUtils.forName(interfaceName));
-					objectNode.addMixin(interfaceDescriptor.getJcrNodeType().trim());
+					objectNode.addMixin(interfaceDescriptor.getJcrType().trim());
 				}
 			}
 
@@ -211,7 +211,7 @@
 		} catch (NoSuchNodeTypeException nsnte) {
 			throw new JcrMappingException("Unknown mixin type " + mixinTypeName + " for mapped class " + object.getClass(), nsnte);
 		} catch (RepositoryException re) {
-			throw new ObjectContentManagerException("Cannot create new node of type " + jcrNodeType + " from mapped class "
+			throw new ObjectContentManagerException("Cannot create new node of type " + jcrType + " from mapped class "
 					+ object.getClass(), re);
 		}
 
@@ -358,7 +358,7 @@
 			} else {
 				if (classDescriptor.usesNodeTypePerConcreteClassStrategy()) {
 					String nodeType = node.getPrimaryNodeType().getName();
-					if (!nodeType.equals(classDescriptor.getJcrNodeType())) {
+					if (!nodeType.equals(classDescriptor.getJcrType())) {
 						classDescriptor = classDescriptor.getDescendantClassDescriptor(nodeType);
 					}
 				}
@@ -462,7 +462,7 @@
 					session.getWorkspace().getNodeTypeManager().getNodeType(jcrTypeName);
 				}
 			} else {
-				jcrTypeName = classDescriptor.getJcrNodeType();
+				jcrTypeName = classDescriptor.getJcrType();
 				if (jcrTypeName != null && !jcrTypeName.equals("")) {
 					session.getWorkspace().getNodeTypeManager().getNodeType(jcrTypeName);
 				}
@@ -512,7 +512,7 @@
 			if (!compatible) {
 				throw new ObjectContentManagerException("Cannot map object of type '" + classDescriptor.getClassName() + "'. Node type '"
 						+ node.getPrimaryNodeType().getName() + "' does not match descriptor node type '"
-						+ classDescriptor.getJcrNodeType() + "'");
+						+ classDescriptor.getJcrType() + "'");
 			}
 		} catch (RepositoryException re) {
 			throw new org.apache.jackrabbit.ocm.exception.RepositoryException(re);
@@ -532,17 +532,17 @@
 	private boolean checkCompatibleNodeTypes(NodeType nodeType, ClassDescriptor descriptor) {
 
 		//return true if node type is not used
-		if (descriptor.getJcrNodeType() == null || descriptor.getJcrNodeType().equals("")) {
+		if (descriptor.getJcrType() == null || descriptor.getJcrType().equals("")) {
 			return true;
 		}
 
-		if (nodeType.getName().equals(descriptor.getJcrNodeType())) {
+		if (nodeType.getName().equals(descriptor.getJcrType())) {
 			return true;
 		}
 
 		NodeType[] superTypes = nodeType.getSupertypes();
 		for (int i = 0; i < superTypes.length; i++) {
-			if (superTypes[i].getName().equals(descriptor.getJcrNodeType())) {
+			if (superTypes[i].getName().equals(descriptor.getJcrType())) {
 				return true;
 			}
 		}

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/BeanDescriptor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/BeanDescriptor.java?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/BeanDescriptor.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/BeanDescriptor.java Tue Aug  7 12:25:48 2007
@@ -34,8 +34,7 @@
     private boolean autoUpdate = true;
     private boolean autoInsert = true;    
     private String converter;
-    private BeanConverter beanConverter;
-    private String jcrNodeType;
+    private BeanConverter beanConverter;    
     private String jcrType;
     private boolean jcrAutoCreated;
     private boolean jcrMandatory;
@@ -132,22 +131,6 @@
         this.converter = converterClass;
     }
 
-    
-    /** Getter for property jcrNodeType.
-     *
-     * @return jcrNodeType
-     */
-    public String getJcrNodeType() {
-        return jcrNodeType;
-    }
-
-    /** Setter for property jcrNodeType.
-     *
-     * @param value jcrNodeType
-     */
-    public void setJcrNodeType(String value) {
-        this.jcrNodeType = value;
-    }
 
     /**
      * Getter for property jcrType.

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ChildNodeDefDescriptor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ChildNodeDefDescriptor.java?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ChildNodeDefDescriptor.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ChildNodeDefDescriptor.java Tue Aug  7 12:25:48 2007
@@ -32,7 +32,7 @@
     /**
      * @return Returns the child node type name.
      */
-    String getJcrNodeType();
+    String getJcrType();
 
     /**
      * @return Whether the child node is auto created.

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java Tue Aug  7 12:25:48 2007
@@ -48,7 +48,7 @@
     private Collection descendantClassDescriptors = new ArrayList();
 
     private String className;
-    private String jcrNodeType;
+    private String jcrType;
     private String jcrSuperTypes;
     private String[] jcrMixinTypes = new String[0];
     private FieldDescriptor idFieldDescriptor;
@@ -123,19 +123,19 @@
     }
 
     /**
-     * @return Returns the jcrNodeType.
+     * @return Returns the jcrType.
      */
-    public String getJcrNodeType() {
-        return jcrNodeType;
+    public String getJcrType() {
+        return jcrType;
     }
 
     /**
-     * @param jcrNodeType The jcrNodeType to set.
+     * @param jcrType The jcrType to set.
      */
-    public void setJcrNodeType(String jcrNodeType) {
-    	if (jcrNodeType != null && ! jcrNodeType.equals(""))
+    public void setJcrType(String jcrType) {
+    	if (jcrType != null && ! jcrType.equals(""))
     	{
-    	   this.jcrNodeType = jcrNodeType;
+    	   this.jcrType = jcrType;
     	}
     }
 
@@ -466,7 +466,7 @@
         while (iterator.hasNext()) {
             ClassDescriptor descendantClassDescriptor = (ClassDescriptor) iterator.next();
   
-            if (descendantClassDescriptor.getJcrNodeType().equals(nodeType)) {
+            if (descendantClassDescriptor.getJcrType().equals(nodeType)) {
                 return descendantClassDescriptor;
             }
   

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/CollectionDescriptor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/CollectionDescriptor.java?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/CollectionDescriptor.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/CollectionDescriptor.java Tue Aug  7 12:25:48 2007
@@ -35,8 +35,7 @@
      private boolean proxy;
      private boolean autoRetrieve = true;
      private boolean autoUpdate = true;
-     private boolean autoInsert = true;     
-     private String jcrNodeType;
+     private boolean autoInsert = true;          
      private String jcrType;
      private boolean jcrAutoCreated;
      private boolean jcrMandatory;
@@ -184,23 +183,6 @@
         this.classDescriptor = classDescriptor;
     }
     
-    /** Getter for property jcrNodeType.
-     * 
-     * @return jcrNodeType
-     */
-    public String getJcrNodeType()
-    {
-        return jcrNodeType;
-    }
-
-    /** Setter for property jcrNodeType.
-     * 
-     * @param value jcrNodeType
-     */
-    public void setJcrNodeType(String value)
-    {
-        this.jcrNodeType = value;
-    }
 
     /**
      * Getter for property jcrType.

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/mapper/model/MappingDescriptor.java Tue Aug  7 12:25:48 2007
@@ -65,10 +65,10 @@
 
         classDescriptorsByClassName.put(classDescriptor.getClassName(), classDescriptor);
         
-        if (null != classDescriptor.getJcrNodeType() && !  "".equals(classDescriptor.getJcrNodeType()) && 
-        		 ! ManagerConstant.NT_UNSTRUCTURED.equals(classDescriptor.getJcrNodeType()))
+        if (null != classDescriptor.getJcrType() && !  "".equals(classDescriptor.getJcrType()) && 
+        		 ! ManagerConstant.NT_UNSTRUCTURED.equals(classDescriptor.getJcrType()))
         	 {
-             classDescriptorsByNodeType.put(classDescriptor.getJcrNodeType(), classDescriptor);	
+             classDescriptorsByNodeType.put(classDescriptor.getJcrType(), classDescriptor);	
         	 }
         classDescriptor.setMappingDescriptor(this);
     }

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/main/java/org/apache/jackrabbit/ocm/query/impl/QueryManagerImpl.java Tue Aug  7 12:25:48 2007
@@ -115,7 +115,7 @@
     private String getNodeType(Filter filter) {
         ClassDescriptor classDescriptor = mapper.getClassDescriptorByClass(filter.getFilterClass());
 
-        String jcrNodeType = classDescriptor.getJcrNodeType();
+        String jcrNodeType = classDescriptor.getJcrType();
         if (jcrNodeType == null || jcrNodeType.equals(""))
         	{
            return ManagerConstant.NT_UNSTRUCTURED;	

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/java/org/apache/jackrabbit/ocm/mapper/DigesterMapperImplTest.java Tue Aug  7 12:25:48 2007
@@ -194,7 +194,7 @@
 					.getBeanDescriptor("b");
 			assertNotNull(beanDescriptor);
 			assertEquals(beanDescriptor.getFieldName(), "b");
-			assertEquals(beanDescriptor.getJcrNodeType(), "nt:unstructured");
+			assertEquals(beanDescriptor.getJcrType(), "nt:unstructured");
 			assertFalse(beanDescriptor.isJcrAutoCreated());
 			assertFalse(beanDescriptor.isJcrMandatory());
 			assertFalse(beanDescriptor.isJcrProtected());
@@ -204,7 +204,7 @@
 			CollectionDescriptor collectionDescriptor = classDescriptor2
 					.getCollectionDescriptor("collection");
 			assertNotNull(collectionDescriptor);
-			assertEquals(collectionDescriptor.getJcrNodeType(), "ocm:C");
+			assertEquals(collectionDescriptor.getJcrType(), "ocm:C");
 			assertFalse(collectionDescriptor.isJcrAutoCreated());
 			assertFalse(collectionDescriptor.isJcrMandatory());
 			assertFalse(collectionDescriptor.isJcrProtected());

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-atomic.xml Tue Aug  7 12:25:48 2007
@@ -3,7 +3,7 @@
 <!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
 <jackrabbit-ocm>
     <class-descriptor
-		className="org.apache.jackrabbit.ocm.testmodel.Atomic" jcrNodeType="nt:unstructured" discriminator="true" >
+		className="org.apache.jackrabbit.ocm.testmodel.Atomic" jcrType="nt:unstructured" discriminator="true" >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="string" jcrName="string" />
 		<field-descriptor fieldName="booleanObject" jcrName="booleanObject" />
@@ -24,7 +24,7 @@
 	</class-descriptor>
 
     <class-descriptor
-		className="org.apache.jackrabbit.ocm.testmodel.MultiValue" jcrNodeType="nt:unstructured" discriminator="true" >
+		className="org.apache.jackrabbit.ocm.testmodel.MultiValue" jcrType="nt:unstructured" discriminator="true" >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="name" jcrName="name" />
 		<collection-descriptor fieldName="multiValues" jcrName="multiValue" proxy="false" 

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-auto.xml Tue Aug  7 12:25:48 2007
@@ -6,22 +6,22 @@
      <!-- INTERFACE MAPPING   -->	
      
 	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject"  interface="true" discriminator="false"
-	                                   jcrNodeType="ocm:cmsobject" />
+	                                   jcrType="ocm:cmsobject" />
 
 	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.Folder"  interface="true" discriminator="false" 
-	                                   extend="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject"  jcrNodeType="ocm:folder" />
+	                                   extend="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject"  jcrType="ocm:folder" />
 
 	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.Content"  interface="true" discriminator="false" 
-	                                   extend="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject"  jcrNodeType="ocm:content"  />
+	                                   extend="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject"  jcrType="ocm:content"  />
 	                                   
 	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.Document"  interface="true" discriminator="false" 
-	                                   extend="org.apache.jackrabbit.ocm.testmodel.interfaces.Content"  jcrNodeType="ocm:document"  />
+	                                   extend="org.apache.jackrabbit.ocm.testmodel.interfaces.Content"  jcrType="ocm:document"  />
 	                                   
 	                                   
 	
      <!-- CLASS MAPPING. The FolderImpl has  the autoRetrieve, autoUpdate & autoInsert parameters set to false  -->	
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" jcrNodeType="ocm:cmsobjectimpl"  
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" jcrType="ocm:cmsobjectimpl"  
 	                                   discriminator="false" abstract="true" >
 		<implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject" />	  	                                    
 		
@@ -32,7 +32,7 @@
 
 	</class-descriptor>     
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.FolderImpl" jcrNodeType="ocm:folderimpl" 
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.FolderImpl" jcrType="ocm:folderimpl" 
 	                                    extend="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false"  >
 		<implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Folder" />	  		                                    
 		<collection-descriptor fieldName="children" proxy="true" autoUpdate="false" autoInsert="false" autoRetrieve="false" 
@@ -40,12 +40,12 @@
 		                       collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.NTCollectionConverterImpl" />
 	</class-descriptor >	
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.ContentImpl" jcrNodeType="ocm:contentimpl" abstract="true"
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.ContentImpl" jcrType="ocm:contentimpl" abstract="true"
 	                                   extend="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false"  >
        		<implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Content" />	  		                                    
 	</class-descriptor>	
 		
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentImpl" jcrNodeType="ocm:documentimpl" 
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentImpl" jcrType="ocm:documentimpl" 
 	                                    extend="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.ContentImpl" discriminator="false" >
 		<implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Document" />	  		                                    	                                    
 		<field-descriptor fieldName="contentType" jcrName="ocm:contenttype" />  
@@ -53,7 +53,7 @@
 		<bean-descriptor fieldName="documentStream" jcrName="ocm:documentstream"  autoUpdate="false" autoInsert="false" autoRetrieve="false"  />			
 	</class-descriptor >	
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentStream" jcrNodeType="ocm:documentstream"  discriminator="false"  >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentStream" jcrType="ocm:documentstream"  discriminator="false"  >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="encoding" jcrName="ocm:encoding" />
 		<field-descriptor fieldName="content" jcrName="ocm:binarycontent" />

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-avoidrecursiveloop.xml Tue Aug  7 12:25:48 2007
@@ -4,7 +4,7 @@
 <jackrabbit-ocm>
 
 	<class-descriptor
-		className="org.apache.jackrabbit.ocm.testmodel.crossreference.A" jcrNodeType="nt:unstructured" jcrMixinTypes="mix:referenceable">		
+		className="org.apache.jackrabbit.ocm.testmodel.crossreference.A" jcrType="nt:unstructured" jcrMixinTypes="mix:referenceable">		
 		<field-descriptor fieldName="path" path="true"/>
 		<field-descriptor fieldName="uuid" uuid="true"/>
 		<field-descriptor fieldName="a1" jcrName="a1" />
@@ -14,7 +14,7 @@
 		                       elementClassName="org.apache.jackrabbit.ocm.testmodel.crossreference.B" />                               
 	</class-descriptor>
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.crossreference.B"  jcrNodeType="nt:unstructured" >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.crossreference.B"  jcrType="nt:unstructured" >
 		<field-descriptor fieldName="b1" jcrName="b1"  />		
         <field-descriptor fieldName="b2" jcrName="b2"  />
         <bean-descriptor fieldName="a" jcrName="a" proxy="false" converter="org.apache.jackrabbit.ocm.manager.beanconverter.impl.ReferenceBeanConverterImpl" />

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-beandescriptor.xml Tue Aug  7 12:25:48 2007
@@ -2,7 +2,7 @@
 
 <!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
 <jackrabbit-ocm>
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.D"  jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.D"  jcrType="nt:unstructured" jcrSuperTypes="nt:base">
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="d1" jcrName="d1" jcrType="String" jcrAutoCreated="false" jcrMandatory="false"
         jcrOnParentVersion="IGNORE" jcrProtected="false" jcrMultiple="false" />
@@ -11,7 +11,7 @@
 
 	</class-descriptor>
 	
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.E"  jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.E"  jcrType="nt:unstructured" jcrSuperTypes="nt:base">
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="d1" 
 						  jcrName="d1" 
@@ -28,7 +28,7 @@
 
 	</class-descriptor>
 	
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.DFull"  jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.DFull"  jcrType="nt:unstructured" jcrSuperTypes="nt:base">
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="d1" jcrName="d1" jcrType="String" jcrAutoCreated="false" jcrMandatory="false"
         jcrOnParentVersion="IGNORE" jcrProtected="false" jcrMultiple="false" />

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-inheritance.xml Tue Aug  7 12:25:48 2007
@@ -13,16 +13,16 @@
      <!--MAPPING USED TO TEST INTERFACES WITH NODE TYPE   -->	
      
 	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject"  interface="true" discriminator="false"
-	                                   jcrNodeType="ocm:cmsobject" />
+	                                   jcrType="ocm:cmsobject" />
 
 	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.Folder"  interface="true" discriminator="false" 
-	                                   extend="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject"  jcrNodeType="ocm:folder" />
+	                                   extend="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject"  jcrType="ocm:folder" />
 
 	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.Content"  interface="true" discriminator="false" 
-	                                   extend="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject"  jcrNodeType="ocm:content"  />
+	                                   extend="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject"  jcrType="ocm:content"  />
 	                                   
 	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.interfaces.Document"  interface="true" discriminator="false" 
-	                                   extend="org.apache.jackrabbit.ocm.testmodel.interfaces.Content"  jcrNodeType="ocm:document"  />
+	                                   extend="org.apache.jackrabbit.ocm.testmodel.interfaces.Content"  jcrType="ocm:document"  />
 	                                   
 	                                   
      <!--  MAPPING USED TO TEST NODE TYPE PER HIERARCHY  -->	
@@ -55,7 +55,7 @@
 	
      <!--  MAPPING USED TO TEST NODE TYPE PER CONCRETE CLASS  -->	
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" jcrNodeType="ocm:cmsobjectimpl"  
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" jcrType="ocm:cmsobjectimpl"  
 	                                   discriminator="false" abstract="true" >
 		<implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.CmsObject" />	  	                                    
 		
@@ -66,7 +66,7 @@
 
 	</class-descriptor>     
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.FolderImpl" jcrNodeType="ocm:folderimpl" 
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.FolderImpl" jcrType="ocm:folderimpl" 
 	                                    extend="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false"  >
 		<implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Folder" />	  		                                    
 		<collection-descriptor fieldName="children" proxy="true" autoUpdate="false" 
@@ -74,12 +74,12 @@
 		                       collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.NTCollectionConverterImpl" />
 	</class-descriptor >	
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.ContentImpl" jcrNodeType="ocm:contentimpl" abstract="true"
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.ContentImpl" jcrType="ocm:contentimpl" abstract="true"
 	                                   extend="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl" discriminator="false"  >
        		<implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Content" />	  		                                    
 	</class-descriptor>	
 		
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentImpl" jcrNodeType="ocm:documentimpl" 
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentImpl" jcrType="ocm:documentimpl" 
 	                                    extend="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.ContentImpl" discriminator="false" >
 		<implement-descriptor interfaceName="org.apache.jackrabbit.ocm.testmodel.interfaces.Document" />	  		                                    	                                    
 		<field-descriptor fieldName="contentType" jcrName="ocm:contenttype" />  
@@ -87,7 +87,7 @@
 		<bean-descriptor fieldName="documentStream" jcrName="ocm:documentstream" proxy="true"  />			
 	</class-descriptor >	
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentStream" jcrNodeType="ocm:documentstream"  discriminator="false"  >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.DocumentStream" jcrType="ocm:documentstream"  discriminator="false"  >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="encoding" jcrName="ocm:encoding" />
 		<field-descriptor fieldName="content" jcrName="ocm:binarycontent" />

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-jcrnodetypes.xml Tue Aug  7 12:25:48 2007
@@ -3,12 +3,12 @@
 <!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
 <jackrabbit-ocm>
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.HierarchyNode"  jcrNodeType="nt:hierarchyNode" >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.HierarchyNode"  jcrType="nt:hierarchyNode" >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="creationDate" jcrName="jcr:created"/>	
 	</class-descriptor>	
 	
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Folder"  jcrNodeType="nt:folder"
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Folder"  jcrType="nt:folder"
 	                  extend="org.apache.jackrabbit.ocm.testmodel.HierarchyNode" >
 		<field-descriptor fieldName="path" path="true" />
 		<collection-descriptor fieldName="children" proxy="false" autoUpdate="false" 
@@ -17,21 +17,21 @@
 
 	</class-descriptor>	
 	
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.File"  jcrNodeType="nt:file" 
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.File"  jcrType="nt:file" 
 	                  extend="org.apache.jackrabbit.ocm.testmodel.HierarchyNode" >
 	                  
 		<field-descriptor fieldName="path" path="true" />
 		<bean-descriptor  fieldName="resource"  jcrName="jcr:content" />
 	</class-descriptor>
 		
-    <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Resource"  jcrNodeType="nt:resource">
+    <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Resource"  jcrType="nt:resource">
 		<field-descriptor fieldName="mimeType" jcrName="jcr:mimeType"/>	
 		<!-- field-descriptor fieldName="encoding" jcrName="jcr:encoding"/ -->	
 		<field-descriptor fieldName="data" jcrName="jcr:data"/>	
 		<field-descriptor fieldName="lastModified" jcrName="jcr:lastModified"/>	
 	</class-descriptor>	
 
-    <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.PropertyTest" jcrNodeType="ocm:propertytest" >
+    <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.PropertyTest" jcrType="ocm:propertytest" >
 		<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/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-proxy.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-proxy.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-proxy.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-proxy.xml Tue Aug  7 12:25:48 2007
@@ -3,20 +3,20 @@
 <!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
 <jackrabbit-ocm>
     
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.proxy.Main" 	jcrNodeType="nt:unstructured"  >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.proxy.Main" 	jcrType="nt:unstructured"  >
 		<!-- Field-descriptor is used to map simple attributes to jcr property -->
 		<field-descriptor fieldName="path" path="true" />
-		<bean-descriptor fieldName="proxyDetail" jcrName="proxydetail" proxy="true" jcrNodeType="nt:unstructured" />		
-		<bean-descriptor fieldName="nullDetail" jcrName="nulldetail" proxy="true" jcrNodeType="nt:unstructured" />		
-		<bean-descriptor fieldName="detail" jcrName="detail" proxy="false" jcrNodeType="nt:unstructured" />		
+		<bean-descriptor fieldName="proxyDetail" jcrName="proxydetail" proxy="true" jcrType="nt:unstructured" />		
+		<bean-descriptor fieldName="nullDetail" jcrName="nulldetail" proxy="true" jcrType="nt:unstructured" />		
+		<bean-descriptor fieldName="detail" jcrName="detail" proxy="false" jcrType="nt:unstructured" />		
 		
 		<collection-descriptor fieldName="proxyCollection" jcrName="proxycollection" proxy="true"
-                                                  elementClassName="org.apache.jackrabbit.ocm.testmodel.proxy.Detail" jcrNodeType="nt:unstructured"/>
+                                                  elementClassName="org.apache.jackrabbit.ocm.testmodel.proxy.Detail" jcrType="nt:unstructured"/>
         <collection-descriptor fieldName="nullProxyCollection" jcrName="nullproxycollection" proxy="true"
-                                                  elementClassName="org.apache.jackrabbit.ocm.testmodel.proxy.Detail" jcrNodeType="nt:unstructured"/>                                                  		
+                                                  elementClassName="org.apache.jackrabbit.ocm.testmodel.proxy.Detail" jcrType="nt:unstructured"/>                                                  		
 	</class-descriptor>
 
-	<class-descriptor 	className="org.apache.jackrabbit.ocm.testmodel.proxy.Detail" jcrNodeType="nt:unstructured" >		
+	<class-descriptor 	className="org.apache.jackrabbit.ocm.testmodel.proxy.Detail" jcrType="nt:unstructured" >		
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="field" jcrName="field" />
 	</class-descriptor>

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-sibling.xml Tue Aug  7 12:25:48 2007
@@ -3,7 +3,7 @@
 <!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
 <jackrabbit-ocm>
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Page" jcrNodeType="ocm:pagewithoutsibling" discriminator="false" >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Page" jcrType="ocm:pagewithoutsibling" discriminator="false" >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="title" jcrName="ocm:title" />
 		<collection-descriptor fieldName="paragraphs" proxy="false" 
@@ -11,13 +11,13 @@
 		                       collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.NTCollectionConverterImpl" />
 	</class-descriptor>
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Paragraph" jcrNodeType="ocm:paragraph" discriminator="false" >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Paragraph" jcrType="ocm:paragraph" discriminator="false" >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="text" jcrName="ocm:text"/>
 	</class-descriptor>
 
 <class-descriptor
-		className="org.apache.jackrabbit.ocm.testmodel.Atomic" jcrNodeType="nt:unstructured" discriminator="true" >
+		className="org.apache.jackrabbit.ocm.testmodel.Atomic" jcrType="nt:unstructured" discriminator="true" >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="string" jcrName="string" />
 		<field-descriptor fieldName="booleanObject" jcrName="booleanObject" />

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-testdigester.xml Tue Aug  7 12:25:48 2007
@@ -13,7 +13,7 @@
 	-->
 	<class-descriptor
 		className="org.apache.jackrabbit.ocm.testmodel.A"
-		jcrNodeType="nt:unstructured" jcrMixinTypes="mixin:a,mixin:b">
+		jcrType="nt:unstructured" jcrMixinTypes="mixin:a,mixin:b">
 		<!-- Field-descriptor is used to map simple attributes to jcr property -->
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="a1" jcrName="a1" />
@@ -25,7 +25,7 @@
 		-->
 		<bean-descriptor fieldName="b" jcrName="b" proxy="false"
 			converter="org.apache.jackrabbit.ocm.manager.beanconverter.impl.InlineBeanConverterImpl"
-			jcrNodeType="nt:unstructured" jcrAutoCreated="false"
+			jcrType="nt:unstructured" jcrAutoCreated="false"
 			jcrMandatory="false" jcrOnParentVersion="IGNORE" jcrProtected="false"
 			jcrSameNameSiblings="false" />
 
@@ -37,7 +37,7 @@
 		<collection-descriptor fieldName="collection"
 			jcrName="collection" proxy="false"
 			elementClassName="org.apache.jackrabbit.ocm.testmodel.C"
-			jcrNodeType="ocm:C" jcrAutoCreated="false" jcrMandatory="false"
+			jcrType="ocm:C" jcrAutoCreated="false" jcrMandatory="false"
 			jcrOnParentVersion="IGNORE" jcrProtected="false"
 			jcrSameNameSiblings="false" />
 
@@ -49,7 +49,7 @@
 
 	<class-descriptor
 		className="org.apache.jackrabbit.ocm.testmodel.B"
-		jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
+		jcrType="nt:unstructured" jcrSuperTypes="nt:base">
 		<!-- Field-descriptor is used to map simple attributes to jcr property -->
 
 		<field-descriptor fieldName="b1" jcrName="b1" jcrType="String"
@@ -64,7 +64,7 @@
 
 	<class-descriptor
 		className="org.apache.jackrabbit.ocm.testmodel.C"
-		jcrNodeType="ocm:C" discriminator="false">
+		jcrType="ocm:C" discriminator="false">
 		<!-- Field-descriptor is used to map simple attributes to jcr property -->
 		<field-descriptor fieldName="id" jcrName="ocm:id"
 			id="true" />
@@ -74,7 +74,7 @@
 
 	<class-descriptor
 		className="org.apache.jackrabbit.ocm.testmodel.collection.Main"
-		jcrNodeType="nt:unstructured">
+		jcrType="nt:unstructured">
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="text" jcrName="text" />
 		<collection-descriptor fieldName="hashMap" proxy="false"
@@ -91,14 +91,14 @@
 
 	<class-descriptor
 		className="org.apache.jackrabbit.ocm.testmodel.collection.Element"
-		jcrNodeType="ocm:element" discriminator="false">
+		jcrType="ocm:element" discriminator="false">
 		<field-descriptor fieldName="id" jcrName="ocm:id" />
 		<field-descriptor fieldName="text" jcrName="ocm:text" />
 	</class-descriptor>
 	
 	
 	<class-descriptor
-		className="org.apache.jackrabbit.ocm.testmodel.uuid.A" jcrNodeType="nt:unstructured" >
+		className="org.apache.jackrabbit.ocm.testmodel.uuid.A" jcrType="nt:unstructured" >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="uuid" uuid="true" />
         <field-descriptor fieldName="stringData" jcrName="stringData" />

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping-uuid.xml Tue Aug  7 12:25:48 2007
@@ -3,14 +3,14 @@
 <!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
 <jackrabbit-ocm>
     <class-descriptor
-		className="org.apache.jackrabbit.ocm.testmodel.uuid.A" jcrNodeType="nt:unstructured" jcrMixinTypes="mix:referenceable" >
+		className="org.apache.jackrabbit.ocm.testmodel.uuid.A" jcrType="nt:unstructured" jcrMixinTypes="mix:referenceable" >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="uuid" uuid="true" />
         <field-descriptor fieldName="stringData" jcrName="stringData" />
 	</class-descriptor>
 	
 	<class-descriptor
-		className="org.apache.jackrabbit.ocm.testmodel.uuid.B" jcrNodeType="nt:unstructured"  >
+		className="org.apache.jackrabbit.ocm.testmodel.uuid.B" jcrType="nt:unstructured"  >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="reference2A" jcrName="reference2A" converter="org.apache.jackrabbit.ocm.manager.atomictypeconverter.impl.ReferenceTypeConverterImpl" /> 
 		<collection-descriptor fieldName="multiReferences" jcrName="multiReferences" proxy="false" 		                      
@@ -19,7 +19,7 @@
 	</class-descriptor>
 
 	<class-descriptor
-		className="org.apache.jackrabbit.ocm.testmodel.uuid.B2" jcrNodeType="nt:unstructured"  >
+		className="org.apache.jackrabbit.ocm.testmodel.uuid.B2" jcrType="nt:unstructured"  >
 		<field-descriptor fieldName="path" path="true" />
 		<bean-descriptor fieldName="a" jcrName="a" converter="org.apache.jackrabbit.ocm.manager.beanconverter.impl.ReferenceBeanConverterImpl" />
 		<collection-descriptor fieldName="multiReferences" jcrName="multiReferences" proxy="false" 		                      

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml Tue Aug  7 12:25:48 2007
@@ -12,7 +12,7 @@
 	-->
 	<class-descriptor
 		className="org.apache.jackrabbit.ocm.testmodel.A"
-		jcrNodeType="nt:unstructured" jcrMixinTypes="mix:lockable" >
+		jcrType="nt:unstructured" jcrMixinTypes="mix:lockable" >
 		<!-- Field-descriptor is used to map simple attributes to jcr property -->
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="a1" jcrName="a1" />
@@ -22,7 +22,7 @@
 			* The definition of the associated class has to be defined in this mapping file 
 			* proxy="true" => use lazy laoding for this attribute b when retrieving A
 		-->
-		<bean-descriptor fieldName="b" jcrName="b" proxy="false" jcrNodeType="nt:unstructured"
+		<bean-descriptor fieldName="b" jcrName="b" proxy="false" jcrType="nt:unstructured"
         jcrAutoCreated="false" jcrMandatory="false" jcrOnParentVersion="IGNORE"
         jcrProtected="false" jcrSameNameSiblings="false" />
 
@@ -32,7 +32,7 @@
 			
 		-->
 		<collection-descriptor fieldName="collection" jcrName="collection" proxy="false"
-        elementClassName="org.apache.jackrabbit.ocm.testmodel.C" jcrNodeType="ocm:C"
+        elementClassName="org.apache.jackrabbit.ocm.testmodel.C" jcrType="ocm:C"
         jcrAutoCreated="false" jcrMandatory="false" jcrOnParentVersion="IGNORE"
         jcrProtected="false" jcrSameNameSiblings="false"/>
         
@@ -41,7 +41,7 @@
 		
 	</class-descriptor>
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.B"  jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.B"  jcrType="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"
@@ -52,13 +52,13 @@
 
 	</class-descriptor>
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.C" jcrNodeType="ocm:C" discriminator="false" >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.C" jcrType="ocm:C" discriminator="false" >
 		<!-- Field-descriptor is used to map simple attributes to jcr property -->
 		<field-descriptor fieldName="id" jcrName="ocm:id" 	id="true" />
 		<field-descriptor fieldName="name" jcrName="ocm:name" />
 	</class-descriptor>
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Lockable" jcrNodeType="ocm:TestLockable" >		
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Lockable" jcrType="ocm:TestLockable" >		
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="a1" jcrName="ocm:a1" />
 		<field-descriptor fieldName="a2" jcrName="ocm:a2" />
@@ -67,7 +67,7 @@
     	<field-descriptor fieldName="lockOwner" jcrName="jcr:lockOwner" />
 	</class-descriptor>
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Page" jcrNodeType="ocm:page" discriminator="false" >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Page" jcrType="ocm:page" discriminator="false" >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="title" jcrName="ocm:title" />
 		<collection-descriptor fieldName="paragraphs" proxy="false" 
@@ -75,7 +75,7 @@
 		                       collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.NTCollectionConverterImpl" />
 	</class-descriptor>
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Paragraph" jcrNodeType="ocm:paragraph" discriminator="false" >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Paragraph" jcrType="ocm:paragraph" discriminator="false" >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="text" jcrName="ocm:text"/>
     	<bean-descriptor fieldName="page" jcrName="page" proxy="true" converter="org.apache.jackrabbit.ocm.manager.beanconverter.impl.ParentBeanConverterImpl" />		
@@ -84,7 +84,7 @@
 
 	<class-descriptor
 		className="org.apache.jackrabbit.ocm.testmodel.collection.Main"
-		jcrNodeType="nt:unstructured">
+		jcrType="nt:unstructured">
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="text" jcrName="text" />
 		<collection-descriptor fieldName="hashMap" jcrName="hashMap" proxy="false"
@@ -97,19 +97,19 @@
 
 	</class-descriptor>
 
-	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.collection.Element" jcrNodeType="ocm:element" discriminator="false" >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.collection.Element" jcrType="ocm:element" discriminator="false" >
 		<field-descriptor fieldName="id" jcrName="ocm:id"  />
 		<field-descriptor fieldName="text" jcrName="ocm:text" />
 	</class-descriptor>
 	
 	
-	<class-descriptor 	className="org.apache.jackrabbit.ocm.testmodel.Discriminator" 	jcrNodeType="ocm:discriminatorobject" discriminator="true" >
+	<class-descriptor 	className="org.apache.jackrabbit.ocm.testmodel.Discriminator" 	jcrType="ocm:discriminatorobject" discriminator="true" >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="content" jcrName="ocm:content" />
 	</class-descriptor>		
 
 
-    <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Residual$ResidualProperties" jcrNodeType="nt:unstructured">
+    <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Residual$ResidualProperties" jcrType="nt:unstructured">
         <field-descriptor fieldName="path" path="true" />
         <collection-descriptor fieldName="elements" proxy="false" 
                                jcrName="value*"
@@ -119,7 +119,7 @@
                                
     </class-descriptor>
 
-    <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Residual$ResidualNodes" jcrNodeType="nt:unstructured">
+    <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Residual$ResidualNodes" jcrType="nt:unstructured">
         <field-descriptor fieldName="path" path="true" />
         <collection-descriptor fieldName="elements" proxy="false" 
                                jcrName="value*"

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/introduction-strategies.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/introduction-strategies.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/introduction-strategies.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/introduction-strategies.xml Tue Aug  7 12:25:48 2007
@@ -87,19 +87,19 @@
 				<p>When you decide to map a bean class, you have to create a new class descriptor entry in the Persistence Manager descriptor file.</p>			
 				<p>Here are the class-descriptors required to map the classes Page, PageInfo and Paragraph :</p>
 			<source><![CDATA[ 				
-<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Page" jcrNodeType="graffito:page">
+<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Page" jcrType="graffito:page">
 	<field-descriptor fieldName="path" path="true" />
 	<bean-descriptor fieldName="pageInfo" jcrName="pageInfo" />
 	<collection-descriptor fieldName="paragraphs" jcrName="paragraphs" elementClassName="org.apache.portals.graffito.jcr.testmodel.Paragraph" />
 </class-descriptor>
 									
-<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.PageInfo" jcrNodeType="graffito:PageInfo">
+<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.PageInfo" jcrType="graffito:PageInfo">
 	<field-descriptor fieldName="path" path="true" />
 	<field-descriptor fieldName="title" jcrName="graffito:title"/>
 	<field-descriptor fieldName="description" jcrName="graffito:description"/>
 </class-descriptor>
 
-<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Paragraph" jcrNodeType="graffito:paragraph">
+<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Paragraph" jcrType="graffito:paragraph">
 	<field-descriptor fieldName="path" path="true" />
 	<field-descriptor fieldName="text" jcrName="graffito:text"/>
 </class-descriptor>
@@ -127,7 +127,7 @@
 
 				<p>Now, let's go back to the class-descriptor.</p>
 				<source><![CDATA[ 
-<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Paragraph" jcrNodeType="nt:unstructured">
+<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Paragraph" jcrType="nt:unstructured">
 	<field-descriptor fieldName="path" path="true" />
 	<field-descriptor fieldName="text" jcrName="graffito:text"/>
 </class-descriptor>
@@ -139,7 +139,7 @@
 					It is also possible to map a bean class to a specific JCR node type. The following class-descriptor map the class "org.apache.portals.graffito.jcr.testmodel.Paragraph" to the node type "graffito:paragraph".	
 				</p>
 				<source><![CDATA[ 				
-<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Paragraph" jcrNodeType="graffito:paragraph">
+<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Paragraph" jcrType="graffito:paragraph">
 	<field-descriptor fieldName="path" path="true" />
 	<field-descriptor fieldName="text" jcrName="graffito:text"/>
 </class-descriptor>

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/atomic-strategy.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/atomic-strategy.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/atomic-strategy.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/atomic-strategy.xml Tue Aug  7 12:25:48 2007
@@ -101,7 +101,7 @@
 				 <ol>
 					<li>Specify the converter class in the field descriptor : 
 					   <source><![CDATA[ 
-<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Atomic" jcrNodeType="nt:unstructured" >
+<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Atomic" jcrType="nt:unstructured" >
   <field-descriptor fieldName="int2boolean" jcrName="int2boolean" converter="org.apache.portals.graffito.jcr.persistence.atomic.Int2BooleanTypeConverterImpl" />	
 </class-descriptor>
 						]]></source>

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/bean-strategy.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/bean-strategy.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/bean-strategy.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/bean-strategy.xml Tue Aug  7 12:25:48 2007
@@ -101,7 +101,7 @@
 				</p>
 <source><![CDATA[ 
 <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl" 
-                  jcrNodeType="graffito:cmsobjectimpl" >
+                  jcrType="graffito:cmsobjectimpl" >
 
 	<field-descriptor fieldName="path" path="true" />
 	<field-descriptor fieldName="name" jcrName="graffito:name"  id="true" />
@@ -119,7 +119,7 @@
 				<li>Specify the converter class in the bean descriptor : 		
 <source><![CDATA[ 
 <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.inheritance.impl.CmsObjectImpl" 
-                  jcrNodeType="graffito:cmsobjectimpl" >
+                  jcrType="graffito:cmsobjectimpl" >
 	<bean-descriptor  fieldName="parentFolder"  					 
 					  converter="org.apache.portals.graffito.jcr.persistence.beanconverter.impl.ParentBeanConverterImpl" />
 </class-descriptor>  

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/collection-strategy.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/collection-strategy.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/collection-strategy.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/collection-strategy.xml Tue Aug  7 12:25:48 2007
@@ -28,13 +28,13 @@
 				<p>Based on our model defined <a href="introduction-strategies.html">here</a>, the following collection-descriptor is used to map the "paragraphs" field into the JCR node called "paragraphs".</p>
 				
 				<source><![CDATA[ 				
-<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Page" jcrNodeType="graffito:page">
+<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Page" jcrType="graffito:page">
 	<collection-descriptor fieldName="paragraphs" jcrName="paragraphs" 
 			       elementClassName="org.apache.portals.graffito.jcr.testmodel.Paragraph" />
 	<!-- other field, bean and collection mapping here !-->
 </class-descriptor>
 																		
-<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Paragraph" jcrNodeType="graffito:paragraph">
+<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Paragraph" jcrType="graffito:paragraph">
 	<field-descriptor fieldName="path" path="true" />
 	<field-descriptor fieldName="text" jcrName="graffito:text"/>
 </class-descriptor>									

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/introduction-strategies.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/introduction-strategies.xml?view=diff&rev=563631&r1=563630&r2=563631
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/introduction-strategies.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/xdocs/simple-strategies/introduction-strategies.xml Tue Aug  7 12:25:48 2007
@@ -119,7 +119,7 @@
 				    You can find more information on the field-descriptors in the page <a href="atomic-strategy.html">Mapping Atomic fields</a>. 
 				</p>	
 				<p>
-					It is also possible to map a bean class to a particular JCR node type by specifying the desired type in the attribute jcrNodeType. 
+					It is also possible to map a bean class to a particular JCR node type by specifying the desired type in the attribute jcrType. 
 					The following class-descriptor map the class "org.apache.portals.graffito.jcr.testmodel.Paragraph" into the node type "graffito:paragraph".
 						
 				</p>				   



Mime
View raw message