[exo-jcr-commits] exo-jcr SVN: r1056 - in jcr/branches/1.12.0-OPT/exo.jcr.component.core: src/test/resources/conf/test and 1 other directory.

Author: tolusha Date: 2009-12-15 07:31:47 -0500 (Tue, 15 Dec 2009) New Revision: 1056 Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/TCK.sh jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-config-extended.xml jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-config.xml jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-usecase.xml Log: EXOJCR-300: remove unused Node Types Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/TCK.sh =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/TCK.sh 2009-12-15 12:00:57 UTC (rev 1055) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/TCK.sh 2009-12-15 12:31:47 UTC (rev 1056) @@ -1,2 +1,2 @@ MAVEN_OPTS="-Duser.language=en -Duser.region=us -Dmaven.test.skip=false -DforkMode=never -Dorg.exoplatform.jcr.monitor.jdbcMonitor $MAVEN_OPTS " -mvn $MAVEN_OPTS clean test -Prun-tck +mvn clean test -Prun-tck Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-config-extended.xml =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-config-extended.xml 2009-12-15 12:00:57 UTC (rev 1055) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-config-extended.xml 2009-12-15 12:31:47 UTC (rev 1056) @@ -151,50 +151,6 @@ </childNodeDefinitions> </nodeType> - <nodeType name="exo:relationable" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> - <propertyDefinitions> - <propertyDefinition name="exo:relation" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="true"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <nodeType name="exo:rss-enable" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> - <propertyDefinitions> - <propertyDefinition name="exo:title" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:summary" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <nodeType name="exo:article" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - <supertype>exo:rss-enable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="exo:text" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="nt:file" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - sameNameSiblings="true"> - <requiredPrimaryTypes> - <requiredPrimaryType>nt:file</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - <nodeType name="exo:tab" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> <supertype>nt:base</supertype> @@ -231,28 +187,6 @@ </childNodeDefinitions> </nodeType> - <nodeType name="exo:published" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> - <propertyDefinitions> - <propertyDefinition name="exo:startPublication" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:endPublication" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <nodeType name="exo:categorized" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> - <propertyDefinitions> - <propertyDefinition name="exo:category" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="true"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - <nodeType name="exo:template" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> <supertype>nt:base</supertype> @@ -457,52 +391,6 @@ </childNodeDefinitions> --> </nodeType> - <nodeType name="exo:sample" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>exo:rss-enable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="exo:title" requiredType="String" autoCreated="false" mandatory="false" 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> - <propertyDefinition name="exo:date" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:datetime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:summary" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:content" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="nt:file" autoCreated="false" mandatory="false" onParentVersion="VERSION" - protected="false" sameNameSiblings="true"> - <requiredPrimaryTypes> - <requiredPrimaryType>nt:file</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - <childNodeDefinition name="exo:image" defaultPrimaryType="nt:resource" autoCreated="false" mandatory="false" onParentVersion="VERSION" - protected="false" sameNameSiblings="true"> - <requiredPrimaryTypes> - <requiredPrimaryType>nt:resource</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> <nodeType name="exo:watchable" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> @@ -634,71 +522,6 @@ </propertyDefinitions> </nodeType> - <nodeType name="exo:folksonomized" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> - <propertyDefinitions> - <propertyDefinition name="exo:folksonomy" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="true"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <nodeType name="exo:schedulableInfo" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> - <propertyDefinitions> - <propertyDefinition name="exo:scheduledInitiator" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:jobName" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:jobGroup" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:jobClass" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:jobDescription" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:scheduleType" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:startTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:endTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:repeatCount" requiredType="Long" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:timeInterval" requiredType="Long" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:cronExpression" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:counter" requiredType="Long" autoCreated="true" mandatory="true" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - <defaultValues> - <defaultValue>0</defaultValue> - </defaultValues> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - <nodeType name="mix:i18n" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> <propertyDefinitions> <propertyDefinition name="exo:language" requiredType="String" autoCreated="true" mandatory="false" onParentVersion="COPY" protected="false" Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-config.xml =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-config.xml 2009-12-15 12:00:57 UTC (rev 1055) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-config.xml 2009-12-15 12:31:47 UTC (rev 1056) @@ -102,41 +102,6 @@ </childNodeDefinitions> </nodeType> - <!-- exo:actions property will be used to store all actions that reference to this node --> - <nodeType name="exo:actionable" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> - <propertyDefinitions> - <propertyDefinition name="exo:actions" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="" autoCreated="false" mandatory="false" onParentVersion="VERSION" protected="false" - sameNameSiblings="true"> - <requiredPrimaryTypes> - <requiredPrimaryType>exo:actionStorage</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="exo:move" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> - <propertyDefinitions> - <propertyDefinition name="exo:repository" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:destWorkspace" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:destPath" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - <nodeType name="mix:title" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> <propertyDefinitions> <propertyDefinition name="jcr:title" requiredType="String" autoCreated="false" mandatory="false" Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-usecase.xml =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-usecase.xml 2009-12-15 12:00:57 UTC (rev 1055) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-usecase.xml 2009-12-15 12:31:47 UTC (rev 1056) @@ -33,102 +33,7 @@ </propertyDefinitions> </nodeType> - <nodeType name="rma:record" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>mix:referenceable</supertype> - <supertype>exo:metadata</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="rma:recordIdentifier" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="rma:subject" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="rma:format" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="rma:mediaFormat" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="rma:dateFiled" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="rma:publicationDate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="rma:dateReceived" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="rma:originator" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="rma:originatingOrganization" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="rma:addressees" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="rma:otherAddressees" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="rma:supplementalMArkingList" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="rma:isObsolete" requiredType="Boolean" autoCreated="true" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - <defaultValues> - <defaultValue>false</defaultValue> - </defaultValues> - </propertyDefinition> - <propertyDefinition name="rma:superseded" requiredType="Reference" autoCreated="true" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - <defaultValues> - <defaultValue>false</defaultValue> - </defaultValues> - </propertyDefinition> - <propertyDefinition name="rma:recordNote" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:internalUse" requiredType="Boolean" autoCreated="true" mandatory="false" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - <defaultValues> - <defaultValue>true</defaultValue> - </defaultValues> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - <!-- audit nodetypes --> - - <nodeType name="exo:auditable" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="exo:auditHistory" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="true" multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - <nodeType name="exo:auditRecord" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> <supertype>nt:base</supertype> @@ -232,25 +137,4 @@ </propertyDefinitions> </nodeType> - <nodeType name="exo:archiveable" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> - <propertyDefinitions> - <propertyDefinition name="exo:restorePath" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - <nodeType name="exo:rss-enable" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> - <propertyDefinitions> - <propertyDefinition name="exo:title" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - <propertyDefinition name="exo:summary" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - multiple="false"> - <valueConstraints /> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - </nodeTypes>