[dna-commits] DNA SVN: r836 - in trunk: dna-jcr/src/main/java/org/jboss/dna/jcr and 1 other directory.
dna-commits at lists.jboss.org
dna-commits at lists.jboss.org
Thu Apr 16 13:50:46 EDT 2009
Author: rhauch
Date: 2009-04-16 13:50:46 -0400 (Thu, 16 Apr 2009)
New Revision: 836
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrLexicon.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrNtLexicon.java
trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/AbstractJcrNodeTypeSource.java
trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrBuiltinNodeTypeSource.java
trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrLexicon.java
trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrNtLexicon.java
Log:
DNA-363 Define node types via CND files
The first step of several. This change moves some of the names in the JCR-related lexicons from the "dna-jcr" project's lexicons into the "dna-graph" project's corresponding lexicons.
Also added to the "nt:nodeType" and "nt:propertyDefinition" node types in JcrBuiltinNodeTypeSource were several additional property definitions new in JSR-283 . However, because the JSR-170 TCK unit tests are checking that only the JSR-170 property definitions are there, these new definitions have been commented out for the time being. (JSR-283 also makes all of the property definitions on "nt:nodeType", "nt:propertyDefinition", and "nt:childNodeDefinition" to be protected, though JSR-170 TCK unit tests are checking that they are not. These also were left as not being protected so that we are JSR-170 compliant.)
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrLexicon.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrLexicon.java 2009-04-16 16:08:24 UTC (rev 835)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrLexicon.java 2009-04-16 17:50:46 UTC (rev 836)
@@ -46,4 +46,28 @@
public static final Name MIMETYPE = new BasicName(Namespace.URI, "mimeType");
public static final Name DATA = new BasicName(Namespace.URI, "data");
public static final Name LAST_MODIFIED = new BasicName(Namespace.URI, "lastModified");
+
+ // Names used in the node type definitions ...
+ public static final Name AUTO_CREATED = new BasicName(Namespace.URI, "autoCreated");
+ public static final Name CHILD_NODE_DEFINITION = new BasicName(Namespace.URI, "childNodeDefinition");
+ public static final Name DEFAULT_PRIMARY_TYPE = new BasicName(Namespace.URI, "defaultPrimaryType");
+ public static final Name DEFAULT_VALUES = new BasicName(Namespace.URI, "defaultValues");
+ public static final Name HAS_ORDERABLE_CHILD_NODES = new BasicName(Namespace.URI, "hasOrderableChildNodes");
+ public static final Name IS_ABSTRACT = new BasicName(Namespace.URI, "isAbstract");
+ public static final Name IS_FULL_TEXT_SEARCHABLE = new BasicName(Namespace.URI, "isFullTextSearchable");
+ public static final Name IS_MIXIN = new BasicName(Namespace.URI, "isMixin");
+ public static final Name IS_QUERY_ORDERABLE = new BasicName(Namespace.URI, "isQueryOrderable");
+ public static final Name IS_QUERYABLE = new BasicName(Namespace.URI, "isQueryable");
+ public static final Name MANDATORY = new BasicName(Namespace.URI, "mandatory");
+ public static final Name MULTIPLE = new BasicName(Namespace.URI, "multiple");
+ public static final Name ON_PARENT_VERSION = new BasicName(Namespace.URI, "onParentVersion");
+ public static final Name PRIMARY_ITEM_NAME = new BasicName(Namespace.URI, "primaryItemName");
+ public static final Name PROPERTY_DEFINITION = new BasicName(Namespace.URI, "propertyDefinition");
+ public static final Name PROTECTED = new BasicName(Namespace.URI, "protected");
+ public static final Name REQUIRED_PRIMARY_TYPES = new BasicName(Namespace.URI, "requiredPrimaryTypes");
+ public static final Name REQUIRED_TYPE = new BasicName(Namespace.URI, "requiredType");
+ public static final Name SAME_NAME_SIBLINGS = new BasicName(Namespace.URI, "sameNameSiblings");
+ public static final Name SUPERTYPES = new BasicName(Namespace.URI, "supertypes");
+ public static final Name VALUE_CONSTRAINTS = new BasicName(Namespace.URI, "valueConstraints");
+
}
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrNtLexicon.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrNtLexicon.java 2009-04-16 16:08:24 UTC (rev 835)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/JcrNtLexicon.java 2009-04-16 17:50:46 UTC (rev 836)
@@ -41,4 +41,10 @@
public static final Name FOLDER = new BasicName(Namespace.URI, "folder");
public static final Name RESOURCE = new BasicName(Namespace.URI, "resource");
public static final Name BASE = new BasicName(Namespace.URI, "base");
+
+ // Names used in the node type definitions ...
+ public static final Name NODE_TYPE = new BasicName(Namespace.URI, "nodeType");
+ public static final Name CHILD_NODE_DEFINITION = new BasicName(Namespace.URI, "childNodeDefinition");
+ public static final Name PROPERTY_DEFINITION = new BasicName(Namespace.URI, "propertyDefinition");
+
}
Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/AbstractJcrNodeTypeSource.java
===================================================================
--- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/AbstractJcrNodeTypeSource.java 2009-04-16 16:08:24 UTC (rev 835)
+++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/AbstractJcrNodeTypeSource.java 2009-04-16 17:50:46 UTC (rev 836)
@@ -27,6 +27,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import javax.jcr.PropertyType;
import javax.jcr.Value;
import org.jboss.dna.common.util.CheckArg;
import org.jboss.dna.graph.property.Name;
@@ -42,6 +43,12 @@
protected static final List<JcrNodeType> NO_SUPERTYPES = Collections.<JcrNodeType>emptyList();
protected static final List<JcrNodeDefinition> NO_CHILD_NODES = Collections.<JcrNodeDefinition>emptyList();
protected static final List<JcrPropertyDefinition> NO_PROPERTIES = Collections.<JcrPropertyDefinition>emptyList();
+ protected static final String[] ALL_PROPERTY_TYPES_WITH_UNDEFINED = new String[] {
+ PropertyType.nameFromValue(PropertyType.BINARY), PropertyType.nameFromValue(PropertyType.BOOLEAN),
+ PropertyType.nameFromValue(PropertyType.DATE), PropertyType.nameFromValue(PropertyType.DOUBLE),
+ PropertyType.nameFromValue(PropertyType.LONG), PropertyType.nameFromValue(PropertyType.NAME),
+ PropertyType.nameFromValue(PropertyType.PATH), PropertyType.nameFromValue(PropertyType.REFERENCE),
+ PropertyType.nameFromValue(PropertyType.STRING), PropertyType.nameFromValue(PropertyType.UNDEFINED),};
/** Indicates that the node type has no primary item name - added for readability */
protected static final Name NO_PRIMARY_ITEM_NAME = null;
Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrBuiltinNodeTypeSource.java
===================================================================
--- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrBuiltinNodeTypeSource.java 2009-04-16 16:08:24 UTC (rev 835)
+++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrBuiltinNodeTypeSource.java 2009-04-16 17:50:46 UTC (rev 836)
@@ -38,6 +38,14 @@
@Immutable
class JcrBuiltinNodeTypeSource extends AbstractJcrNodeTypeSource {
+ protected static final String[] ON_PARENT_VERSION_VALUES = new String[] {OnParentVersionBehavior.ABORT.getName(),
+ OnParentVersionBehavior.COMPUTE.getName(), OnParentVersionBehavior.COPY.getName(),
+ OnParentVersionBehavior.IGNORE.getName(), OnParentVersionBehavior.INITIALIZE.getName(),
+ OnParentVersionBehavior.VERSION.getName(),};
+
+ protected static final boolean NT_NODE_TYPES_PROTECTED = false; // JSR-170 requires they not be protected, but JSR-283 says
+ // they are.
+
/** The list of primary node types. */
private final List<JcrNodeType> nodeTypes;
@@ -58,28 +66,29 @@
Value ntBaseValue = new JcrValue(context.getValueFactories(), null, PropertyType.NAME, JcrNtLexicon.BASE);
JcrNodeType defined = new JcrNodeType(
- context,
- NO_NODE_TYPE_MANAGER,
- DnaLexicon.DEFINED,
- NO_SUPERTYPES,
- DnaLexicon.NODE_DEFINITON,
- NO_CHILD_NODES,
- Arrays.asList(new JcrPropertyDefinition[] {new JcrPropertyDefinition(
- context,
- null,
- DnaLexicon.NODE_DEFINITON,
- OnParentVersionBehavior.INITIALIZE.getJcrValue(),
- false,
- false,
- true,
- NO_DEFAULT_VALUES,
- PropertyType.STRING,
- NO_CONSTRAINTS,
- false),}),
- IS_A_MIXIN, UNORDERABLE_CHILD_NODES);
+ context,
+ NO_NODE_TYPE_MANAGER,
+ DnaLexicon.DEFINED,
+ NO_SUPERTYPES,
+ DnaLexicon.NODE_DEFINITON,
+ NO_CHILD_NODES,
+ Arrays.asList(new JcrPropertyDefinition[] {new JcrPropertyDefinition(
+ context,
+ null,
+ DnaLexicon.NODE_DEFINITON,
+ OnParentVersionBehavior.INITIALIZE.getJcrValue(),
+ false,
+ false,
+ true,
+ NO_DEFAULT_VALUES,
+ PropertyType.STRING,
+ NO_CONSTRAINTS,
+ false),}),
+ IS_A_MIXIN, UNORDERABLE_CHILD_NODES);
// Stubbing in child node and property definitions for now
- JcrNodeType base = new JcrNodeType(context, NO_NODE_TYPE_MANAGER, JcrNtLexicon.BASE, Arrays.asList(new JcrNodeType[] {defined}), NO_PRIMARY_ITEM_NAME,
- NO_CHILD_NODES, Arrays.asList(new JcrPropertyDefinition[] {
+ JcrNodeType base = new JcrNodeType(context, NO_NODE_TYPE_MANAGER, JcrNtLexicon.BASE,
+ Arrays.asList(new JcrNodeType[] {defined}), NO_PRIMARY_ITEM_NAME, NO_CHILD_NODES,
+ Arrays.asList(new JcrPropertyDefinition[] {
new JcrPropertyDefinition(context, null, JcrLexicon.PRIMARY_TYPE,
OnParentVersionBehavior.COMPUTE.getJcrValue(), true,
true, true, NO_DEFAULT_VALUES, PropertyType.NAME,
@@ -125,53 +134,55 @@
null,
JcrLexicon.AUTO_CREATED,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, true, false, NO_DEFAULT_VALUES,
- PropertyType.BOOLEAN, NO_CONSTRAINTS,
- false),
+ false, true, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.BOOLEAN,
+ NO_CONSTRAINTS, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.DEFAULT_PRIMARY_TYPE,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, false, false, NO_DEFAULT_VALUES,
- PropertyType.NAME, NO_CONSTRAINTS, false),
+ false, false, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.NAME,
+ NO_CONSTRAINTS, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.MANDATORY,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, true, false, NO_DEFAULT_VALUES,
- PropertyType.BOOLEAN, NO_CONSTRAINTS,
- false),
+ false, true, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.BOOLEAN,
+ NO_CONSTRAINTS, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.NAME,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, false, false, NO_DEFAULT_VALUES,
- PropertyType.NAME, NO_CONSTRAINTS, false),
+ false, false, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.NAME,
+ NO_CONSTRAINTS, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.ON_PARENT_VERSION,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, true, false, NO_DEFAULT_VALUES,
- PropertyType.STRING, NO_CONSTRAINTS,
- false),
+ false, true, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.STRING,
+ NO_CONSTRAINTS, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.PROTECTED,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, true, false, NO_DEFAULT_VALUES,
- PropertyType.BOOLEAN, NO_CONSTRAINTS,
- false),
+ false, true, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.BOOLEAN,
+ NO_CONSTRAINTS, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.REQUIRED_PRIMARY_TYPES,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, true, false,
+ false, true, NT_NODE_TYPES_PROTECTED,
new Value[] {ntBaseValue},
PropertyType.NAME, NO_CONSTRAINTS, true),
new JcrPropertyDefinition(
@@ -179,9 +190,9 @@
null,
JcrLexicon.SAME_NAME_SIBLINGS,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, true, false, NO_DEFAULT_VALUES,
- PropertyType.BOOLEAN, NO_CONSTRAINTS,
- false)}), NOT_MIXIN,
+ false, true, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.BOOLEAN,
+ NO_CONSTRAINTS, false)}), NOT_MIXIN,
UNORDERABLE_CHILD_NODES);
JcrNodeType hierarchyNode = new JcrNodeType(
@@ -315,104 +326,142 @@
null,
JcrLexicon.AUTO_CREATED,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, true, false, NO_DEFAULT_VALUES,
- PropertyType.BOOLEAN, NO_CONSTRAINTS,
- false),
+ false, true, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.BOOLEAN,
+ NO_CONSTRAINTS, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.DEFAULT_VALUES,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, false, false, NO_DEFAULT_VALUES,
- PropertyType.UNDEFINED, NO_CONSTRAINTS,
- true),
+ false, false, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.UNDEFINED,
+ NO_CONSTRAINTS, true),
+ // new JcrPropertyDefinition(
+ // context,
+ // null,
+ // JcrLexicon.IS_FULL_TEXT_SEARCHABLE,
+ // OnParentVersionBehavior.COPY.getJcrValue(),
+ // false, true, NT_NODE_TYPES_PROTECTED,
+ // NO_DEFAULT_VALUES, PropertyType.BOOLEAN,
+ // NO_CONSTRAINTS, false),
+ // new JcrPropertyDefinition(
+ // context,
+ // null,
+ // JcrLexicon.IS_QUERY_ORDERABLE,
+ // OnParentVersionBehavior.COPY.getJcrValue(),
+ // false, true, NT_NODE_TYPES_PROTECTED,
+ // NO_DEFAULT_VALUES, PropertyType.BOOLEAN,
+ // NO_CONSTRAINTS, false),
+ // new JcrPropertyDefinition(
+ // context,
+ // null,
+ // JcrLexicon.IS_QUERYABLE,
+ // OnParentVersionBehavior.COPY.getJcrValue(),
+ // false, true, NT_NODE_TYPES_PROTECTED,
+ // NO_DEFAULT_VALUES, PropertyType.BOOLEAN,
+ // NO_CONSTRAINTS, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.MANDATORY,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, true, false, NO_DEFAULT_VALUES,
- PropertyType.BOOLEAN, NO_CONSTRAINTS,
- false),
+ false, true, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.BOOLEAN,
+ NO_CONSTRAINTS, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.MULTIPLE,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, true, false, NO_DEFAULT_VALUES,
- PropertyType.BOOLEAN, NO_CONSTRAINTS,
- false),
+ false, true, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.BOOLEAN,
+ NO_CONSTRAINTS, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.NAME,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, false, false, NO_DEFAULT_VALUES,
- PropertyType.NAME, NO_CONSTRAINTS, false),
+ false, false, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.NAME,
+ NO_CONSTRAINTS, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.ON_PARENT_VERSION,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, true, false, NO_DEFAULT_VALUES,
- PropertyType.STRING, NO_CONSTRAINTS, false),
+ false, true, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.STRING,
+ ON_PARENT_VERSION_VALUES, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.PROTECTED,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, true, false, NO_DEFAULT_VALUES,
- PropertyType.BOOLEAN, NO_CONSTRAINTS,
- false),
+ false, true, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.BOOLEAN,
+ NO_CONSTRAINTS, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.REQUIRED_TYPE,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, true, false, NO_DEFAULT_VALUES,
- PropertyType.STRING, NO_CONSTRAINTS, false),
+ false, true, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.STRING,
+ ALL_PROPERTY_TYPES_WITH_UNDEFINED, false),
new JcrPropertyDefinition(
context,
null,
JcrLexicon.VALUE_CONSTRAINTS,
OnParentVersionBehavior.COPY.getJcrValue(),
- false, false, false, NO_DEFAULT_VALUES,
- PropertyType.STRING, NO_CONSTRAINTS, true)}),
- NOT_MIXIN, UNORDERABLE_CHILD_NODES);
+ false, false, NT_NODE_TYPES_PROTECTED,
+ NO_DEFAULT_VALUES, PropertyType.STRING,
+ NO_CONSTRAINTS, true)}), NOT_MIXIN,
+ UNORDERABLE_CHILD_NODES);
JcrNodeType nodeType = new JcrNodeType(context, NO_NODE_TYPE_MANAGER, JcrNtLexicon.NODE_TYPE,
Arrays.asList(new JcrNodeType[] {base}), NO_PRIMARY_ITEM_NAME,
Arrays.asList(new JcrNodeDefinition[] {
new JcrNodeDefinition(context, null, JcrLexicon.CHILD_NODE_DEFINITION,
OnParentVersionBehavior.VERSION.getJcrValue(), false,
- false, false, true, JcrNtLexicon.CHILD_NODE_DEFINITION,
+ false, NT_NODE_TYPES_PROTECTED, true,
+ JcrNtLexicon.CHILD_NODE_DEFINITION,
new JcrNodeType[] {childNodeDefinition}),
new JcrNodeDefinition(context, null, JcrLexicon.PROPERTY_DEFINITION,
OnParentVersionBehavior.VERSION.getJcrValue(), false,
- false, false, true, JcrNtLexicon.PROPERTY_DEFINITION,
+ false, NT_NODE_TYPES_PROTECTED, true,
+ JcrNtLexicon.PROPERTY_DEFINITION,
new JcrNodeType[] {propertyDefinition})}),
Arrays.asList(new JcrPropertyDefinition[] {
new JcrPropertyDefinition(context, null, JcrLexicon.HAS_ORDERABLE_CHILD_NODES,
OnParentVersionBehavior.COPY.getJcrValue(), false,
- true, false, NO_DEFAULT_VALUES,
+ true, NT_NODE_TYPES_PROTECTED, NO_DEFAULT_VALUES,
PropertyType.BOOLEAN, NO_CONSTRAINTS, false),
+ // new JcrPropertyDefinition(context, null, JcrLexicon.IS_ABSTRACT,
+ // OnParentVersionBehavior.COPY.getJcrValue(), false,
+ // true, NT_NODE_TYPES_PROTECTED, NO_DEFAULT_VALUES, PropertyType.BOOLEAN,
+ // NO_CONSTRAINTS, false),
new JcrPropertyDefinition(context, null, JcrLexicon.IS_MIXIN,
OnParentVersionBehavior.COPY.getJcrValue(), false,
- true, false, NO_DEFAULT_VALUES,
+ true, NT_NODE_TYPES_PROTECTED, NO_DEFAULT_VALUES,
PropertyType.BOOLEAN, NO_CONSTRAINTS, false),
+ // new JcrPropertyDefinition(context, null, JcrLexicon.IS_QUERYABLE,
+ // OnParentVersionBehavior.COPY.getJcrValue(), false,
+ // true, NT_NODE_TYPES_PROTECTED, NO_DEFAULT_VALUES, PropertyType.BOOLEAN,
+ // NO_CONSTRAINTS, false),
new JcrPropertyDefinition(context, null, JcrLexicon.NODE_TYPE_NAME,
OnParentVersionBehavior.COPY.getJcrValue(), false,
- true, false, NO_DEFAULT_VALUES, PropertyType.NAME,
- NO_CONSTRAINTS, false),
+ true, NT_NODE_TYPES_PROTECTED, NO_DEFAULT_VALUES,
+ PropertyType.NAME, NO_CONSTRAINTS, false),
new JcrPropertyDefinition(context, null, JcrLexicon.PRIMARY_ITEM_NAME,
OnParentVersionBehavior.COPY.getJcrValue(), false,
- false, false, NO_DEFAULT_VALUES, PropertyType.NAME,
- NO_CONSTRAINTS, false),
+ false, NT_NODE_TYPES_PROTECTED, NO_DEFAULT_VALUES,
+ PropertyType.NAME, NO_CONSTRAINTS, false),
new JcrPropertyDefinition(context, null, JcrLexicon.SUPERTYPES,
OnParentVersionBehavior.COPY.getJcrValue(), false,
- false, false, NO_DEFAULT_VALUES, PropertyType.NAME,
- NO_CONSTRAINTS, true),}), NOT_MIXIN,
- UNORDERABLE_CHILD_NODES);
+ false, NT_NODE_TYPES_PROTECTED, NO_DEFAULT_VALUES,
+ PropertyType.NAME, NO_CONSTRAINTS, true),}),
+ NOT_MIXIN, UNORDERABLE_CHILD_NODES);
JcrNodeType query = new JcrNodeType(context, NO_NODE_TYPE_MANAGER, JcrNtLexicon.QUERY,
Arrays.asList(new JcrNodeType[] {base}), NO_PRIMARY_ITEM_NAME, NO_CHILD_NODES,
@@ -585,9 +634,9 @@
// NOT_MIXIN, UNORDERABLE_CHILD_NODES);
// Disabling version-related types until DNA supports versioning, as per section 4.11 of the 1.0.1 specification
- nodeTypes.addAll(Arrays.asList(new JcrNodeType[] {defined, base, unstructured, childNodeDefinition, file, folder, frozenNode,
- hierarchyNode, linkedFile, nodeType, propertyDefinition, query, resource, nodeType /*, version, versionHistory,
- versionLabels, versionedChild */}));
+ nodeTypes.addAll(Arrays.asList(new JcrNodeType[] {defined, base, unstructured, childNodeDefinition, file, folder,
+ frozenNode, hierarchyNode, linkedFile, nodeType, propertyDefinition, query, resource, nodeType /*, version, versionHistory,
+ versionLabels, versionedChild */}));
JcrNodeType lockable = new JcrNodeType(context, NO_NODE_TYPE_MANAGER, JcrMixLexicon.LOCKABLE, NO_SUPERTYPES,
NO_PRIMARY_ITEM_NAME, NO_CHILD_NODES, Arrays.asList(new JcrPropertyDefinition[] {
Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrLexicon.java
===================================================================
--- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrLexicon.java 2009-04-16 16:08:24 UTC (rev 835)
+++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrLexicon.java 2009-04-16 17:50:46 UTC (rev 836)
@@ -31,47 +31,29 @@
*/
class JcrLexicon extends org.jboss.dna.graph.JcrLexicon {
- public static final Name AUTO_CREATED = new BasicName(Namespace.URI, "autoCreated");
public static final Name BASE_VERSION = new BasicName(Namespace.URI, "baseVersion");
- public static final Name CHILD_NODE_DEFINITION = new BasicName(Namespace.URI, "childNodeDefinition");
public static final Name CONTENT = new BasicName(Namespace.URI, "content");
public static final Name CREATED = new BasicName(Namespace.URI, "created");
public static final Name DATA = new BasicName(Namespace.URI, "data");
- public static final Name DEFAULT_PRIMARY_TYPE = new BasicName(Namespace.URI, "defaultPrimaryType");
- public static final Name DEFAULT_VALUES = new BasicName(Namespace.URI, "defaultValues");
public static final Name ENCODING = new BasicName(Namespace.URI, "encoding");
public static final Name FROZEN_MIXIN_TYPES = new BasicName(Namespace.URI, "frozenMixinTypes");
public static final Name FROZEN_NODE = new BasicName(Namespace.URI, "frozenNode");
public static final Name FROZEN_PRIMARY_TYPE = new BasicName(Namespace.URI, "frozenPrimaryType");
public static final Name FROZEN_UUID = new BasicName(Namespace.URI, "frozenUuid");
- public static final Name HAS_ORDERABLE_CHILD_NODES = new BasicName(Namespace.URI, "hasOrderableChildNodes");
public static final Name IS_CHECKED_OUT = new BasicName(Namespace.URI, "isCheckedOut");
- public static final Name IS_MIXIN = new BasicName(Namespace.URI, "isMixin");
public static final Name LANGUAGE = new BasicName(Namespace.URI, "language");
public static final Name LAST_MODIFIED = new BasicName(Namespace.URI, "lastModified");
public static final Name LOCK_IS_DEEP = new BasicName(Namespace.URI, "lockIsDeep");
public static final Name LOCK_OWNER = new BasicName(Namespace.URI, "lockOwner");
- public static final Name MANDATORY = new BasicName(Namespace.URI, "mandatory");
public static final Name MERGE_FAILED = new BasicName(Namespace.URI, "mergeFailed");
- public static final Name MULTIPLE = new BasicName(Namespace.URI, "multiple");
- public static final Name NAME = new BasicName(Namespace.URI, "name");
public static final Name NODE_TYPES = new BasicName(Namespace.URI, "nodeTypes");
public static final Name NODE_TYPE_NAME = new BasicName(Namespace.URI, "nodeTypeName");
- public static final Name ON_PARENT_VERSION = new BasicName(Namespace.URI, "onParentVersion");
public static final Name PREDECESSORS = new BasicName(Namespace.URI, "predecessors");
- public static final Name PRIMARY_ITEM_NAME = new BasicName(Namespace.URI, "primaryItemName");
- public static final Name PROPERTY_DEFINITION = new BasicName(Namespace.URI, "propertyDefinition");
- public static final Name PROTECTED = new BasicName(Namespace.URI, "protected");
- public static final Name REQUIRED_PRIMARY_TYPES = new BasicName(Namespace.URI, "requiredPrimaryTypes");
- public static final Name REQUIRED_TYPE = new BasicName(Namespace.URI, "requiredType");
public static final Name ROOT = new BasicName(Namespace.URI, "root");
public static final Name ROOT_VERSION = new BasicName(Namespace.URI, "rootVersion");
- public static final Name SAME_NAME_SIBLINGS = new BasicName(Namespace.URI, "sameNameSiblings");
public static final Name STATEMENT = new BasicName(Namespace.URI, "statement");
public static final Name SUCCESSORS = new BasicName(Namespace.URI, "successors");
- public static final Name SUPERTYPES = new BasicName(Namespace.URI, "supertypes");
public static final Name SYSTEM = new BasicName(Namespace.URI, "system");
- public static final Name VALUE_CONSTRAINTS = new BasicName(Namespace.URI, "valueConstraints");
public static final Name VERSIONABLE_UUID = new BasicName(Namespace.URI, "versionableUuid");
public static final Name VERSION_HISTORY = new BasicName(Namespace.URI, "versionHistory");
public static final Name VERSION_LABELS = new BasicName(Namespace.URI, "versionLabels");
Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrNtLexicon.java
===================================================================
--- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrNtLexicon.java 2009-04-16 16:08:24 UTC (rev 835)
+++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrNtLexicon.java 2009-04-16 17:50:46 UTC (rev 836)
@@ -28,12 +28,9 @@
public class JcrNtLexicon extends org.jboss.dna.graph.JcrNtLexicon {
- public static final Name CHILD_NODE_DEFINITION = new BasicName(Namespace.URI, "childNodeDefinition");
public static final Name FROZEN_NODE = new BasicName(Namespace.URI, "frozenNode");
public static final Name HIERARCHY_NODE = new BasicName(Namespace.URI, "hierarchyNode");
public static final Name LINKED_FILE = new BasicName(Namespace.URI, "linkedFile");
- public static final Name NODE_TYPE = new BasicName(Namespace.URI, "nodeType");
- public static final Name PROPERTY_DEFINITION = new BasicName(Namespace.URI, "propertyDefinition");
public static final Name QUERY = new BasicName(Namespace.URI, "query");
public static final Name VERSION = new BasicName(Namespace.URI, "version");
public static final Name VERSIONED_CHILD = new BasicName(Namespace.URI, "versionedChild");
More information about the dna-commits
mailing list