CSPACE-5300: Modified the Group and ObjectExit nuxeo document types to inherit from...

diff --git a/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/core-types-contrib.xml b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/core-types-contrib.xml
index 3c8e366e6183736ee6a67574c7f60040d226b19f..bf3b39aa52332297867bcac2e6d3d69519a060e5 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-doctype-custom/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0"?>
 <component name="org.collectionspace.${ServiceName}.${TenantLabel}.coreTypes">
-       <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-               <schema name="${CustomSchemaName}" prefix="${CustomSchemaName}" src="schemas/${CustomSchemaName}.xsd"/>
+       <extension target="org.nuxeo.ecm.core.schema.TypeService"
+               point="schema">
+               <schema name="${CustomSchemaName}" prefix="${CustomSchemaName}"
+                       src="schemas/${CustomSchemaName}.xsd" />
        </extension>
-       <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-               <doctype name="${NuxeoDocTypeName}${TenantPrefix}${TenantId}" extends="${NuxeoDocTypeName}">
-                       <schema name="common"/>
-                       <schema name="dublincore"/>
-                       <schema name="collectionspace_core"/>
-                       <schema name="${CommonSchemaName}"/>
-                       <schema name="${CustomSchemaName}"/>
+       <extension target="org.nuxeo.ecm.core.schema.TypeService"
+               point="doctype">
+               <doctype name="${NuxeoDocTypeName}${TenantPrefix}${TenantId}"
+                       extends="${NuxeoDocTypeName}">
+                       <schema name="common" />
+                       <schema name="dublincore" />
+                       <schema name="collectionspace_core" />
+                       <schema name="${CommonSchemaName}" />
+                       <schema name="${CustomSchemaName}" />
                </doctype>
        </extension>
-       </component>
+</component>

diff --git a/3rdparty/nuxeo/nuxeo-doctype/src/main/resources/OSGI-INF/core-types-contrib.xml b/3rdparty/nuxeo/nuxeo-doctype/src/main/resources/OSGI-INF/core-types-contrib.xml
index 25996149a7076d784a4855c36906b54e50d7c1bf..d7e30e6300e53e14019099d6368128d8bd5318ea 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-doctype/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-doctype/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0"?>
 <component name="org.collectionspace.${ServiceName}.coreTypes">
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="${CommonSchemaName}" prefix="${CommonSchemaName}" src="schemas/${CommonSchemaName}.xsd"/>
-  </extension>
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="${NuxeoDocTypeName}" extends="CollectionSpaceDocument">
-      <schema name="common"/>
-      <schema name="dublincore"/>
-      <schema name="collectionspace_core"/>
-      <schema name="${CommonSchemaName}"/>
-    </doctype>
-  </extension>
+       <extension target="org.nuxeo.ecm.core.schema.TypeService"
+               point="schema">
+               <schema name="${CommonSchemaName}" prefix="${CommonSchemaName}"
+                       src="schemas/${CommonSchemaName}.xsd" />
+       </extension>
+       <extension target="org.nuxeo.ecm.core.schema.TypeService"
+               point="doctype">
+               <doctype name="${NuxeoDocTypeName}" extends="CollectionSpaceDocument">
+                       <schema name="common" />
+                       <schema name="dublincore" />
+                       <schema name="collectionspace_core" />
+                       <schema name="${CommonSchemaName}" />
+               </doctype>
+       </extension>
 </component>

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
index afd1e00a23f9c2f592ed611d279f0db69defb1ba..629a1c5832b98cec4612bd5be00e1d840dffec1f 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
@@ -33,6 +33,7 @@
          File below this line have been ported. -->\r
     <!-- ============================================= -->\r
     \r
+<!--     \r
     <run controlFile="./security.xml" testGroup="deleteBug" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="makeone" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="checkList" />\r
@@ -43,11 +44,13 @@
     <run controlFile="acquisitions/acquisitions.xml" testGroup="makeone" />\r
     <run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />\r
     <run controlFile="relation/relation.xml" testGroup="makeRelations" />\r
+ -->    \r
 \r
 <!-- No - this test is broken\r
        <run controlFile="relation/relation.xml" testGroup="r2only" />\r
 -->\r
 \r
+<!-- \r
     <run controlFile="person/person.xml" testGroup="postPerson" />\r
     <run controlFile="person/person.xml" testGroup="updatePerson" />\r
     <run controlFile="person/person.xml" testGroup="PersonAddRelsDeleteRels" />\r
