CSPACE-4199: Media service modified to take advantage of parameterization of static...

diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml
index 271a1b552457324bc932d674fc7f0c2098c19267..633b3d315a0f7c95b14e27314e7ef5683a67b9e4 100644 (file)
--- a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml
+++ b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml
@@ -1,3 +1,4 @@
+
 <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">
@@ -17,14 +18,30 @@
         Media Nuxeo Document Type
     </description>
 
+    <properties>
+        <ServiceName>media</ServiceName>
+        <NuxeoDocTypeName>Media</NuxeoDocTypeName>
+        <CommonSchemaName>media_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/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/META-INF/MANIFEST.MF b/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index d07be3b..0000000
--- a/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0 \r
-Bundle-ManifestVersion: 1 \r
-Bundle-Name: org.collectionspace.media\r
-Bundle-SymbolicName: org.collectionspace.media;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.media\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/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/OSGI-INF/core-types-contrib.xml
deleted file mode 100644 (file)
index 5b0210e..0000000
--- a/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.collectionspace.media.coreTypes">
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="media_common" prefix="media_common" src="schemas/media_common.xsd"/>
-  </extension>
-  
-  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="Media" extends="CollectionSpaceDocument">
-      <schema name="common"/>
-      <schema name="dublincore"/>
-      <schema name="collectionspace_core"/>
-      <schema name="media_common"/>
-    </doctype>
-  </extension>
-</component>

diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/OSGI-INF/deployment-fragment.xml b/services/media/3rdparty/nuxeo-platform-cs-media/src/main/resources/OSGI-INF/deployment-fragment.xml
deleted file mode 100644 (file)
index 1d37c1b..0000000
--- a/services/media/3rdparty/nuxeo-platform-cs-media/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>
\ No newline at end of file

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

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