Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@jackrabbit.apache.org
Message-ID: <20060324082417.61109.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r388451 [2/4] - in /jackrabbit/branches/1.0:
 contrib/bdb-persistence/ contrib/classloader/
 contrib/jcr-ext/src/java/org/apache/jackrabbit/session/
 contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/
 contrib/jcr-ext/src/java/org...
Date: Fri, 24 Mar 2006 08:23:38 -0000
To: commits@jackrabbit.apache.org
From: fielding@apache.org

Modified: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionNodeType.java
URL: http://svn.apache.org/viewcvs/jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionNodeType.java?rev=388451&r1=388450&r2=388451&view=diff
==============================================================================
--- jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionNodeType.java (original)
+++ jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionNodeType.java Fri Mar 24 00:23:34 2006
@@ -1,227 +1,227 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.session.nodetype;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.jcr.nodetype.NodeDefinition;
-import javax.jcr.nodetype.NodeType;
-import javax.jcr.nodetype.PropertyDefinition;
-
-import org.apache.jackrabbit.session.SessionHelper;
-import org.apache.jackrabbit.base.nodetype.BaseNodeType;
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.state.nodetype.NodeDefinitionState;
-import org.apache.jackrabbit.state.nodetype.NodeTypeState;
-import org.apache.jackrabbit.state.nodetype.PropertyDefinitionState;
-
-/**
- * Immutable and session-bound node type frontend. An instance
- * of this class presents the underlying node type state using
- * the JCR NodeType interface. This class also contains simple
- * implementations of the higher-order methods defined by the
- * NodeType interface.
- * <p>
- * By not exposing the setter methods of the underlying state instance,
- * this class intentionally makes it impossible for a JCR client to modify
- * node type information.
- */
-final class SessionNodeType extends BaseNodeType implements NodeType {
-
-    /** The wildcard item definition name. */
-    private static final String WILDCARD = "*";
-
-    /** Helper for accessing the current session. */
-    private final SessionHelper helper;
-
-    /** The underlying node type state. */
-    private final NodeTypeState state;
-
-    /**
-     * Creates a node type frontend that is bound to the
-     * given session and underlying node type state.
-     *
-     * @param helper helper for accessing the current session
-     * @param state underlying node type state
-     */
-    public SessionNodeType(SessionHelper helper, NodeTypeState state) {
-        this.helper = helper;
-        this.state = state;
-    }
-
-    /**
-     * Returns the name of the node type. The returned name is retrieved
-     * from the underlying node type state and converted into a prefixed
-     * JCR name using the namespace mappings of the current session.
-     *
-     * @return node type name
-     * @see NodeType#getName()
-     */
-    public String getName() {
-        return helper.getName(state.getName());
-    }
-
-    /**
-     * Returns the value of the Mixin node type property. The returned
-     * value is retrieved from the underlying node type state.
-     *
-     * @return Mixin property value
-     * @see NodeType#isMixin()
-     */
-    public boolean isMixin() {
-        return state.isMixin();
-    }
-
-    /**
-     * Returns the value of the HasOrderableChildNodes node type property.
-     * The returned value is retrieved from the underlying node type state.
-     *
-     * @return HasOrderableChildNodes property value
-     * @see NodeType#hasOrderableChildNodes()
-     */
-    public boolean hasOrderableChildNodes() {
-        return state.hasOrderableChildNodes();
-    }
-
-    /**
-     * Returns the name of the primary item of this node type.
-     * The returned name is retrieved from the underlying node type state
-     * and converted into a prefixed JCR name using the namespace mappings
-     * of the current session.
-     *
-     * @return primary item name, or <code>null</code> if not specified
-     * @see NodeType#getPrimaryItemName()
-     */
-    public String getPrimaryItemName() {
-        QName name = state.getPrimaryItemName();
-        if (name != null) {
-            return helper.getName(name);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the declared supertypes of this node type. The returned
-     * node types are retrieved from the node type manager of the current
-     * session using the supertype names stored in the underlying state.
-     * <p>
-     * The returned array is freshly instantiated and not a part of the
-     * underlying state, so it can be freely modified.
-     *
-     * @return declared supertypes
-     * @see NodeType#getDeclaredSupertypes()
-     */
-    public NodeType[] getDeclaredSupertypes() {
-        Set types = new HashSet();
-        QName[] names = state.getSupertypeNames();
-        for (int i = 0; i < names.length; i++) {
-            types.add(helper.getNodeType(names[i]));
-        }
-        return (NodeType[]) types.toArray(new NodeType[types.size()]);
-    }
-
-    /**
-     * Returns the declared child node definitions of this node type.
-     * The returned child node definitions are SessionNodeDefs instantiated
-     * using the node definition states returned by the underlying node type
-     * state.
-     * <p>
-     * The returned array is freshly instantiated and not a part of the
-     * underlying state, so it can be freely modified.
-     *
-     * @return declared child node definitions
-     * @see SessionNodeDefinition
-     * @see NodeType#getDeclaredChildNodeDefinitions()
-     */
-    public NodeDefinition[] getDeclaredChildNodeDefinitions() {
-        Set definitions = new HashSet();
-        NodeDefinitionState[] states = state.getChildNodeDefinitionStates();
-        for (int i = 0; i < states.length; i++) {
-            definitions.add(new SessionNodeDefinition(helper, this, states[i]));
-        }
-        return (NodeDefinition[])
-            definitions.toArray(new NodeDefinition[definitions.size()]);
-    }
-
-    /**
-     * Returns the declared property definitions of this node type.
-     * The returned property definitions are SessionPropertyDefs instantiated
-     * using the property definition states returned by the underlying
-     * node type state.
-     * <p>
-     * The returned array is freshly instantiated and not a part of the
-     * underlying state, so it can be freely modified.
-     *
-     * @return declared child node definitions
-     * @see SessionPropertyDefinition
-     * @see NodeType#getDeclaredChildNodeDefs()
-     */
-    public PropertyDefinition[] getDeclaredPropertyDefinitions() {
-        Set definitions = new HashSet();
-        PropertyDefinitionState[] states =
-            state.getPropertyDefinitionStates();
-        for (int i = 0; i < states.length; i++) {
-            definitions.add(
-                    new SessionPropertyDefinition(helper, this, states[i]));
-        }
-        return (PropertyDefinition[])
-            definitions.toArray(new PropertyDefinition[definitions.size()]);
-    }
-
-    /**
-     * Compares objects for equality. Returns <code>true</code> if the
-     * given object is a SessionNodeType with the same underlying node
-     * type state and session.
-     * <p>
-     * Note that the node type state class does not override the equals
-     * method and thus the mutable state instances are compared for
-     * reference equality.
-     *
-     * @param that the object to compare this object with
-     * @return <code>true</code> if the objects are equal,
-     *         <code>false</code> otherwise
-     * @see Object#equals(Object)
-     */
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        } else if (that instanceof SessionNodeType) {
-            return state.equals(((SessionNodeType) that).state)
-                && helper.equals(((SessionNodeType) that).helper);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns a hash code for this object. To satisfy the equality
-     * constraints the returned hash code is a combination of the
-     * hash codes of the underlying node type state and session.
-     *
-     * @return hash code
-     * @see Object#hashCode()
-     */
-    public int hashCode() {
-        int code = 17;
-        code = code * 37 + state.hashCode();
-        code = code * 37 + helper.hashCode();
-        return code;
-    }
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.session.nodetype;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.NodeType;
+import javax.jcr.nodetype.PropertyDefinition;
+
+import org.apache.jackrabbit.session.SessionHelper;
+import org.apache.jackrabbit.base.nodetype.BaseNodeType;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.state.nodetype.NodeDefinitionState;
+import org.apache.jackrabbit.state.nodetype.NodeTypeState;
+import org.apache.jackrabbit.state.nodetype.PropertyDefinitionState;
+
+/**
+ * Immutable and session-bound node type frontend. An instance
+ * of this class presents the underlying node type state using
+ * the JCR NodeType interface. This class also contains simple
+ * implementations of the higher-order methods defined by the
+ * NodeType interface.
+ * <p>
+ * By not exposing the setter methods of the underlying state instance,
+ * this class intentionally makes it impossible for a JCR client to modify
+ * node type information.
+ */
+final class SessionNodeType extends BaseNodeType implements NodeType {
+
+    /** The wildcard item definition name. */
+    private static final String WILDCARD = "*";
+
+    /** Helper for accessing the current session. */
+    private final SessionHelper helper;
+
+    /** The underlying node type state. */
+    private final NodeTypeState state;
+
+    /**
+     * Creates a node type frontend that is bound to the
+     * given session and underlying node type state.
+     *
+     * @param helper helper for accessing the current session
+     * @param state underlying node type state
+     */
+    public SessionNodeType(SessionHelper helper, NodeTypeState state) {
+        this.helper = helper;
+        this.state = state;
+    }
+
+    /**
+     * Returns the name of the node type. The returned name is retrieved
+     * from the underlying node type state and converted into a prefixed
+     * JCR name using the namespace mappings of the current session.
+     *
+     * @return node type name
+     * @see NodeType#getName()
+     */
+    public String getName() {
+        return helper.getName(state.getName());
+    }
+
+    /**
+     * Returns the value of the Mixin node type property. The returned
+     * value is retrieved from the underlying node type state.
+     *
+     * @return Mixin property value
+     * @see NodeType#isMixin()
+     */
+    public boolean isMixin() {
+        return state.isMixin();
+    }
+
+    /**
+     * Returns the value of the HasOrderableChildNodes node type property.
+     * The returned value is retrieved from the underlying node type state.
+     *
+     * @return HasOrderableChildNodes property value
+     * @see NodeType#hasOrderableChildNodes()
+     */
+    public boolean hasOrderableChildNodes() {
+        return state.hasOrderableChildNodes();
+    }
+
+    /**
+     * Returns the name of the primary item of this node type.
+     * The returned name is retrieved from the underlying node type state
+     * and converted into a prefixed JCR name using the namespace mappings
+     * of the current session.
+     *
+     * @return primary item name, or <code>null</code> if not specified
+     * @see NodeType#getPrimaryItemName()
+     */
+    public String getPrimaryItemName() {
+        QName name = state.getPrimaryItemName();
+        if (name != null) {
+            return helper.getName(name);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Returns the declared supertypes of this node type. The returned
+     * node types are retrieved from the node type manager of the current
+     * session using the supertype names stored in the underlying state.
+     * <p>
+     * The returned array is freshly instantiated and not a part of the
+     * underlying state, so it can be freely modified.
+     *
+     * @return declared supertypes
+     * @see NodeType#getDeclaredSupertypes()
+     */
+    public NodeType[] getDeclaredSupertypes() {
+        Set types = new HashSet();
+        QName[] names = state.getSupertypeNames();
+        for (int i = 0; i < names.length; i++) {
+            types.add(helper.getNodeType(names[i]));
+        }
+        return (NodeType[]) types.toArray(new NodeType[types.size()]);
+    }
+
+    /**
+     * Returns the declared child node definitions of this node type.
+     * The returned child node definitions are SessionNodeDefs instantiated
+     * using the node definition states returned by the underlying node type
+     * state.
+     * <p>
+     * The returned array is freshly instantiated and not a part of the
+     * underlying state, so it can be freely modified.
+     *
+     * @return declared child node definitions
+     * @see SessionNodeDefinition
+     * @see NodeType#getDeclaredChildNodeDefinitions()
+     */
+    public NodeDefinition[] getDeclaredChildNodeDefinitions() {
+        Set definitions = new HashSet();
+        NodeDefinitionState[] states = state.getChildNodeDefinitionStates();
+        for (int i = 0; i < states.length; i++) {
+            definitions.add(new SessionNodeDefinition(helper, this, states[i]));
+        }
+        return (NodeDefinition[])
+            definitions.toArray(new NodeDefinition[definitions.size()]);
+    }
+
+    /**
+     * Returns the declared property definitions of this node type.
+     * The returned property definitions are SessionPropertyDefs instantiated
+     * using the property definition states returned by the underlying
+     * node type state.
+     * <p>
+     * The returned array is freshly instantiated and not a part of the
+     * underlying state, so it can be freely modified.
+     *
+     * @return declared child node definitions
+     * @see SessionPropertyDefinition
+     * @see NodeType#getDeclaredChildNodeDefs()
+     */
+    public PropertyDefinition[] getDeclaredPropertyDefinitions() {
+        Set definitions = new HashSet();
+        PropertyDefinitionState[] states =
+            state.getPropertyDefinitionStates();
+        for (int i = 0; i < states.length; i++) {
+            definitions.add(
+                    new SessionPropertyDefinition(helper, this, states[i]));
+        }
+        return (PropertyDefinition[])
+            definitions.toArray(new PropertyDefinition[definitions.size()]);
+    }
+
+    /**
+     * Compares objects for equality. Returns <code>true</code> if the
+     * given object is a SessionNodeType with the same underlying node
+     * type state and session.
+     * <p>
+     * Note that the node type state class does not override the equals
+     * method and thus the mutable state instances are compared for
+     * reference equality.
+     *
+     * @param that the object to compare this object with
+     * @return <code>true</code> if the objects are equal,
+     *         <code>false</code> otherwise
+     * @see Object#equals(Object)
+     */
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        } else if (that instanceof SessionNodeType) {
+            return state.equals(((SessionNodeType) that).state)
+                && helper.equals(((SessionNodeType) that).helper);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Returns a hash code for this object. To satisfy the equality
+     * constraints the returned hash code is a combination of the
+     * hash codes of the underlying node type state and session.
+     *
+     * @return hash code
+     * @see Object#hashCode()
+     */
+    public int hashCode() {
+        int code = 17;
+        code = code * 37 + state.hashCode();
+        code = code * 37 + helper.hashCode();
+        return code;
+    }
+
+}

Propchange: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionNodeType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionNodeTypeManager.java
URL: http://svn.apache.org/viewcvs/jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionNodeTypeManager.java?rev=388451&r1=388450&r2=388451&view=diff
==============================================================================
--- jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionNodeTypeManager.java (original)
+++ jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionNodeTypeManager.java Fri Mar 24 00:23:34 2006
@@ -1,121 +1,121 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.session.nodetype;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.jcr.nodetype.NodeTypeIterator;
-import javax.jcr.nodetype.NodeTypeManager;
-
-import org.apache.jackrabbit.base.nodetype.BaseNodeTypeManager;
-import org.apache.jackrabbit.iterator.ArrayNodeTypeIterator;
-import org.apache.jackrabbit.session.SessionHelper;
-import org.apache.jackrabbit.state.nodetype.NodeTypeManagerState;
-import org.apache.jackrabbit.state.nodetype.NodeTypeState;
-
-/**
- * Immutable and session-bound node type manager frontend. An instance
- * of this class presents the underlying node type manager state using
- * the JCR NodeTypeManager interface.
- * <p>
- * By not exposing the setter methods of the underlying state instance,
- * this class intentionally makes it impossible for a JCR client to modify
- * node type information.
- */
-public final class SessionNodeTypeManager extends BaseNodeTypeManager
-        implements NodeTypeManager {
-
-    /** Helper for accessing the current session. */
-    private final SessionHelper helper;
-
-    /** The underlying node type manager state instance. */
-    private final NodeTypeManagerState state;
-
-    /**
-     * Creates a node type manager frontend that is bound to the
-     * given session and underlying node type manager state.
-     *
-     * @param helper helper for accessing the current session
-     * @param state underlying node type manager state
-     */
-    public SessionNodeTypeManager(
-            SessionHelper helper, NodeTypeManagerState state) {
-        this.helper = helper;
-        this.state = state;
-    }
-
-    /**
-     * Returns all available node types. The returned node types are
-     * SessionNodeTypes instantiated using the node type states returned
-     * by the underlying node type manager state.
-     *
-     * @return all node types
-     * @see SessionNodeType
-     * @see NodeTypeManager#getAllNodeTypes()
-     * @see NodeTypeManagerState#getNodeTypeStates()
-     */
-    public NodeTypeIterator getAllNodeTypes() {
-        Set types = new HashSet();
-        NodeTypeState[] states = state.getNodeTypeStates();
-        for (int i = 0; i < states.length; i++) {
-            types.add(new SessionNodeType(helper, states[i]));
-        }
-        return new ArrayNodeTypeIterator(types);
-    }
-
-    /**
-     * Compares objects for equality. Returns <code>true</code> if the
-     * given object is a SessionNodeTypeManager with the same underlying node
-     * type manager state and session.
-     * <p>
-     * Note that the node type manager state class does not override the
-     * equals method and thus the mutable state instances are compared for
-     * reference equality.
-     *
-     * @param that the object to compare this object with
-     * @return <code>true</code> if the objects are equal,
-     *         <code>false</code> otherwise
-     * @see Object#equals(Object)
-     */
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        } else if (that instanceof SessionNodeTypeManager) {
-            return state.equals(((SessionNodeTypeManager) that).state)
-                && helper.equals(((SessionNodeTypeManager) that).helper);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns a hash code for this object. To satisfy the equality
-     * constraints the returned hash code is a combination of the
-     * hash codes of the underlying node type manager state and session.
-     *
-     * @return hash code
-     * @see Object#hashCode()
-     */
-    public int hashCode() {
-        int code = 17;
-        code = code * 37 + state.hashCode();
-        code = code * 37 + helper.hashCode();
-        return code;
-    }
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.session.nodetype;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.jcr.nodetype.NodeTypeIterator;
+import javax.jcr.nodetype.NodeTypeManager;
+
+import org.apache.jackrabbit.base.nodetype.BaseNodeTypeManager;
+import org.apache.jackrabbit.iterator.ArrayNodeTypeIterator;
+import org.apache.jackrabbit.session.SessionHelper;
+import org.apache.jackrabbit.state.nodetype.NodeTypeManagerState;
+import org.apache.jackrabbit.state.nodetype.NodeTypeState;
+
+/**
+ * Immutable and session-bound node type manager frontend. An instance
+ * of this class presents the underlying node type manager state using
+ * the JCR NodeTypeManager interface.
+ * <p>
+ * By not exposing the setter methods of the underlying state instance,
+ * this class intentionally makes it impossible for a JCR client to modify
+ * node type information.
+ */
+public final class SessionNodeTypeManager extends BaseNodeTypeManager
+        implements NodeTypeManager {
+
+    /** Helper for accessing the current session. */
+    private final SessionHelper helper;
+
+    /** The underlying node type manager state instance. */
+    private final NodeTypeManagerState state;
+
+    /**
+     * Creates a node type manager frontend that is bound to the
+     * given session and underlying node type manager state.
+     *
+     * @param helper helper for accessing the current session
+     * @param state underlying node type manager state
+     */
+    public SessionNodeTypeManager(
+            SessionHelper helper, NodeTypeManagerState state) {
+        this.helper = helper;
+        this.state = state;
+    }
+
+    /**
+     * Returns all available node types. The returned node types are
+     * SessionNodeTypes instantiated using the node type states returned
+     * by the underlying node type manager state.
+     *
+     * @return all node types
+     * @see SessionNodeType
+     * @see NodeTypeManager#getAllNodeTypes()
+     * @see NodeTypeManagerState#getNodeTypeStates()
+     */
+    public NodeTypeIterator getAllNodeTypes() {
+        Set types = new HashSet();
+        NodeTypeState[] states = state.getNodeTypeStates();
+        for (int i = 0; i < states.length; i++) {
+            types.add(new SessionNodeType(helper, states[i]));
+        }
+        return new ArrayNodeTypeIterator(types);
+    }
+
+    /**
+     * Compares objects for equality. Returns <code>true</code> if the
+     * given object is a SessionNodeTypeManager with the same underlying node
+     * type manager state and session.
+     * <p>
+     * Note that the node type manager state class does not override the
+     * equals method and thus the mutable state instances are compared for
+     * reference equality.
+     *
+     * @param that the object to compare this object with
+     * @return <code>true</code> if the objects are equal,
+     *         <code>false</code> otherwise
+     * @see Object#equals(Object)
+     */
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        } else if (that instanceof SessionNodeTypeManager) {
+            return state.equals(((SessionNodeTypeManager) that).state)
+                && helper.equals(((SessionNodeTypeManager) that).helper);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Returns a hash code for this object. To satisfy the equality
+     * constraints the returned hash code is a combination of the
+     * hash codes of the underlying node type manager state and session.
+     *
+     * @return hash code
+     * @see Object#hashCode()
+     */
+    public int hashCode() {
+        int code = 17;
+        code = code * 37 + state.hashCode();
+        code = code * 37 + helper.hashCode();
+        return code;
+    }
+
+}

Propchange: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionNodeTypeManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionPropertyDefinition.java
URL: http://svn.apache.org/viewcvs/jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionPropertyDefinition.java?rev=388451&r1=388450&r2=388451&view=diff
==============================================================================
--- jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionPropertyDefinition.java (original)
+++ jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionPropertyDefinition.java Fri Mar 24 00:23:34 2006
@@ -1,95 +1,95 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.session.nodetype;
-
-import javax.jcr.Value;
-import javax.jcr.nodetype.NodeType;
-import javax.jcr.nodetype.PropertyDefinition;
-
-import org.apache.jackrabbit.session.SessionHelper;
-import org.apache.jackrabbit.state.nodetype.PropertyDefinitionState;
-
-/**
- * Immutable and session-bound property definition frontend. An instance
- * of this class presents the underlying property definition state using
- * the JCR PropertyDef interface.
- * <p>
- * By not exposing the setter methods of the underlying state instance,
- * this class intentionally makes it impossible for a JCR client to modify
- * property definition information.
- */
-final class SessionPropertyDefinition extends SessionItemDefinition
-        implements PropertyDefinition {
-
-    /** The underlying property definition state. */
-    private final PropertyDefinitionState state;
-
-    /**
-     * Creates a property definition frontend that is bound to the
-     * given node type, session, and underlying property definition state.
-     *
-     * @param helper helper for accessing the current session
-     * @param type declaring node type
-     * @param state underlying property definition state
-     */
-    public SessionPropertyDefinition(
-            SessionHelper helper, NodeType type, PropertyDefinitionState state) {
-        super(helper, type, state);
-        this.state = state;
-    }
-
-    /**
-     * Returns the required type of the defined property. The returned value
-     * is retrieved from the underlying property definition state.
-     *
-     * @return required property type
-     * @see PropertyDef#getRequiredType()
-     */
-    public int getRequiredType() {
-        return state.getRequiredType();
-    }
-
-    /**
-     * Returns the constraint strings that specify the value constraint
-     * of the defined property. The returned string array is retrieved
-     * from the underlying property definition state, but is not by itself
-     * a part of the state and can thus be modified freely.
-     *
-     * @return value constraint strings
-     * @see PropertyDef#getValueConstraints()
-     */
-    public String[] getValueConstraints() {
-        return null; // TODO: See PropertyDefinitionState
-    }
-
-    /**
-     * Returns the value of the Multiple property definition property.
-     * The returned value is retrieved from the underlying property
-     * definition state.
-     *
-     * @return Multiple property value
-     * @see PropertyDef#isMultiple()
-     */
-    public boolean isMultiple() {
-        return state.isMultiple();
-    }
-
-    /** Not implemented. */
-    public Value[] getDefaultValues() {
-        return null; // TODO
-    }
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.session.nodetype;
+
+import javax.jcr.Value;
+import javax.jcr.nodetype.NodeType;
+import javax.jcr.nodetype.PropertyDefinition;
+
+import org.apache.jackrabbit.session.SessionHelper;
+import org.apache.jackrabbit.state.nodetype.PropertyDefinitionState;
+
+/**
+ * Immutable and session-bound property definition frontend. An instance
+ * of this class presents the underlying property definition state using
+ * the JCR PropertyDef interface.
+ * <p>
+ * By not exposing the setter methods of the underlying state instance,
+ * this class intentionally makes it impossible for a JCR client to modify
+ * property definition information.
+ */
+final class SessionPropertyDefinition extends SessionItemDefinition
+        implements PropertyDefinition {
+
+    /** The underlying property definition state. */
+    private final PropertyDefinitionState state;
+
+    /**
+     * Creates a property definition frontend that is bound to the
+     * given node type, session, and underlying property definition state.
+     *
+     * @param helper helper for accessing the current session
+     * @param type declaring node type
+     * @param state underlying property definition state
+     */
+    public SessionPropertyDefinition(
+            SessionHelper helper, NodeType type, PropertyDefinitionState state) {
+        super(helper, type, state);
+        this.state = state;
+    }
+
+    /**
+     * Returns the required type of the defined property. The returned value
+     * is retrieved from the underlying property definition state.
+     *
+     * @return required property type
+     * @see PropertyDef#getRequiredType()
+     */
+    public int getRequiredType() {
+        return state.getRequiredType();
+    }
+
+    /**
+     * Returns the constraint strings that specify the value constraint
+     * of the defined property. The returned string array is retrieved
+     * from the underlying property definition state, but is not by itself
+     * a part of the state and can thus be modified freely.
+     *
+     * @return value constraint strings
+     * @see PropertyDef#getValueConstraints()
+     */
+    public String[] getValueConstraints() {
+        return null; // TODO: See PropertyDefinitionState
+    }
+
+    /**
+     * Returns the value of the Multiple property definition property.
+     * The returned value is retrieved from the underlying property
+     * definition state.
+     *
+     * @return Multiple property value
+     * @see PropertyDef#isMultiple()
+     */
+    public boolean isMultiple() {
+        return state.isMultiple();
+    }
+
+    /** Not implemented. */
+    public Value[] getDefaultValues() {
+        return null; // TODO
+    }
+}

Propchange: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/session/nodetype/SessionPropertyDefinition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/ItemDefinitionState.java
URL: http://svn.apache.org/viewcvs/jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/ItemDefinitionState.java?rev=388451&r1=388450&r2=388451&view=diff
==============================================================================
--- jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/ItemDefinitionState.java (original)
+++ jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/ItemDefinitionState.java Fri Mar 24 00:23:34 2006
@@ -1,176 +1,176 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.state.nodetype;
-
-import javax.jcr.version.OnParentVersionAction;
-
-import org.apache.jackrabbit.name.QName;
-
-/**
- * Item definition state. This base class contains the common
- * state properties used by both property and node definitions.
- */
-public class ItemDefinitionState implements Comparable {
-
-    /** The qualified name of the defined item. */
-    private QName name = null;
-
-    /** The AutoCreated item definition property. */
-    private boolean autoCreated = false;
-
-    /** The Mandatory item definition property. */
-    private boolean mandatory = false;
-
-    /** The OnParentVersion item definition property. */
-    private int onParentVersion = OnParentVersionAction.COPY;
-
-    /** The Protected item definition property. */
-    private boolean isProtected = false; // avoid the reserved word "protected"
-
-    /**
-     * Returns the qualified name of the defined item.
-     *
-     * @return qualified name
-     */
-    public QName getName() {
-        return name;
-    }
-
-    /**
-     * Sets the qualified name of the defined item.
-     *
-     * @param name new qualified name
-     */
-    public void setName(QName name) {
-        this.name = name;
-    }
-
-    /**
-     * Returns the value of the AutoCreated item definition property.
-     *
-     * @return AutoCreated property value
-     */
-    public boolean isAutoCreated() {
-        return autoCreated;
-    }
-
-    /**
-     * Sets the value of the AutoCreated item definition property.
-     *
-     * @param autoCreated new AutoCreated property value
-     */
-    public void setAutoCreated(boolean autoCreated) {
-        this.autoCreated = autoCreated;
-    }
-
-    /**
-     * Returns the value of the Mandatory item definition property.
-     *
-     * @return Mandatory property value
-     */
-    public boolean isMandatory() {
-        return mandatory;
-    }
-
-    /**
-     * Sets the value of the Mandatory item definition property.
-     *
-     * @param mandatory new Mandatory property value
-     */
-    public void setMandatory(boolean mandatory) {
-        this.mandatory = mandatory;
-    }
-
-    /**
-     * Returns the value of the OnParentVerson item definition property.
-     *
-     * @return OnParentVersion property value
-     */
-    public int getOnParentVersion() {
-        return onParentVersion;
-    }
-
-    /**
-     * Sets the value of the OnParentVersion item definition property.
-     *
-     * @param onParentVersion new OnParentVersion property value
-     */
-    public void setOnParentVersion(int onParentVersion) {
-        this.onParentVersion = onParentVersion;
-    }
-
-    /**
-     * Returns the value of the Protected item definition property.
-     *
-     * @return Protected property value
-     */
-    public boolean isProtected() {
-        return isProtected;
-    }
-
-    /**
-     * Sets the value of the Protected item definition property.
-     *
-     * @param isProtected new Protected property value
-     */
-    public void setProtected(boolean isProtected) {
-        this.isProtected = isProtected;
-    }
-
-    public int compareTo(Object object) {
-        ItemDefinitionState that = (ItemDefinitionState) object;
-        if ((this.name == null) != (that.name == null)) {
-            return (name != null) ? -1 : 1;
-        } else if (this.name != null && this.name.compareTo(that.name) != 0) {
-            return this.name.compareTo(that.name);
-        } else if (this.autoCreated != that.autoCreated) {
-            return autoCreated ? -1 : 1;
-        } else if (this.mandatory != that.mandatory) {
-            return mandatory ? -1 : 1;
-        } else if (this.isProtected != that.isProtected) {
-            return isProtected ? -1 : 1;
-        } else {
-            return this.onParentVersion - that.onParentVersion;
-        }
-    }
-
-    public boolean equals(Object object) {
-        if (this == object) {
-            return true;
-        } else if (object instanceof ItemDefinitionState) {
-            ItemDefinitionState that = (ItemDefinitionState) object;
-            return ((name != null) ? name.equals(that.name) : (that.name == null))
-                && this.autoCreated == that.autoCreated
-                && this.isProtected == that.isProtected
-                && this.mandatory == that.mandatory
-                && this.onParentVersion == that.onParentVersion;
-        } else {
-            return false;
-        }
-    }
-
-    public int hashCode() {
-        int code = 37;
-        code = code * 17 + ((name != null) ? name.hashCode() : 0);
-        code = code * 17 + (autoCreated ? 1 : 0);
-        code = code * 17 + (isProtected ? 1 : 0);
-        code = code * 17 + (mandatory ? 1 : 0);
-        code = code * 17 + onParentVersion;
-        return code;
-    }
-    
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.state.nodetype;
+
+import javax.jcr.version.OnParentVersionAction;
+
+import org.apache.jackrabbit.name.QName;
+
+/**
+ * Item definition state. This base class contains the common
+ * state properties used by both property and node definitions.
+ */
+public class ItemDefinitionState implements Comparable {
+
+    /** The qualified name of the defined item. */
+    private QName name = null;
+
+    /** The AutoCreated item definition property. */
+    private boolean autoCreated = false;
+
+    /** The Mandatory item definition property. */
+    private boolean mandatory = false;
+
+    /** The OnParentVersion item definition property. */
+    private int onParentVersion = OnParentVersionAction.COPY;
+
+    /** The Protected item definition property. */
+    private boolean isProtected = false; // avoid the reserved word "protected"
+
+    /**
+     * Returns the qualified name of the defined item.
+     *
+     * @return qualified name
+     */
+    public QName getName() {
+        return name;
+    }
+
+    /**
+     * Sets the qualified name of the defined item.
+     *
+     * @param name new qualified name
+     */
+    public void setName(QName name) {
+        this.name = name;
+    }
+
+    /**
+     * Returns the value of the AutoCreated item definition property.
+     *
+     * @return AutoCreated property value
+     */
+    public boolean isAutoCreated() {
+        return autoCreated;
+    }
+
+    /**
+     * Sets the value of the AutoCreated item definition property.
+     *
+     * @param autoCreated new AutoCreated property value
+     */
+    public void setAutoCreated(boolean autoCreated) {
+        this.autoCreated = autoCreated;
+    }
+
+    /**
+     * Returns the value of the Mandatory item definition property.
+     *
+     * @return Mandatory property value
+     */
+    public boolean isMandatory() {
+        return mandatory;
+    }
+
+    /**
+     * Sets the value of the Mandatory item definition property.
+     *
+     * @param mandatory new Mandatory property value
+     */
+    public void setMandatory(boolean mandatory) {
+        this.mandatory = mandatory;
+    }
+
+    /**
+     * Returns the value of the OnParentVerson item definition property.
+     *
+     * @return OnParentVersion property value
+     */
+    public int getOnParentVersion() {
+        return onParentVersion;
+    }
+
+    /**
+     * Sets the value of the OnParentVersion item definition property.
+     *
+     * @param onParentVersion new OnParentVersion property value
+     */
+    public void setOnParentVersion(int onParentVersion) {
+        this.onParentVersion = onParentVersion;
+    }
+
+    /**
+     * Returns the value of the Protected item definition property.
+     *
+     * @return Protected property value
+     */
+    public boolean isProtected() {
+        return isProtected;
+    }
+
+    /**
+     * Sets the value of the Protected item definition property.
+     *
+     * @param isProtected new Protected property value
+     */
+    public void setProtected(boolean isProtected) {
+        this.isProtected = isProtected;
+    }
+
+    public int compareTo(Object object) {
+        ItemDefinitionState that = (ItemDefinitionState) object;
+        if ((this.name == null) != (that.name == null)) {
+            return (name != null) ? -1 : 1;
+        } else if (this.name != null && this.name.compareTo(that.name) != 0) {
+            return this.name.compareTo(that.name);
+        } else if (this.autoCreated != that.autoCreated) {
+            return autoCreated ? -1 : 1;
+        } else if (this.mandatory != that.mandatory) {
+            return mandatory ? -1 : 1;
+        } else if (this.isProtected != that.isProtected) {
+            return isProtected ? -1 : 1;
+        } else {
+            return this.onParentVersion - that.onParentVersion;
+        }
+    }
+
+    public boolean equals(Object object) {
+        if (this == object) {
+            return true;
+        } else if (object instanceof ItemDefinitionState) {
+            ItemDefinitionState that = (ItemDefinitionState) object;
+            return ((name != null) ? name.equals(that.name) : (that.name == null))
+                && this.autoCreated == that.autoCreated
+                && this.isProtected == that.isProtected
+                && this.mandatory == that.mandatory
+                && this.onParentVersion == that.onParentVersion;
+        } else {
+            return false;
+        }
+    }
+
+    public int hashCode() {
+        int code = 37;
+        code = code * 17 + ((name != null) ? name.hashCode() : 0);
+        code = code * 17 + (autoCreated ? 1 : 0);
+        code = code * 17 + (isProtected ? 1 : 0);
+        code = code * 17 + (mandatory ? 1 : 0);
+        code = code * 17 + onParentVersion;
+        return code;
+    }
+    
+}

Propchange: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/ItemDefinitionState.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeDefinitionState.java
URL: http://svn.apache.org/viewcvs/jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeDefinitionState.java?rev=388451&r1=388450&r2=388451&view=diff
==============================================================================
--- jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeDefinitionState.java (original)
+++ jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeDefinitionState.java Fri Mar 24 00:23:34 2006
@@ -1,108 +1,108 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.state.nodetype;
-
-import java.util.Arrays;
-
-import org.apache.jackrabbit.name.QName;
-
-/**
- * Node definition state. Instances of this class are used to hold
- * and manage the internal state of node definitions.
- */
-public class NodeDefinitionState extends ItemDefinitionState {
-
-    /** Name of the default primary type of the defined node. */
-    private QName defaultPrimaryTypeName = null;
-
-    /** Names of the required primary types of the defined node. */
-    private QName[] requiredPrimaryTypeNames = new QName[0];
-
-    /** The AllowsSameNameSiblings node definition property. */
-    private boolean allowsSameNameSiblings = false;
-
-    /**
-     * Returns the name of the default primary type of the defined node.
-     *
-     * @return default primary type name
-     */
-    public QName getDefaultPrimaryTypeName() {
-        return defaultPrimaryTypeName;
-    }
-
-    /**
-     * Sets the name of the default primary type of the defined node.
-     *
-     * @param defaultPrimaryType new default primary type name
-     */
-    public void setDefaultPrimaryTypeName(QName defaultPrimaryType) {
-        this.defaultPrimaryTypeName = defaultPrimaryType;
-    }
-
-    /**
-     * Returns the names of the required primary types of the defined node.
-     *
-     * @return type names
-     */
-    public QName[] getRequiredPrimaryTypeNames() {
-        return requiredPrimaryTypeNames;
-    }
-
-    /**
-     * Sets the list of required primary types.
-     *
-     * @param requiredPrimaryTypeNames type names
-     */
-    public void setRequiredPrimaryTypeName(QName[] requiredPrimaryTypeNames) {
-        this.requiredPrimaryTypeNames = requiredPrimaryTypeNames;
-        Arrays.sort(this.requiredPrimaryTypeNames);
-    }
-
-    /**
-     * Returns the value of the AllowsSameNameSiblings node definition property.
-     *
-     * @return AllowsSameNameSiblings property value
-     */
-    public boolean allowsSameNameSiblings() {
-        return allowsSameNameSiblings;
-    }
-
-    /**
-     * Sets the value of the AllowsSameNameSiblings node definition property.
-     *
-     * @param allowsSameNameSiblings new AllowsSameNameSiblings property value
-     */
-    public void setAllowsSameNameSiblings(boolean allowsSameNameSiblings) {
-        this.allowsSameNameSiblings = allowsSameNameSiblings;
-    }
-
-    public boolean equals(Object object) {
-        return (this == object)
-            || (object != null && new StateComparator().compare(this, object) == 0);
-    }
-
-    public int hashCode() {
-        int code = super.hashCode();
-        code = code * 17 + (allowsSameNameSiblings ? 1 : 0);
-        code = code * 17 + ((defaultPrimaryTypeName != null) ? defaultPrimaryTypeName.hashCode() : 0);
-        for (int i = 0; i < requiredPrimaryTypeNames.length; i++) {
-            code = code * 17 + requiredPrimaryTypeNames[i].hashCode();
-        }
-        return code;
-    }
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.state.nodetype;
+
+import java.util.Arrays;
+
+import org.apache.jackrabbit.name.QName;
+
+/**
+ * Node definition state. Instances of this class are used to hold
+ * and manage the internal state of node definitions.
+ */
+public class NodeDefinitionState extends ItemDefinitionState {
+
+    /** Name of the default primary type of the defined node. */
+    private QName defaultPrimaryTypeName = null;
+
+    /** Names of the required primary types of the defined node. */
+    private QName[] requiredPrimaryTypeNames = new QName[0];
+
+    /** The AllowsSameNameSiblings node definition property. */
+    private boolean allowsSameNameSiblings = false;
+
+    /**
+     * Returns the name of the default primary type of the defined node.
+     *
+     * @return default primary type name
+     */
+    public QName getDefaultPrimaryTypeName() {
+        return defaultPrimaryTypeName;
+    }
+
+    /**
+     * Sets the name of the default primary type of the defined node.
+     *
+     * @param defaultPrimaryType new default primary type name
+     */
+    public void setDefaultPrimaryTypeName(QName defaultPrimaryType) {
+        this.defaultPrimaryTypeName = defaultPrimaryType;
+    }
+
+    /**
+     * Returns the names of the required primary types of the defined node.
+     *
+     * @return type names
+     */
+    public QName[] getRequiredPrimaryTypeNames() {
+        return requiredPrimaryTypeNames;
+    }
+
+    /**
+     * Sets the list of required primary types.
+     *
+     * @param requiredPrimaryTypeNames type names
+     */
+    public void setRequiredPrimaryTypeName(QName[] requiredPrimaryTypeNames) {
+        this.requiredPrimaryTypeNames = requiredPrimaryTypeNames;
+        Arrays.sort(this.requiredPrimaryTypeNames);
+    }
+
+    /**
+     * Returns the value of the AllowsSameNameSiblings node definition property.
+     *
+     * @return AllowsSameNameSiblings property value
+     */
+    public boolean allowsSameNameSiblings() {
+        return allowsSameNameSiblings;
+    }
+
+    /**
+     * Sets the value of the AllowsSameNameSiblings node definition property.
+     *
+     * @param allowsSameNameSiblings new AllowsSameNameSiblings property value
+     */
+    public void setAllowsSameNameSiblings(boolean allowsSameNameSiblings) {
+        this.allowsSameNameSiblings = allowsSameNameSiblings;
+    }
+
+    public boolean equals(Object object) {
+        return (this == object)
+            || (object != null && new StateComparator().compare(this, object) == 0);
+    }
+
+    public int hashCode() {
+        int code = super.hashCode();
+        code = code * 17 + (allowsSameNameSiblings ? 1 : 0);
+        code = code * 17 + ((defaultPrimaryTypeName != null) ? defaultPrimaryTypeName.hashCode() : 0);
+        for (int i = 0; i < requiredPrimaryTypeNames.length; i++) {
+            code = code * 17 + requiredPrimaryTypeNames[i].hashCode();
+        }
+        return code;
+    }
+
+}

Propchange: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeDefinitionState.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeTypeManagerState.java
URL: http://svn.apache.org/viewcvs/jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeTypeManagerState.java?rev=388451&r1=388450&r2=388451&view=diff
==============================================================================
--- jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeTypeManagerState.java (original)
+++ jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeTypeManagerState.java Fri Mar 24 00:23:34 2006
@@ -1,46 +1,46 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.state.nodetype;
-
-/**
- * Node type manager state. Instances of this class are used to hold
- * and manage the internal state of node type managers.
- */
-public class NodeTypeManagerState {
-
-    /** Available node type states. */
-    private NodeTypeState[] nodeTypeStates;
-
-    /**
-     * Returns all available node type states.
-     *
-     * @return node type states
-     */
-    public NodeTypeState[] getNodeTypeStates() {
-        return nodeTypeStates;
-    }
-
-    /**
-     * Sets the node type manager state.
-     *
-     * @param nodeTypeStates node type states
-     */
-    public void setNodeTypeStates(NodeTypeState[] nodeTypeStates) {
-        this.nodeTypeStates = nodeTypeStates;
-    }
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.state.nodetype;
+
+/**
+ * Node type manager state. Instances of this class are used to hold
+ * and manage the internal state of node type managers.
+ */
+public class NodeTypeManagerState {
+
+    /** Available node type states. */
+    private NodeTypeState[] nodeTypeStates;
+
+    /**
+     * Returns all available node type states.
+     *
+     * @return node type states
+     */
+    public NodeTypeState[] getNodeTypeStates() {
+        return nodeTypeStates;
+    }
+
+    /**
+     * Sets the node type manager state.
+     *
+     * @param nodeTypeStates node type states
+     */
+    public void setNodeTypeStates(NodeTypeState[] nodeTypeStates) {
+        this.nodeTypeStates = nodeTypeStates;
+    }
+
+}

Propchange: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeTypeManagerState.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeTypeState.java
URL: http://svn.apache.org/viewcvs/jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeTypeState.java?rev=388451&r1=388450&r2=388451&view=diff
==============================================================================
--- jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeTypeState.java (original)
+++ jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeTypeState.java Fri Mar 24 00:23:34 2006
@@ -1,191 +1,191 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.state.nodetype;
-
-import org.apache.jackrabbit.name.QName;
-
-/**
- * Node type state. Instances of this class are used to hold
- * and manage the internal state of node types.
- */
-public class NodeTypeState {
-
-    /** Name of the node type. */
-    private QName name = null;
-
-    /** The Mixin node type property. */
-    private boolean mixin = false;
-
-    /** The HasOrderableChildNodes node type property. */
-    private boolean hasOrderableChildNodes = false;
-
-    /** Name of the primary item of the node type. */
-    private QName primaryItemName = null;
-
-    /** Names of the declared supertypes. */
-    private QName[] supertypeNames = new QName[0];
-
-    /** Child node definition states. */
-    private NodeDefinitionState[] childNodeDefinitionStates =
-        new NodeDefinitionState[0];
-
-    /** Property definition states. */
-    private PropertyDefinitionState[] propertyDefinitionStates =
-        new PropertyDefinitionState[0];
-
-    /**
-     * Returns the node type name.
-     *
-     * @return qualified name
-     */
-    public QName getName() {
-        return name;
-    }
-
-    /**
-     * Sets the node type name.
-     *
-     * @param name new qualified name
-     */
-    public void setName(QName name) {
-        this.name = name;
-    }
-
-    /**
-     * Returns the value of the Mixin node type property.
-     *
-     * @return Mixin property value
-     */
-    public boolean isMixin() {
-        return mixin;
-    }
-
-    /**
-     * Sets the value of the Mixin node type property.
-     *
-     * @param mixin new Mixin property value
-     */
-    public void setMixin(boolean mixin) {
-        this.mixin = mixin;
-    }
-
-    /**
-     * Returns the value of the HasOrderableChildNodes node type property.
-     *
-     * @return HasOrderableChildNodes property value
-     */
-    public boolean hasOrderableChildNodes() {
-        return hasOrderableChildNodes;
-    }
-
-    /**
-     * Sets the value of the HasOrderableChildNodes node type property.
-     *
-     * @param hasOrderableChildNodes new HasOrderableChildNodes property value
-     */
-    public void setHasOrderableChildNodes(boolean hasOrderableChildNodes) {
-        this.hasOrderableChildNodes = hasOrderableChildNodes;
-    }
-
-    /**
-     * Returns the name of the primary item of the node type.
-     *
-     * @return primary item name
-     */
-    public QName getPrimaryItemName() {
-        return primaryItemName;
-    }
-
-    /**
-     * Sets the name of the primary item of the node type.
-     *
-     * @param primaryItemName new primary item name
-     */
-    public void setPrimaryItemName(QName primaryItemName) {
-        this.primaryItemName = primaryItemName;
-    }
-
-    /**
-     * Returns the names of the declared supertypes.
-     *
-     * @return supertype names
-     */
-    public QName[] getSupertypeNames() {
-        return supertypeNames;
-    }
-
-    /**
-     * Sets the list of declared supertypes.
-     *
-     * @param supertypeNames supertype names
-     */
-    public void setSupertypeNames(QName[] supertypeNames) {
-        this.supertypeNames = supertypeNames;
-    }
-
-    /**
-     * Returns the child node definition states of the node type.
-     *
-     * @return child node definition states
-     */
-    public NodeDefinitionState[] getChildNodeDefinitionStates() {
-        return childNodeDefinitionStates;
-    }
-
-    /**
-     * Sets the list of child node definition states of the node type.
-     *
-     * @param childNodeDefinitionStates child node definition states
-     */
-    public void setChildNodeDefinitionStates(
-            NodeDefinitionState[] childNodeDefinitionStates) {
-        this.childNodeDefinitionStates = childNodeDefinitionStates;
-    }
-
-    /**
-     * Returns the property definition states of the node type.
-     *
-     * @return property definition states
-     */
-    public PropertyDefinitionState[] getPropertyDefinitionStates() {
-        return propertyDefinitionStates;
-    }
-
-    /**
-     * Sets the list of property definition states of the node type.
-     *
-     * @param propertyDefinitionStates property definition states
-     */
-    public void setPropertyDefinitionStates(
-            PropertyDefinitionState[] propertyDefinitionStates) {
-        this.propertyDefinitionStates = propertyDefinitionStates;
-    }
-
-    public boolean equals(Object object) {
-        return (this == object)
-            || (object != null && new StateComparator().compare(this, object) == 0);
-    }
-
-    public int hashCode() {
-        int code = 37;
-        code = code * 17 + ((name != null) ? name.hashCode() : 0);
-        code = code * 17 + (mixin ? 1 : 0);
-        code = code * 17 + (hasOrderableChildNodes ? 1 : 0);
-        return code;
-    }
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.state.nodetype;
+
+import org.apache.jackrabbit.name.QName;
+
+/**
+ * Node type state. Instances of this class are used to hold
+ * and manage the internal state of node types.
+ */
+public class NodeTypeState {
+
+    /** Name of the node type. */
+    private QName name = null;
+
+    /** The Mixin node type property. */
+    private boolean mixin = false;
+
+    /** The HasOrderableChildNodes node type property. */
+    private boolean hasOrderableChildNodes = false;
+
+    /** Name of the primary item of the node type. */
+    private QName primaryItemName = null;
+
+    /** Names of the declared supertypes. */
+    private QName[] supertypeNames = new QName[0];
+
+    /** Child node definition states. */
+    private NodeDefinitionState[] childNodeDefinitionStates =
+        new NodeDefinitionState[0];
+
+    /** Property definition states. */
+    private PropertyDefinitionState[] propertyDefinitionStates =
+        new PropertyDefinitionState[0];
+
+    /**
+     * Returns the node type name.
+     *
+     * @return qualified name
+     */
+    public QName getName() {
+        return name;
+    }
+
+    /**
+     * Sets the node type name.
+     *
+     * @param name new qualified name
+     */
+    public void setName(QName name) {
+        this.name = name;
+    }
+
+    /**
+     * Returns the value of the Mixin node type property.
+     *
+     * @return Mixin property value
+     */
+    public boolean isMixin() {
+        return mixin;
+    }
+
+    /**
+     * Sets the value of the Mixin node type property.
+     *
+     * @param mixin new Mixin property value
+     */
+    public void setMixin(boolean mixin) {
+        this.mixin = mixin;
+    }
+
+    /**
+     * Returns the value of the HasOrderableChildNodes node type property.
+     *
+     * @return HasOrderableChildNodes property value
+     */
+    public boolean hasOrderableChildNodes() {
+        return hasOrderableChildNodes;
+    }
+
+    /**
+     * Sets the value of the HasOrderableChildNodes node type property.
+     *
+     * @param hasOrderableChildNodes new HasOrderableChildNodes property value
+     */
+    public void setHasOrderableChildNodes(boolean hasOrderableChildNodes) {
+        this.hasOrderableChildNodes = hasOrderableChildNodes;
+    }
+
+    /**
+     * Returns the name of the primary item of the node type.
+     *
+     * @return primary item name
+     */
+    public QName getPrimaryItemName() {
+        return primaryItemName;
+    }
+
+    /**
+     * Sets the name of the primary item of the node type.
+     *
+     * @param primaryItemName new primary item name
+     */
+    public void setPrimaryItemName(QName primaryItemName) {
+        this.primaryItemName = primaryItemName;
+    }
+
+    /**
+     * Returns the names of the declared supertypes.
+     *
+     * @return supertype names
+     */
+    public QName[] getSupertypeNames() {
+        return supertypeNames;
+    }
+
+    /**
+     * Sets the list of declared supertypes.
+     *
+     * @param supertypeNames supertype names
+     */
+    public void setSupertypeNames(QName[] supertypeNames) {
+        this.supertypeNames = supertypeNames;
+    }
+
+    /**
+     * Returns the child node definition states of the node type.
+     *
+     * @return child node definition states
+     */
+    public NodeDefinitionState[] getChildNodeDefinitionStates() {
+        return childNodeDefinitionStates;
+    }
+
+    /**
+     * Sets the list of child node definition states of the node type.
+     *
+     * @param childNodeDefinitionStates child node definition states
+     */
+    public void setChildNodeDefinitionStates(
+            NodeDefinitionState[] childNodeDefinitionStates) {
+        this.childNodeDefinitionStates = childNodeDefinitionStates;
+    }
+
+    /**
+     * Returns the property definition states of the node type.
+     *
+     * @return property definition states
+     */
+    public PropertyDefinitionState[] getPropertyDefinitionStates() {
+        return propertyDefinitionStates;
+    }
+
+    /**
+     * Sets the list of property definition states of the node type.
+     *
+     * @param propertyDefinitionStates property definition states
+     */
+    public void setPropertyDefinitionStates(
+            PropertyDefinitionState[] propertyDefinitionStates) {
+        this.propertyDefinitionStates = propertyDefinitionStates;
+    }
+
+    public boolean equals(Object object) {
+        return (this == object)
+            || (object != null && new StateComparator().compare(this, object) == 0);
+    }
+
+    public int hashCode() {
+        int code = 37;
+        code = code * 17 + ((name != null) ? name.hashCode() : 0);
+        code = code * 17 + (mixin ? 1 : 0);
+        code = code * 17 + (hasOrderableChildNodes ? 1 : 0);
+        return code;
+    }
+
+}

Propchange: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/NodeTypeState.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/PropertyDefinitionState.java
URL: http://svn.apache.org/viewcvs/jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/PropertyDefinitionState.java?rev=388451&r1=388450&r2=388451&view=diff
==============================================================================
--- jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/PropertyDefinitionState.java (original)
+++ jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/PropertyDefinitionState.java Fri Mar 24 00:23:34 2006
@@ -1,89 +1,89 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.state.nodetype;
-
-import javax.jcr.PropertyType;
-
-/**
- * Property definition state. Instances of this class are used to hold
- * and manage the internal state of property definitions.
- */
-public class PropertyDefinitionState extends ItemDefinitionState {
-
-    /** Required type of the defined property. */
-    private int requiredType = PropertyType.UNDEFINED;
-
-    /** The Multiple property definition property. */
-    private boolean multiple = false;
-
-    /**
-     * Returns the required type of the defined property.
-     *
-     * @return required property type
-     */
-    public int getRequiredType() {
-        return requiredType;
-    }
-
-    /**
-     * Sets the required type of the defined property.
-     *
-     * @param requiredType new required property type
-     */
-    public void setRequiredType(int requiredType) {
-        this.requiredType = requiredType;
-    }
-
-    /**
-     * Returns the value of the Multiple property definition property.
-     *
-     * @return Multiple property value
-     */
-    public boolean isMultiple() {
-        return multiple;
-    }
-
-    /**
-     * Sets the value of the Multiple property definition property.
-     *
-     * @param multiple new Multiple property value
-     */
-    public void setMultiple(boolean multiple) {
-        this.multiple = multiple;
-    }
-
-    public boolean equals(Object object) {
-        if (this == object) {
-            return true;
-        } else if (object instanceof PropertyDefinitionState) {
-            PropertyDefinitionState that = (PropertyDefinitionState) object;
-            return super.equals(that)
-                && this.multiple == that.multiple
-                && this.requiredType == that.requiredType;
-        } else {
-            return false;
-        }
-    }
-
-    public int hashCode() {
-        int code = super.hashCode();
-        code = code * 17 + (multiple ? 1 : 0);
-        code = code * 17 + requiredType;
-        return code;
-    }
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.state.nodetype;
+
+import javax.jcr.PropertyType;
+
+/**
+ * Property definition state. Instances of this class are used to hold
+ * and manage the internal state of property definitions.
+ */
+public class PropertyDefinitionState extends ItemDefinitionState {
+
+    /** Required type of the defined property. */
+    private int requiredType = PropertyType.UNDEFINED;
+
+    /** The Multiple property definition property. */
+    private boolean multiple = false;
+
+    /**
+     * Returns the required type of the defined property.
+     *
+     * @return required property type
+     */
+    public int getRequiredType() {
+        return requiredType;
+    }
+
+    /**
+     * Sets the required type of the defined property.
+     *
+     * @param requiredType new required property type
+     */
+    public void setRequiredType(int requiredType) {
+        this.requiredType = requiredType;
+    }
+
+    /**
+     * Returns the value of the Multiple property definition property.
+     *
+     * @return Multiple property value
+     */
+    public boolean isMultiple() {
+        return multiple;
+    }
+
+    /**
+     * Sets the value of the Multiple property definition property.
+     *
+     * @param multiple new Multiple property value
+     */
+    public void setMultiple(boolean multiple) {
+        this.multiple = multiple;
+    }
+
+    public boolean equals(Object object) {
+        if (this == object) {
+            return true;
+        } else if (object instanceof PropertyDefinitionState) {
+            PropertyDefinitionState that = (PropertyDefinitionState) object;
+            return super.equals(that)
+                && this.multiple == that.multiple
+                && this.requiredType == that.requiredType;
+        } else {
+            return false;
+        }
+    }
+
+    public int hashCode() {
+        int code = super.hashCode();
+        code = code * 17 + (multiple ? 1 : 0);
+        code = code * 17 + requiredType;
+        return code;
+    }
+
+}

Propchange: jackrabbit/branches/1.0/contrib/jcr-ext/src/java/org/apache/jackrabbit/state/nodetype/PropertyDefinitionState.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/1.0/contrib/orm-persistence/project.properties
URL: http://svn.apache.org/viewcvs/jackrabbit/branches/1.0/contrib/orm-persistence/project.properties?rev=388451&r1=388450&r2=388451&view=diff
==============================================================================
--- jackrabbit/branches/1.0/contrib/orm-persistence/project.properties (original)
+++ jackrabbit/branches/1.0/contrib/orm-persistence/project.properties Fri Mar 24 00:23:34 2006
@@ -1,96 +1,96 @@
-#  Copyright 2003-2005 The Apache Software Foundation or its licensors,
-#                      as applicable
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-######################################################################
-# Apache Central Repository
-######################################################################
-maven.repo.central=www.apache.org
-maven.repo.central.directory=/www/www.apache.org/dist/java-repository
-maven.remote.group=apcvs
-maven.changelog.factory = org.apache.maven.svnlib.SvnChangeLogFactory
-
-######################################################################
-# JUnit Testing
-######################################################################
-maven.test.failure = false
-maven.junit.fork=true
-maven.test.search.classdir=true
-maven.junit.jvmargs=-Xmx1024M
-maven.junit.sysproperties=org.xml.sax.driver java.security.auth.login.config
-org.xml.sax.driver=org.apache.xerces.parsers.SAXParser
-java.security.auth.login.config=applications/test/jaas.config
-
-
-#If you wish to skip tests when doing builds, uncomment
-#maven.test.skip = true
-
-######################################################################
-# Checkstyle
-######################################################################
-maven.checkstyle.properties= checkstyle.xml
-maven.linkcheck.enable=false 
-
-######################################################################
-# JavaDoc
-#
-# javadoc urls can be added here, multiple urls are appended using a comma
-#
-# maven.javadoc.links = http://foo/bar/api,\
-#                       http://flim/flam/api/
-######################################################################
-maven.javadoc.links=http://java.sun.com/j2se/1.4.2/docs/api/,\
-                    http://incubator.apache.org/jackrabbit/apidocs/,\
-                    http://www.day.com/maven/jsr170/javadocs/jcr-0.16.1-pfd/
-maven.javadoc.author=false
-maven.javadoc.version=false
-
-######################################################################
-# Other opts
-######################################################################
-# uncomment the next line to work in offline mode (no jar download & no linkcheck)
-#maven.mode.online=
-
-maven.compile.debug=on
-maven.compile.deprecation=off
-maven.compile.optimize=off
-
-maven.jarResources.basedir=src/java
-maven.jar.excludes=**/package.html
-
-# specifying additional remote repository for downloading dependencies 
-# not available at www.ibiblio.org/maven/
-maven.repo.remote = http://www.ibiblio.org/maven/,http://www.day.com/maven/
-
-######################################################################
-# Site L&F
-######################################################################
-# maven.xdoc.jsl=
-maven.xdoc.date=
-maven.xdoc.poweredby.image=maven-feather.png
-maven.xdoc.version=${pom.currentVersion}
-maven.xdoc.developmentProcessUrl=http://incubator.apache.org/projects/jackrabbit.html
-maven.changelog.range=60
-maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
-
-# ------------------------------------------------------------------------
-# M A V E N  J A R  O V E R R I D E
-# ------------------------------------------------------------------------
-#maven.jar.override = on
-#maven.jar.jcr = ${basedir}/lib/jcr.jar
-
-######################################################################
-# Site Deploy (into ../jackrabbit-site for checkout on incubator.apache.org)
-######################################################################
-maven.site.deploy.method=fs
+#  Copyright 2003-2005 The Apache Software Foundation or its licensors,
+#                      as applicable
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+######################################################################
+# Apache Central Repository
+######################################################################
+maven.repo.central=www.apache.org
+maven.repo.central.directory=/www/www.apache.org/dist/java-repository
+maven.remote.group=apcvs
+maven.changelog.factory = org.apache.maven.svnlib.SvnChangeLogFactory
+
+######################################################################
+# JUnit Testing
+######################################################################
+maven.test.failure = false
+maven.junit.fork=true
+maven.test.search.classdir=true
+maven.junit.jvmargs=-Xmx1024M
+maven.junit.sysproperties=org.xml.sax.driver java.security.auth.login.config
+org.xml.sax.driver=org.apache.xerces.parsers.SAXParser
+java.security.auth.login.config=applications/test/jaas.config
+
+
+#If you wish to skip tests when doing builds, uncomment
+#maven.test.skip = true
+
+######################################################################
+# Checkstyle
+######################################################################
+maven.checkstyle.properties= checkstyle.xml
+maven.linkcheck.enable=false 
+
+######################################################################
+# JavaDoc
+#
+# javadoc urls can be added here, multiple urls are appended using a comma
+#
+# maven.javadoc.links = http://foo/bar/api,\
+#                       http://flim/flam/api/
+######################################################################
+maven.javadoc.links=http://java.sun.com/j2se/1.4.2/docs/api/,\
+                    http://incubator.apache.org/jackrabbit/apidocs/,\
+                    http://www.day.com/maven/jsr170/javadocs/jcr-0.16.1-pfd/
+maven.javadoc.author=false
+maven.javadoc.version=false
+
+######################################################################
+# Other opts
+######################################################################
+# uncomment the next line to work in offline mode (no jar download & no linkcheck)
+#maven.mode.online=
+
+maven.compile.debug=on
+maven.compile.deprecation=off
+maven.compile.optimize=off
+
+maven.jarResources.basedir=src/java
+maven.jar.excludes=**/package.html
+
+# specifying additional remote repository for downloading dependencies 
+# not available at www.ibiblio.org/maven/
+maven.repo.remote = http://www.ibiblio.org/maven/,http://www.day.com/maven/
+
+######################################################################
+# Site L&F
+######################################################################
+# maven.xdoc.jsl=
+maven.xdoc.date=
+maven.xdoc.poweredby.image=maven-feather.png
+maven.xdoc.version=${pom.currentVersion}
+maven.xdoc.developmentProcessUrl=http://incubator.apache.org/projects/jackrabbit.html
+maven.changelog.range=60
+maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
+
+# ------------------------------------------------------------------------
+# M A V E N  J A R  O V E R R I D E
+# ------------------------------------------------------------------------
+#maven.jar.override = on
+#maven.jar.jcr = ${basedir}/lib/jcr.jar
+
+######################################################################
+# Site Deploy (into ../jackrabbit-site for checkout on incubator.apache.org)
+######################################################################
+maven.site.deploy.method=fs

Propchange: jackrabbit/branches/1.0/contrib/orm-persistence/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native