@@ -61,6 +64,7 @@
     <run controlFile="vocabulary/vocabulary.xml" testGroup="TestOrder" />\r
     <run controlFile="authrefs/authrefsSimple.xml" testGroup="AuthRefsSimple" />\r
     <run controlFile="authrefs/authrefsComplex.xml" testGroup="AuthRefsComplex" />\r
+ -->    \r
     <run controlFile="imports/imports.xml" testGroup="importsTestGroup" />\r
      \r
 </xmlReplayMaster>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
index 513ad47e406c8000c014752a69a4c17bf79fb3e0..813316c23c3977d4b5598d51dc14ed5f0d890bef 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/pom.xml
@@ -8,7 +8,6 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.collectionobject.3rdparty.lifesci.nuxeo</artifactId>
     <packaging>jar</packaging>
     <description>

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index 48e24e6452da3847861ae59ef4818e5ff4d1f0fa..88954aada5c5d17263fc9f07cfefe01431a6cfc6 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
@@ -31,7 +31,7 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
-                        <manifestFile>target/classes/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/pom.xml b/services/collectionobject/3rdparty/pom.xml
index d10692272e8db2f92376cca0d8b84f307a190932..6cae21be01d7a981bc7bcee94dddee44e2057cff 100644 (file)
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -9,7 +9,6 @@
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
-    <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>\r
     <name>services.collectionobject.3rdparty</name>\r
     <packaging>pom</packaging>\r

diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml
index 56e84c7f4cf5193b91a78d43625ae25001447f3a..69ea4e13f7cad5b9c6d6eb039ff9e092c44bec2b 100644 (file)
--- a/services/collectionobject/pom.xml
+++ b/services/collectionobject/pom.xml
@@ -7,7 +7,6 @@
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
-    <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
     <name>services.collectionobject</name>\r
     <packaging>pom</packaging>\r

diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml
index 3089f73d041a1ee4439f45379bb52dfb0c648e29..032f1d510d6d7c19b42193b3e8ae547f8e7fb81c 100644 (file)
--- a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml
+++ b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml
@@ -19,10 +19,14 @@
 
     <build>
                <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
+                 <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>
@@ -30,7 +34,7 @@
                 <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/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/META-INF/MANIFEST.MF b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index 46363cd..0000000
--- a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0 \r
-Bundle-ManifestVersion: 1 \r
-Bundle-Name: NuxeoCS\r
-Bundle-SymbolicName: org.collectionspace.group;singleton:=true \r
-Bundle-Version: 1.0.0\r
-Bundle-Localization: plugin\r
-Bundle-Vendor: Nuxeo \r
-Require-Bundle: org.nuxeo.runtime, \r
- org.nuxeo.ecm.core.api, \r
- org.nuxeo.ecm.core,\r
- org.nuxeo.ecm.core.api,\r
- org.nuxeo.ecm.platform.types.api,\r
- org.nuxeo.ecm.platform.versioning.api,\r
- org.nuxeo.ecm.platform.ui,\r
- org.nuxeo.ecm.platform.forms.layout.client,\r
- org.nuxeo.ecm.platform.ws,\r
- org.collectionspace.collectionspace_core\r
-Provide-Package: org.collectionspace.group\r
-Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
- OSGI-INF/life-cycle-contrib.xml,\r
- OSGI-INF/ecm-types-contrib.xml,\r
- OSGI-INF/layouts-contrib.xml\r
-\r

diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/core-types-contrib.xml
deleted file mode 100644 (file)
index 095ed18..0000000
--- a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.collectionspace.group.coreTypes">
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="groups_common" prefix="groups_common" src="schemas/groups_common.xsd"/>
-  </extension>
-  
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="Group" extends="Document">
-      <schema name="common"/>
-      <schema name="dublincore"/>
-      <schema name="collectionspace_core"/>
-      <schema name="groups_common"/>
-    </doctype>
-  </extension>
-</component>

diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/deployment-fragment.xml b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/deployment-fragment.xml
deleted file mode 100644 (file)
index 270abbd..0000000
--- a/services/group/3rdparty/nuxeo-platform-cs-group/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/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/ecm-types-contrib.xml
deleted file mode 100644 (file)
index fece3e4..0000000
--- a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.collectionspace.group.ecm.types">
-  <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
-    <type id="Group" coretype="Group">
-      <label>org.collectionspace.group</label>
-      <!--icon>/icons/file.gif</icon-->
-      <default-view>view_documents</default-view>
-
-      <layouts mode="any">
-        <layout>heading</layout>
-        <layout>collectionspace_core</layout>
-        <layout>group</layout>
-      </layouts>        
-    </type>
-
-    <type id="Folder" coretype="Folder">
-      <subtypes>
-        <type>Group</type>
-      </subtypes>
-    </type>
-    
-    <type id="Workspace" coretype="Workspace">
-      <subtypes>
-        <type>Group</type>
-      </subtypes>
-    </type>
-
-  </extension>
-</component>

diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/life-cycle-contrib.xml
deleted file mode 100644 (file)
index 8387bb1..0000000
--- a/services/group/3rdparty/nuxeo-platform-cs-group/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.group.LifeCycleManagerExtensions">
-
-  <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
-             point="types">
-    <types>
-      <type name="Group">${Lifecycle}</type>
-    </types>
-  </extension>
-
-</component>

diff --git a/services/group/3rdparty/pom.xml b/services/group/3rdparty/pom.xml
index e47d4a2b5a3801478ec54340268fd23721ecc9e6..a5c26b4255c733bfe09ddea3a19038e8af874c45 100644 (file)
--- a/services/group/3rdparty/pom.xml
+++ b/services/group/3rdparty/pom.xml
@@ -9,7 +9,6 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.group.3rdparty</artifactId>
     <name>services.group.3rdparty</name>
     <packaging>pom</packaging>
@@ -18,6 +17,14 @@
         3rd party build for group service
     </description>
 
+       <properties>
+               <ServiceName>group</ServiceName>
+               <NuxeoDocTypeName>Group</NuxeoDocTypeName>      
+               <CommonSchemaName>groups_common</CommonSchemaName>
+               <TenantPrefix>Tenant</TenantPrefix>
+               <Lifecycle>cs_default</Lifecycle>
+       </properties>
+
     <modules>
         <module>nuxeo-platform-cs-group</module>
     </modules>

