You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by cl...@apache.org on 2007/08/06 22:22:03 UTC
svn commit: r563255 -
/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java
Author: clombart
Date: Mon Aug 6 13:22:03 2007
New Revision: 563255
URL: http://svn.apache.org/viewvc?view=rev&rev=563255
Log:
minor bug fix
Modified:
jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java
Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java?view=diff&rev=563255&r1=563254&r2=563255
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NodeTypeManagerImpl.java Mon Aug 6 13:22:03 2007
@@ -173,7 +173,7 @@
while (fieldIterator.hasNext())
{
FieldDescriptor field = (FieldDescriptor) fieldIterator.next();
- if (!field.isPath() && !field.isId()) {
+ if (!field.isPath()) {
propDefs.add(getPropertyDefinition(field.getFieldName(), field, nodeTypeDef.getName()));
}
}
@@ -269,7 +269,7 @@
NodeTypeDef type = new NodeTypeDef();
type.setMixin(false);
- if (jcrNodeType != null)
+ if (jcrNodeType != null && (! jcrNodeType.equals("")))
{
type.setName(getNamespaceHelper().getQName(jcrNodeType));
}
@@ -345,7 +345,7 @@
if (field.getJcrName() != null) {
node.setName(getNamespaceHelper().getQName(field.getJcrName()));
} else {
- node.setName(getNamespaceHelper().getQName(fieldName));
+ node.setName(getNamespaceHelper().getQName("*"));
}
if (field.getJcrNodeType() != null) {