From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 23 May 2013 20:09:58 +0000 (-0700)
Subject: CSPACE-6007: Remove SMK extension schema.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d7f69c507575cea3011695f1e4fa9fe96f807f2f;p=tmp%2Fjakarta-migration.git

CSPACE-6007: Remove SMK extension schema.
---

diff --git a/services/citation/3rdparty/build.xml b/services/citation/3rdparty/build.xml
index 6f1d14665..5e8be50b9 100644
--- a/services/citation/3rdparty/build.xml
+++ b/services/citation/3rdparty/build.xml
@@ -111,25 +111,21 @@
     <target name="deploy" depends="install"
     description="deploy citation in ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-citation/build.xml" target="deploy" inheritall="false"/>
-    	<ant antfile="nuxeo-platform-cs-citation-smk/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
     description="undeploy citation from ${jee.server.nuxeo}">
         <ant antfile="nuxeo-platform-cs-citation/build.xml" target="undeploy" inheritall="false"/>
-		<ant antfile="nuxeo-platform-cs-citation-smk/build.xml" target="undeploy" inheritall="false"/>
    </target>
 
     <target name="dist"
     description="generate distribution for citation" depends="package">
         <ant antfile="nuxeo-platform-cs-citation/build.xml" target="dist" inheritall="false"/>
-	 	<ant antfile="nuxeo-platform-cs-citation-smk/build.xml" target="dist" inheritall="false"/> 
     </target>
     
     <target name="dist_installer"
     description="generate distribution for collectionobject" depends="package">
         <ant antfile="nuxeo-platform-cs-citation/build.xml" target="dist_installer" inheritall="false"/>
-		<ant antfile="nuxeo-platform-cs-citation-smk/build.xml" target="dist_installer" inheritall="false"/> 
    </target>
 
 </project>
diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/build.xml b/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/build.xml
deleted file mode 100644
index 312998a18..000000000
--- a/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/build.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-
-<project name="nuxeo-platform-cs-citation-smk" default="package" basedir=".">
-    <description>
-        citation nuxeo document type for smk tenant
-    </description>
-    <!-- set global properties for this build -->
-    <property name="services.trunk" value="../../../.."/>
-    <!-- environment should be declared before reading build.properties -->
-    <property environment="env" />
-    <property file="${services.trunk}/build.properties" />
-    <property name="mvn.opts" value="-V" />
-    <property name="src" location="src"/>
-    <property name="nuxeo.citation.jar"
-        value="org.collectionspace.services.citation.3rdparty.smk.nuxeo-${cspace.release}.jar"/>
-    <property name="nuxeo.citation.jars.all"
-        value="org.collectionspace.services.citation.3rdparty.*.nuxeo-*.jar"/>
-
-    <condition property="osfamily-unix">
-        <os family="unix" />
-    </condition>
-    <condition property="osfamily-windows">
-        <os family="windows" />
-    </condition>
-
-    <target name="init" >
-        <!-- Create the time stamp -->
-        <tstamp/>
-    </target>
-
-    <target name="package" depends="package-unix,package-windows"
-        description="Package CollectionSpace Services" />
-    <target name="package-unix" if="osfamily-unix">
-        <exec executable="mvn" failonerror="true">
-            <arg value="package" />
-            <arg value="-Dmaven.test.skip=true" />
-            <arg value="-f" />
-            <arg value="${basedir}/pom.xml" />
-            <arg value="-N" />
-            <arg value="${mvn.opts}" />
-        </exec>
-    </target>
-    <target name="package-windows" if="osfamily-windows">
-        <exec executable="cmd" failonerror="true">
-            <arg value="/c" />
-            <arg value="mvn.bat" />
-            <arg value="package" />
-            <arg value="-Dmaven.test.skip=true" />
-            <arg value="-f" />
-            <arg value="${basedir}/pom.xml" />
-            <arg value="-N" />
-            <arg value="${mvn.opts}" />
-        </exec>
-    </target>
-
-    <target name="install" depends="install-unix,install-windows"
-        description="Install" />
-    <target name="install-unix" if="osfamily-unix">
-        <exec executable="mvn" failonerror="true">
-            <arg value="install" />
-            <arg value="-Dmaven.test.skip=true" />
-            <arg value="-f" />
-            <arg value="${basedir}/pom.xml" />
-            <arg value="-N" />
-            <arg value="${mvn.opts}" />
-        </exec>
-    </target>
-    <target name="install-windows" if="osfamily-windows">
-        <exec executable="cmd" failonerror="true">
-            <arg value="/c" />
-            <arg value="mvn.bat" />
-            <arg value="install" />
-            <arg value="-Dmaven.test.skip=true" />
-            <arg value="-f" />
-            <arg value="${basedir}/pom.xml" />
-            <arg value="-N" />
-            <arg value="${mvn.opts}" />
-        </exec>
-    </target>
-
-    <target name="clean" depends="clean-unix,clean-windows"
-        description="Delete target directories" >
-        <delete dir="${build}"/>
-    </target>
-    <target name="clean-unix" if="osfamily-unix">
-        <exec executable="mvn" failonerror="true">
-            <arg value="clean" />
-            <arg value="${mvn.opts}" />
-        </exec>
-    </target>
-    <target name="clean-windows" if="osfamily-windows">
-        <exec executable="cmd" failonerror="true">
-            <arg value="/c" />
-            <arg value="mvn.bat" />
-            <arg value="clean" />
-            <arg value="${mvn.opts}" />
-        </exec>
-    </target>
-
-    <target name="test" depends="test-unix,test-windows" description="Run tests" />
-    <target name="test-unix" if="osfamily-unix">
-        <exec executable="mvn" failonerror="true">
-            <arg value="test" />
-            <arg value="${mvn.opts}" />
-        </exec>
-    </target>
-    <target name="test-windows" if="osfamily-windows">
-        <exec executable="cmd" failonerror="true">
-            <arg value="/c" />
-            <arg value="mvn.bat" />
-            <arg value="test" />
-            <arg value="${mvn.opts}" />
-        </exec>
-    </target>
-
-    <target name="deploy" depends="install"
-        description="deploy citation doctype in ${jee.server.nuxeo}">
-        <copy file="${basedir}/target/${nuxeo.citation.jar}"
-        todir="${jee.deploy.nuxeo.plugins}"/>
-    </target>
-
-    <target name="undeploy"
-        description="undeploy citation doctype from ${jee.server.nuxeo}">
-        <delete>
-            <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="${nuxeo.citation.jars.all}"/>
-            </fileset>
-        </delete>
-    </target>
-
-    <target name="dist"
-        description="generate distribution for citation doctype" depends="package">
-        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
-            <fileset file="${basedir}/target/${nuxeo.citation.jar}"/>
-        </copy>
-    </target>
-
-    <target name="dist_installer"
-    	description="Creates an installer distribution for citation doctype" depends="package">
-        <copy todir="${services.trunk}/${dist.installer.services}/citation/nuxeo">
-            <fileset file="${basedir}/target/${nuxeo.citation.jar}"/>
-        </copy>
-    </target>
-
-</project>
-
diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/pom.xml b/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/pom.xml
deleted file mode 100644
index 316686efe..000000000
--- a/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.citation.3rdparty</artifactId>
-        <version>3.2.3-SNAPSHOT</version>
-    </parent>
-    
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
-    <artifactId>org.collectionspace.services.citation.3rdparty.smk.nuxeo</artifactId>
-    <name>services.citation.3rdparty.smk.nuxeo</name>
-    <packaging>jar</packaging>
-    <description>
-        Citation Nuxeo Document Type for smk tenant
-    </description>
-    
-    <properties>
-	    <CustomSchemaName>citations_smk</CustomSchemaName>
-	    <TenantId>5</TenantId>
-	    <TenantLabel>smk</TenantLabel>
-	</properties>
-    
-    <build>
-        <resources>
-	        <resource>
-	            <directory>../../../../3rdparty/nuxeo/nuxeo-doctype/src/main/resources</directory>
-	            <filtering>true</filtering>
-	        </resource>
-	        <resource>
-	            <directory>../../../../3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources</directory>
-	            <filtering>true</filtering>
-	        </resource>
-	        <resource>
-	            <directory>src/main/resources</directory>
-	            <filtering>true</filtering>
-	        </resource>
-	    </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
-                        <manifestEntries>
-                            <Bundle-Version>${eclipseVersion}</Bundle-Version>
-                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/src/main/resources/schemas/citations_smk.xsd b/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/src/main/resources/schemas/citations_smk.xsd
deleted file mode 100644
index 5d173e6f0..000000000
--- a/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/src/main/resources/schemas/citations_smk.xsd
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-    Citation schema (XSD)
-    
-    Entity  : Citation
-    Part    : Local - smk
-    Used for: Nuxeo EP core document type
-    
-    $LastChangedRevision: 860 $
-    $LastChangedDate: 2009-10-14 14:48:05 -0700 (Wed, 14 Oct 2009) $
--->
-
-<xs:schema 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:ns="http://collectionspace.org/services/citation/local/smk"
-  xmlns="http://collectionspace.org/services/citation/local/smk"
-  targetNamespace="http://collectionspace.org/services/citation/local/smk"
-  version="0.1"
->
-
-
-	<xs:element name="smkCitationPublicationInfoGroupList" type="smkCitationPublicationInfoGroupList" />
-    
-    <xs:complexType name="smkCitationPublicationInfoGroupList">
-        <xs:sequence>
-            <xs:element name="smkCitationPublicationInfoGroup" type="smkCitationPublicationInfoGroup" minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-    
-    <xs:complexType name="smkCitationPublicationInfoGroup">
-        <xs:sequence>
-        	<xs:element name="smkPublisher" type="xs:string"/>
-            <xs:element name="smkPlace" type="xs:string"/>
-            <xs:element name="smkPublicationDate" type="smkStructuredDateSMKGroup" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="smkEdition" type="xs:string"/>
-            <xs:element name="smkPages" type="xs:string"/>
-        </xs:sequence>
-    </xs:complexType>
-    
-    
-  <xs:element name="smkCitationResourceIdentGroupList" type="smkCitationResourceIdentGroupList" />
-    
-    <xs:complexType name="smkCitationResourceIdentGroupList">
-        <xs:sequence>
-            <xs:element name="smkCitationResourceIdentGroup" type="smkCitationResourceIdentGroup" minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-    
-    <xs:complexType name="smkCitationResourceIdentGroup">
-        <xs:sequence>
-        	<xs:element name="smkResourceIdent" type="xs:string"/>
-            <xs:element name="smkType" type="xs:string"/>            
-            <xs:element name="smkCaptureDate" type="smkStructuredDateSMKGroup" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-        
-    <xs:complexType name="smkStructuredDateSMKGroup">
-        <xs:sequence>          
-            <xs:element name="dateSMKDisplayText" type="xs:string"/>
-            <xs:element name="dateSMKDisplayEngText" type="xs:string"/>
-            <xs:element name="dateSMKDateDay" type="xs:string"/>
-            <xs:element name="dateSMKDateMonth" type="xs:string"/>
-            <xs:element name="dateSMKDateYear" type="xs:string"/>
-            <xs:element name="dateSMKEraSelector" type="xs:string"/>
-            <xs:element name="dateSMKSecondDateDay" type="xs:string"/>
-            <xs:element name="dateSMKSecondDateMonth" type="xs:string"/>
-            <xs:element name="dateSMKSecondDateYear" type="xs:string"/>
-            <xs:element name="dateSMKSecondEraSelector" type="xs:string"/>            
-            <xs:element name="dateSMKThirdDateDay" type="xs:string"/>
-            <xs:element name="dateSMKThirdDateMonth" type="xs:string"/>
-            <xs:element name="dateSMKThirdDateYear" type="xs:string"/>
-            <xs:element name="dateSMKThirdEraSelector" type="xs:string"/>            
-            <xs:element name="dateSMKSegmentSelector" type="xs:string"/>
-            <xs:element name="dateSMKTypeSelector" type="xs:string"/> 
-            <xs:element name="dateSMKLatestScalarValue" type="xs:date"/>
-            <xs:element name="dateSMKEarliestScalarValue" type="xs:date"/> 
-            <xs:element name="scalarValuesComputed" type="xs:boolean"/>                                  	
-        </xs:sequence>
-    </xs:complexType> 	 	 	 
-
-</xs:schema>
-
diff --git a/services/citation/3rdparty/pom.xml b/services/citation/3rdparty/pom.xml
index 294b2376e..7df425d07 100644
--- a/services/citation/3rdparty/pom.xml
+++ b/services/citation/3rdparty/pom.xml
@@ -25,7 +25,6 @@
 	</properties>
 
     <modules>