diff --git a/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java b/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java
index 186625c52283099d1545cfb04154d6b5b334d40a..29abf6f0c4303cb5881b6dba12e0e947602d29d4 100644 (file)
--- a/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java
+++ b/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java
@@ -45,6 +45,7 @@ public class ImportCommand {
     }\r
 \r
     String importTree(RepositoryInstance repoSession, File file, String toPath) throws Exception {\r
+       Exception failed = null;\r
         DocumentReader reader = null;\r
         DocumentWriter writer = null;\r
         DocumentModel docModel = null;\r
@@ -63,7 +64,7 @@ public class ImportCommand {
             pipe.setReader(reader);\r
             pipe.setWriter(writer);\r
             DocumentTranslationMap dtm = pipe.run();\r
-            Map<DocumentRef,DocumentRef> documentRefs = dtm.getDocRefMap();\r
+            Map<DocumentRef,DocumentRef> documentRefs = dtm.getDocRefMap(); // FIXME: Should be checking for null here!\r
             dump.append("<importedRecords>");\r
             for (Map.Entry entry: documentRefs.entrySet()) {\r
                 keyDocRef = (DocumentRef) entry.getKey();\r
@@ -88,8 +89,11 @@ public class ImportCommand {
             }\r
             dump.append("</importedRecords>");\r
         } catch (Exception e) {\r
-            throw e;\r
+               failed = e;\r
+            throw failed;\r
         } finally {\r
+               String status = failed == null ? "Success" : "Failed";\r
+               dump.append("<status>" + status + "</status>");\r
             dump.append("<totalRecordsImported>"+totalRecordsImported+"</totalRecordsImported>");\r
             dump.append("<numRecordsImportedByDocType>");\r
             TreeSet<String> keys = new TreeSet<String>(recordsImportedForDocType.keySet());\r
@@ -107,6 +111,12 @@ public class ImportCommand {
             if (writer != null) {\r
                 writer.close();\r
             }\r
+            \r
+            if (failed != null) {\r
+               String msg = "The Import service encountered an exception: " + failed.getLocalizedMessage();\r
+               logger.error(msg, failed);\r
+               System.err.println(msg);\r
+            }\r
         }\r
         return dump.toString();\r
     }\r

diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
index 525d02b4c60674e78a935ac657e6430948c4beb6..c06dbfed752590034e791830805347a74aaeba8b 100644 (file)
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
+++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
@@ -9,7 +9,6 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.objectexit.3rdparty.nuxeo</artifactId>
     <name>services.objectexit.3rdparty.nuxeo</name>
     <packaging>jar</packaging>
@@ -19,10 +18,20 @@
 
     <build>
                <resources>
+<!-- 
             <resource>
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
+-->
+                       <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>
@@ -30,7 +39,7 @@
                 <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/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/META-INF/MANIFEST.MF b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index 46a0207..0000000
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0 \r
-Bundle-ManifestVersion: 1 \r
-Bundle-Name: NuxeoCS\r
-Bundle-SymbolicName: org.collectionspace.objectexit;singleton:=true \r
-Bundle-Version: 1.0.0\r
-Bundle-Localization: plugin\r
-Bundle-Vendor: Nuxeo \r
-Require-Bundle: org.nuxeo.runtime, \r
- org.nuxeo.ecm.core.api, \r
- org.nuxeo.ecm.core,\r
- org.nuxeo.ecm.core.api,\r
- org.nuxeo.ecm.platform.types.api,\r
- org.nuxeo.ecm.platform.versioning.api,\r
- org.nuxeo.ecm.platform.ui,\r
- org.nuxeo.ecm.platform.forms.layout.client,\r
- org.nuxeo.ecm.platform.ws,\r
- org.collectionspace.collectionspace_core\r
-Provide-Package: org.collectionspace.objectexit\r
-Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
- OSGI-INF/life-cycle-contrib.xml,\r
- OSGI-INF/ecm-types-contrib.xml,\r
- OSGI-INF/layouts-contrib.xml\r
-\r

diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/core-types-contrib.xml
deleted file mode 100644 (file)
index 44924cf..0000000
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.collectionspace.objectexit.coreTypes">
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="objectexit_common" prefix="objectexit_common" src="schemas/objectexit_common.xsd"/>
-  </extension>
-  
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="ObjectExit" extends="Document">
-      <schema name="common"/>
-      <schema name="dublincore"/>
-      <schema name="collectionspace_core"/>
-      <schema name="objectexit_common"/>
-    </doctype>
-  </extension>
-</component>

diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/deployment-fragment.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/deployment-fragment.xml
deleted file mode 100644 (file)
index 270abbd..0000000
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/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/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/ecm-types-contrib.xml
deleted file mode 100644 (file)
index e91bd58..0000000
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.collectionspace.objectexit.ecm.types">
-  <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
-    <type id="ObjectExit" coretype="ObjectExit">
-      <label>org.collectionspace.objectexit</label>
-      <!--icon>/icons/file.gif</icon-->
-      <default-view>view_documents</default-view>
-
-      <layouts mode="any">
-        <layout>heading</layout>
-        <layout>collectionspace_core</layout>
-        <layout>objectexit</layout>
-      </layouts>        
-    </type>
-
-    <type id="Folder" coretype="Folder">
-      <subtypes>
-        <type>ObjectExit</type>
-      </subtypes>
-    </type>
-    
-    <type id="Workspace" coretype="Workspace">
-      <subtypes>
-        <type>ObjectExit</type>
-      </subtypes>
-    </type>
-
-  </extension>
-</component>

diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/OSGI-INF/life-cycle-contrib.xml
deleted file mode 100644 (file)
index 70bde69..0000000
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/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.objectexit.LifeCycleManagerExtensions">
-
-  <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
-             point="types">
-    <types>
-      <type name="ObjectExit">${Lifecycle}</type>
-    </types>
-  </extension>
-
-</component>

diff --git a/services/objectexit/3rdparty/pom.xml b/services/objectexit/3rdparty/pom.xml
index 041e77c7cc15c64eed02529af07fc4f6b6c701d8..d449aa8f0f8ae648c67cc403f2a1efacba3a840b 100644 (file)
--- a/services/objectexit/3rdparty/pom.xml
+++ b/services/objectexit/3rdparty/pom.xml
@@ -9,7 +9,6 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.objectexit.3rdparty</artifactId>
     <name>services.objectexit.3rdparty</name>
     <packaging>pom</packaging>
@@ -18,6 +17,14 @@
         3rd party build for objectexit service
     </description>
 
+       <properties>
+               <ServiceName>objectexit</ServiceName>
+               <NuxeoDocTypeName>ObjectExit</NuxeoDocTypeName> 
+               <CommonSchemaName>objectexit_common</CommonSchemaName>
+               <TenantPrefix>Tenant</TenantPrefix>
+               <Lifecycle>cs_default</Lifecycle>
+       </properties>
+
     <modules>
         <module>nuxeo-platform-cs-objectexit</module>
     </modules>