From: Richard Millet <richard.millet@berkeley.edu>
Date: Thu, 14 Jul 2011 05:08:20 +0000 (+0000)
Subject: CSPACE-4232: Normalize Nuxeo DocType configuration files into /trunk/3rdparty/nuxeo... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=5307e9894ce63f7a894510462a24deacb87f9e5e;p=tmp%2Fjakarta-migration.git

CSPACE-4232: Normalize Nuxeo DocType configuration files into /trunk/3rdparty/nuxeo source tree directory.
---

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/pom.xml
index 075f78e9c..383baf5d3 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/pom.xml
@@ -15,14 +15,30 @@
         CollectionObject Common Nuxeo document type
     </description>
 
+	<properties>
+		<ServiceName>collectionobject</ServiceName>
+		<NuxeoDocTypeName>CollectionObject</NuxeoDocTypeName>
+		<CommonSchemaName>collectionobjects_common</CommonSchemaName>
+	</properties>
+    
     <build>
+		<resources>
+		  <resource>
+			<directory>src/main/resources</directory>
+			<filtering>true</filtering>
+		  </resource>
+		  <resource>
+			<directory>../../../../3rdparty/nuxeo/nuxeo-doctype/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> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                        <manifestFile>target/classes/META-INF/MANIFEST.MF </manifestFile>
                         <manifestEntries>
                             <Bundle-Version>${eclipseVersion}</Bundle-Version>
                             <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/META-INF/MANIFEST.MF b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index d1b213446..000000000
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0 
-Bundle-ManifestVersion: 1 
-Bundle-Name: org.collectionspace.collectionobject
-Bundle-SymbolicName: org.collectionspace.collectionobject;singleton:=true 
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Bundle-Vendor: Nuxeo 
-Require-Bundle: org.nuxeo.runtime, 
- org.nuxeo.ecm.core.api,
- org.nuxeo.ecm.core,
- org.nuxeo.ecm.webapp.core,
- org.collectionspace.collectionspace_core
-Provide-Package: org.collectionspace.collectionobject
-Nuxeo-Component: OSGI-INF/core-types-contrib.xml,
- OSGI-INF/life-cycle-contrib.xml,
- OSGI-INF/ecm-types-contrib.xml,
- OSGI-INF/layouts-contrib.xml
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml
deleted file mode 100644
index 5a159b676..000000000
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.collectionspace.collectionobject.coreTypes">
-    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-        <schema name="collectionobjects_common" prefix="collectionobjects_common" src="schemas/collectionobjects_common.xsd"/>
-    </extension>
-    <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-        <doctype name="CollectionObject" extends="CollectionSpaceDocument">
-            <schema name="common"/>
-            <schema name="dublincore"/>
-            <schema name="collectionspace_core"/>
-            <schema name="collectionobjects_common"/>			
-            <prefetch>
-                collectionobjects_common:objectNumber
-                collectionobjects_common:objectNameList
-                collectionobjects_common:responsibleDepartments
-			</prefetch>
-        </doctype>
-    </extension>
-</component>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/deployment-fragment.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/deployment-fragment.xml
deleted file mode 100644
index 06404c6a0..000000000
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/deployment-fragment.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<fragment>
-
-  <extension target="application#MODULE">
-    <module>
-      <java>${bundle.fileName}</java>
-    </module>
-  </extension>
-
-</fragment>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/ecm-types-contrib.xml
deleted file mode 100644
index 14b98e49b..000000000
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.collectionspace.collectionobject.ecm.types">
-  <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
-    <type id="CollectionObject" coretype="CollectionObject">
-      <label>org.collectionspace.collectionobject</label>
-      <!--icon>/icons/file.gif</icon-->
-      <default-view>view_documents</default-view>
-
-      <layouts mode="any">
-        <layout>heading</layout>
-        <layout>collectionspace_core</layout>
-        <layout>collectionobjects_common</layout>
-      </layouts>        
-    </type>
-
-    <type id="Folder" coretype="Folder">
-      <subtypes>
-        <type>CollectionObject</type>
-      </subtypes>
-    </type>
-    
-    <type id="Workspace" coretype="Workspace">
-      <subtypes>
-        <type>CollectionObject</type>
-      </subtypes>
-    </type>
-  </extension>
-</component>
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/life-cycle-contrib.xml
deleted file mode 100644
index ca558a2f6..000000000
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject/src/main/resources/OSGI-INF/life-cycle-contrib.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.collectionspace.collectionobjects.ecm.platform.LifeCycleManagerExtensions">
-  <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
-             point="types">
-    <types>
-      <type name="CollectionObject">default</type>
-    </types>
-  </extension>
-</component>
diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
index 4d9a34383..f05d73b3c 100644
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
@@ -15,15 +15,31 @@
     <description>
         Dimension Nuxeo Document Type
     </description>