-        <module>nuxeo-platform-cs-citation</module>
-        <module>nuxeo-platform-cs-citation-smk</module>     
+        <module>nuxeo-platform-cs-citation</module>     
     </modules>
 </project>
diff --git a/services/citation/jaxb/src/main/resources/citations_smk.xsd b/services/citation/jaxb/src/main/resources/citations_smk.xsd
deleted file mode 100644
index ede4e251b..000000000
--- a/services/citation/jaxb/src/main/resources/citations_smk.xsd
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
-    citation schema (XSD)
-    
-    Entity  : citation
-    Part    : Domain - SMK
-    Used for: JAXB binding between XML and Java objects
-
-    $LastChangedRevision: 987 $
-    $LastChangedDate: 2009-11-30 23:06:32 +0100 (Mon, 30 Nov 2009) $
--->
-
-<xs:schema 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:ns="http://collectionspace.org/services/citation/local/smk"
-  xmlns="http://collectionspace.org/services/citation/local/smk"
-  targetNamespace="http://collectionspace.org/services/citation/local/smk"
-  version="0.1"
->
-    <!-- citations for smk-->
-    <xs:element name="citations_smk">
-        <xs:complexType>
-            <xs:sequence>				
-    		    <xs:element name="smkCitationPublicationInfoGroupList" type="smkCitationPublicationInfoGroupList" />
-    		    <xs:element name="smkCitationResourceIdentGroupList" type="smkCitationResourceIdentGroupList" />
-             </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-  
-    <xs:complexType name="smkCitationPublicationInfoGroupList">
-        <xs:sequence>
-            <xs:element name="smkCitationPublicationInfoGroup" type="smkCitationPublicationInfoGroup" minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-    
-    <xs:complexType name="smkCitationPublicationInfoGroup">
-        <xs:sequence>
-        	<xs:element name="smkPublisher" type="xs:string"/>
-            <xs:element name="smkPlace" type="xs:string"/>
-            <xs:element name="smkPublicationDate" type="smkStructuredDateSMKGroup" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="smkEdition" type="xs:string"/>
-            <xs:element name="smkPages" type="xs:string"/>
-        </xs:sequence>
-    </xs:complexType>
-    
-    <xs:complexType name="smkCitationResourceIdentGroupList">
-        <xs:sequence>
-            <xs:element name="smkCitationResourceIdentGroup" type="smkCitationResourceIdentGroup" minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-    
-    <xs:complexType name="smkCitationResourceIdentGroup">
-        <xs:sequence>
-        	<xs:element name="smkResourceIdent" type="xs:string"/>
-            <xs:element name="smkType" type="xs:string"/>            
-            <xs:element name="smkCaptureDate" type="smkStructuredDateSMKGroup" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-        
-    <xs:complexType name="smkStructuredDateSMKGroup">
-        <xs:sequence>          
-            <xs:element name="dateSMKDisplayText" type="xs:string"/>
-            <xs:element name="dateSMKDisplayEngText" type="xs:string"/>
-            <xs:element name="dateSMKDateDay" type="xs:string"/>
-            <xs:element name="dateSMKDateMonth" type="xs:string"/>
-            <xs:element name="dateSMKDateYear" type="xs:string"/>
-            <xs:element name="dateSMKEraSelector" type="xs:string"/>
-            <xs:element name="dateSMKSecondDateDay" type="xs:string"/>
-            <xs:element name="dateSMKSecondDateMonth" type="xs:string"/>
-            <xs:element name="dateSMKSecondDateYear" type="xs:string"/>
-            <xs:element name="dateSMKSecondEraSelector" type="xs:string"/>            
-            <xs:element name="dateSMKThirdDateDay" type="xs:string"/>
-            <xs:element name="dateSMKThirdDateMonth" type="xs:string"/>
-            <xs:element name="dateSMKThirdDateYear" type="xs:string"/>
-            <xs:element name="dateSMKThirdEraSelector" type="xs:string"/>            
-            <xs:element name="dateSMKSegmentSelector" type="xs:string"/>
-            <xs:element name="dateSMKTypeSelector" type="xs:string"/>
-            <xs:element name="dateSMKLatestScalarValue" type="xs:date"/> 
-            <xs:element name="dateSMKEarliestScalarValue" type="xs:date"/> 
-            <xs:element name="scalarValuesComputed" type="xs:boolean"/>                                  	
-        </xs:sequence>
-    </xs:complexType>
-
-</xs:schema>
\ No newline at end of file