[exo-jcr-commits] exo-jcr SVN: r3111 - in jcr/branches/1.12.x: exo.jcr.component.webdav/src/test/resources/conf/test and 1 other directory.

Author: tolusha Date: 2010-09-13 08:10:12 -0400 (Mon, 13 Sep 2010) New Revision: 3111 Modified: jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml Log: JCR-1450: revert changes Modified: jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml 2010-09-13 08:46:50 UTC (rev 3110) +++ jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml 2010-09-13 12:10:12 UTC (rev 3111) @@ -235,240 +235,3 @@ </nodeType> </nodeTypes> -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"> - - <!-- JCR Organization service --> - - <nodeType name="exo:membershipType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:description"> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <nodeType name="exo:userMembership" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:group"> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="exo:group" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:membershipType" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <!-- profile attributes --> - <nodeType name="exo:profileAttributes" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <nodeType name="exo:userProfile" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:attributes"> - <supertypes> - <supertype>nt:unstructured</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="exo:attributes" defaultPrimaryType="exo:profileAttributes" autoCreated="false" mandatory="true" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:profileAttributes</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="exo:user" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:lastName"> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="exo:firstName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:lastName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:password" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:email" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:createdDate" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:lastLoginTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="exo:profile" defaultPrimaryType="exo:userProfile" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:userProfile</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - <childNodeDefinition name="exo:membership" defaultPrimaryType="exo:userMembership" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="true"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:userMembership</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="exo:group" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:label"> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="exo:groupId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:parentId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:label" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <nodeType name="exo:hierarchyGroup" isMixin="false" hasOrderableChildNodes="false"> - <supertypes> - <supertype>exo:group</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="*" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:group</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - - <nodeType name="exo:organizationUsers" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="exo:user" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:user</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="exo:organizationGroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="exo:hierarchyGroup" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:group</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="exo:organizationMembershipTypes" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="exo:membershipType" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:membershipType</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="exo:organizationStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="exo:users" defaultPrimaryType="exo:organizationUsers" autoCreated="false" mandatory="true" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:organizationUsers</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - <childNodeDefinition name="exo:groups" defaultPrimaryType="exo:organizationGroups" autoCreated="false" mandatory="true" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:organizationGroups</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - <childNodeDefinition name="exo:membershipTypes" defaultPrimaryType="exo:organizationMembershipTypes" autoCreated="false" mandatory="true" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:organizationMembershipTypes</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - -</nodeTypes> Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml 2010-09-13 08:46:50 UTC (rev 3110) +++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml 2010-09-13 12:10:12 UTC (rev 3111) @@ -235,240 +235,3 @@ </nodeType> </nodeTypes> -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"> - - <!-- JCR Organization service --> - - <nodeType name="exo:membershipType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:description"> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <nodeType name="exo:userMembership" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:group"> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="exo:group" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:membershipType" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <!-- profile attributes --> - <nodeType name="exo:profileAttributes" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <nodeType name="exo:userProfile" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:attributes"> - <supertypes> - <supertype>nt:unstructured</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="exo:attributes" defaultPrimaryType="exo:profileAttributes" autoCreated="false" mandatory="true" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:profileAttributes</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="exo:user" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:lastName"> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="exo:firstName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:lastName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:password" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:email" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:createdDate" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:lastLoginTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="exo:profile" defaultPrimaryType="exo:userProfile" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:userProfile</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - <childNodeDefinition name="exo:membership" defaultPrimaryType="exo:userMembership" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="true"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:userMembership</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="exo:group" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:label"> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="exo:groupId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:parentId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:label" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <nodeType name="exo:hierarchyGroup" isMixin="false" hasOrderableChildNodes="false"> - <supertypes> - <supertype>exo:group</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="*" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:group</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - - <nodeType name="exo:organizationUsers" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="exo:user" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:user</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="exo:organizationGroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="exo:hierarchyGroup" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:group</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="exo:organizationMembershipTypes" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="exo:membershipType" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:membershipType</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="exo:organizationStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="exo:users" defaultPrimaryType="exo:organizationUsers" autoCreated="false" mandatory="true" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:organizationUsers</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - <childNodeDefinition name="exo:groups" defaultPrimaryType="exo:organizationGroups" autoCreated="false" mandatory="true" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:organizationGroups</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - <childNodeDefinition name="exo:membershipTypes" defaultPrimaryType="exo:organizationMembershipTypes" autoCreated="false" mandatory="true" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:organizationMembershipTypes</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - -</nodeTypes>