+	
+	<properties>
+		<ServiceName>dimension</ServiceName>
+		<NuxeoDocTypeName>Dimension</NuxeoDocTypeName>
+		<CommonSchemaName>dimensions_common</CommonSchemaName>
+	</properties>
     
     <build>
+		<resources>
+		  <resource>
+			<directory>src/main/resources</directory>
+			<filtering>true</filtering>
+		  </resource>
+		  <resource>
+			<directory>../../../../3rdparty/nuxeo/nuxeo-doctype/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> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                        <manifestFile>target/classes/META-INF/MANIFEST.MF </manifestFile>
                         <manifestEntries>
                             <Bundle-Version>${eclipseVersion}</Bundle-Version>
                             <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/META-INF/MANIFEST.MF b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 6c2e01ae1..000000000
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0 
-Bundle-ManifestVersion: 1 
-Bundle-Name: NuxeoCS
-Bundle-SymbolicName: org.collectionspace.dimension;singleton:=true 
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Bundle-Vendor: Nuxeo 
-Require-Bundle: org.nuxeo.runtime, 
- org.nuxeo.ecm.core.api,
- org.nuxeo.ecm.core,
- org.nuxeo.ecm.webapp.core,
- org.collectionspace.collectionspace_core
-Provide-Package: org.collectionspace.dimension
-Nuxeo-Component: OSGI-INF/core-types-contrib.xml,
- OSGI-INF/life-cycle-contrib.xml,
- OSGI-INF/ecm-types-contrib.xml,
- OSGI-INF/layouts-contrib.xml
-
diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/core-types-contrib.xml
deleted file mode 100644
index dfc4193cb..000000000
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.collectionspace.dimension.coreTypes">
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="dimensions_common" prefix="dimensions_common" src="schemas/dimensions_common.xsd"/>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="Dimension" extends="Document">
-      <schema name="common"/>
-      <schema name="dublincore"/>
-      <schema name="collectionspace_core"/>
-      <schema name="dimensions_common"/>
-    </doctype>
-  </extension>
-</component>
diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/deployment-fragment.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/deployment-fragment.xml
deleted file mode 100644
index 226075b98..000000000
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/deployment-fragment.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<fragment>
-
-  <extension target="application#MODULE">
-    <module>
-      <java>${bundle.fileName}</java>
-    </module>
-  </extension>
-  
-</fragment>
diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/ecm-types-contrib.xml
deleted file mode 100644
index ed2516fdd..000000000
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.collectionspace.dimension.ecm.types">
-  <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
-    <type id="Dimension" coretype="Dimension">
-      <label>org.collectionspace.dimension</label>
-      <!--icon>/icons/file.gif</icon-->
-      <default-view>view_documents</default-view>
-
-      <layouts mode="any">
-        <layout>heading</layout>
-        <layout>collectionspace_core</layout>
-        <layout>dimension</layout>
-      </layouts>
-    </type>
-
-    <type id="Folder" coretype="Folder">
-      <subtypes>
-        <type>Dimension</type>
-      </subtypes>
-    </type>
-    
-    <type id="Workspace" coretype="Workspace">
-      <subtypes>
-        <type>Dimension</type>
-      </subtypes>
-    </type>
-  </extension>
-</component>
diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/life-cycle-contrib.xml
deleted file mode 100644
index b430dbc0b..000000000
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/life-cycle-contrib.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.collectionspace.ecm.platform.dimension.LifeCycleManagerExtensions">
-
-  <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
-             point="types">
-    <types>
-      <type name="Dimension">default</type>
-    </types>
-  </extension>
-
-</component>