From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 20 Nov 2012 22:10:21 +0000 (-0800)
Subject: CSPACE-5498: Additional integration of nuxeo listener and listener/relation modules... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=0f2be5e62e2e6e7101e3941d7b533ef833aa1bc7;p=tmp%2Fjakarta-migration.git

CSPACE-5498: Additional integration of nuxeo listener and listener/relation modules into services/3rdparty. Fixed package name in RelationSubOrObjDeletionListener. Event listener now emits log messages when documents are transitioned to a different workflow state.
---

diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
index c81dcae69..797fac119 100644
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -130,6 +130,7 @@
             </filterset>
         </copy>
         <ant antfile="nuxeo-platform-collectionspace/build.xml" target="deploy" inheritall="false"/>
+        <ant antfile="nuxeo-platform-listener/build.xml" target="deploy" inheritall="false"/>
 				<!-- Disabled due to integration issues between ImageMagick and Ghostscript on Linux systems        
         <ant antfile="nuxeo-platform-thumbnail/build.xml" target="deploy" inheritall="false"/>
         -->
@@ -141,6 +142,7 @@
         <delete dir="${jee.server.cspace}/nuxeo-server/config"/>
         <delete dir="${jee.server.cspace}/nuxeo-server/lib"/>
         <ant antfile="nuxeo-platform-collectionspace/build.xml" target="undeploy" inheritall="false"/>
+        <ant antfile="nuxeo-platform-listener/build.xml" target="undeploy" inheritall="false"/>
 		<ant antfile="nuxeo-platform-quote/build.xml" target="undeploy" inheritall="false"/>
 		<ant antfile="nuxeo-platform-quote-api/build.xml" target="undeploy" inheritall="false"/>
 		<!-- Disabled due to integration issues between ImageMagick and Ghostscript on Linux systems
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/build.xml b/3rdparty/nuxeo/nuxeo-platform-listener/build.xml
index 977b9bca6..6f4e46c82 100644
--- a/3rdparty/nuxeo/nuxeo-platform-listener/build.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/build.xml
@@ -2,7 +2,7 @@
     <description>
         collectionspace nuxeo listener
     </description>
-  <!-- set global properties for this build -->
+    <!-- set global properties for this build -->
     <property name="services.trunk" value="../.."/>
     <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
@@ -27,7 +27,7 @@
     </target>
 
     <target name="package" depends="package-unix,package-windows"
-    	description="Package CollectionSpace Services" />
+            description="Package CollectionSpace Services" />
     <target name="package-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="package" />
@@ -52,7 +52,7 @@
     </target>
 
     <target name="install" depends="package,install-unix,install-windows"
-    	description="Install" />
+            description="Install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
@@ -77,7 +77,7 @@
     </target>
 
     <target name="clean" depends="clean-unix,clean-windows"
-    	description="Delete target directories" >
+            description="Delete target directories" >
         <delete dir="${build}"/>
     </target>
     <target name="clean-unix" if="osfamily-unix">
@@ -112,18 +112,18 @@
     </target>
 
     <target name="deploy" depends="package"
-    	description="deploy nuxeo server libs to ${jee.server.cspace}">
+            description="deploy nuxeo server libs to ${jee.server.cspace}">
         <ant antfile="relation/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    	description="undeploy nuxeo server libs from ${jee.server.cspace}">
+            description="undeploy nuxeo server libs from ${jee.server.cspace}">
         <ant antfile="relation/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
     <target name="dist"
-    	description="generate distribution for nuxeo server libs" depends="package">
-    	<ant antfile="relation/build.xml" target="dist" inheritall="false"/>
+            description="generate distribution for nuxeo server libs" depends="package">
+        <ant antfile="relation/build.xml" target="dist" inheritall="false"/>
     </target>
 
 </project>
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
index ce642e0df..6eb8d8b7c 100644
--- a/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
@@ -13,8 +13,8 @@
     <name>services.3rdparty.nuxeo.listener</name>
 
     <modules>
-		<module>relation</module>
-	</modules>
+        <module>relation</module>
+    </modules>
 
     <dependencies>
         <dependency>
@@ -22,21 +22,21 @@
             <artifactId>org.osgi.core</artifactId>
             <version>4.1.0</version>
         </dependency>
-                <dependency>
+        <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-storage-sql</artifactId>
             <version>${nuxeo.core.version}</version>
         </dependency>
-<dependency>
-<groupId>org.nuxeo.ecm.platform</groupId>
-<artifactId>nuxeo-platform-filemanager-api</artifactId>
-<version>${nuxeo.platform.version}</version>	
-</dependency>
+        <dependency>
+            <groupId>org.nuxeo.ecm.platform</groupId>
+            <artifactId>nuxeo-platform-filemanager-api</artifactId>
+            <version>${nuxeo.platform.version}</version>    
+        </dependency>
         <!-- jboss -->
         <!--
         <dependency>
-		    <groupId>org.jboss.remoting</groupId>
-		    <artifactId>jboss-remoting</artifactId>
+            <groupId>org.jboss.remoting</groupId>
+            <artifactId>jboss-remoting</artifactId>
             <scope>provided</scope>
         </dependency>
         -->
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/java/org/collectionspace/services/nuxeo/listener/relation/RelationSubOrObjDeletionListener.java b/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/java/org/collectionspace/services/nuxeo/listener/relation/RelationSubOrObjDeletionListener.java
index 1e588751f..731dbcf09 100644
--- a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/java/org/collectionspace/services/nuxeo/listener/relation/RelationSubOrObjDeletionListener.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/java/org/collectionspace/services/nuxeo/listener/relation/RelationSubOrObjDeletionListener.java
@@ -1,4 +1,4 @@
-package org.collectionspace.services.nuxeo.extension.listener.relation;
+package org.collectionspace.services.nuxeo.listener.relation;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -16,6 +16,6 @@ public class RelationSubOrObjDeletionListener implements EventListener {
     final Log logger = LogFactory.getLog(RelationSubOrObjDeletionListener.class);
 
     public void handleEvent(Event event) throws ClientException {
-        logger.debug("In handleEvent in RelationSubOrObjDeletionListener ...");
+        logger.info("In handleEvent in RelationSubOrObjDeletionListener ...");
     }
 }
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/java/org/nuxeo/platform/thumbnail/App.java b/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/java/org/nuxeo/platform/thumbnail/App.java
deleted file mode 100644
index 038e27e52..000000000
--- a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/java/org/nuxeo/platform/thumbnail/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.nuxeo.platform.thumbnail;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/core-types-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/core-types-contrib.xml
index 10756c857..8cedf8009 100644
--- a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <component name="org.collectionspace.nuxeo.listener.relation.core.types">
-	<!-- This page intentionally left blank -->
+    <!-- This page intentionally left blank -->
 </component>
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml
index bdeda4fa1..08d595182 100644
--- a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <component name="org.collectionspace.nuxeo.listener.relation.LifeCycle">
-	<!-- This page intentionally left blank -->
+    <!-- This page intentionally left blank -->
 </component>
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index a89fa8d54..1781383a9 100644
--- a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <component name="org.collectionspace.nuxeo.listener.relation.ecm.types">
-	
-	<extension target="org.nuxeo.ecm.core.event.EventServiceComponent" point="listener">
-		<listener name="relationsuborobjdeletionlistener" async="false" postCommit="false"
-			class="org.collectionspace.services.nuxeo.listener.relation.RelationSubOrObjDeletionListener" priority="999">
+    
+    <extension target="org.nuxeo.ecm.core.event.EventServiceComponent" point="listener">
+        <listener name="relationsuborobjdeletionlistener" async="false" postCommit="false"
+                          class="org.collectionspace.services.nuxeo.listener.relation.RelationSubOrObjDeletionListener" priority="999">
             <event>lifecycle_transition_event</event>
-		</listener>
-	</extension>
-	
+        </listener>
+    </extension>
+    
 </component>
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/schemas/thumbnail.xsd b/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/schemas/thumbnail.xsd
deleted file mode 100644
index 00e67a424..000000000
--- a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/schemas/thumbnail.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema targetNamespace="http://www.nuxeo.org/ecm/schemas/file/"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:nxs="http://www.nuxeo.org/ecm/schemas/file/">
-
-  <xs:include schemaLocation="core-types.xsd" />
-
-  <xs:element name="fileName" type="xs:string" />
-  <xs:element name="digest" type="xs:string" />
-  <xs:element name="thumbnail" type="nxs:content" />
-
-</xs:schema>
diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml
index 30b88331d..86d3de460 100644
--- a/3rdparty/nuxeo/pom.xml
+++ b/3rdparty/nuxeo/pom.xml
@@ -14,6 +14,7 @@
 
     <modules>
 		<module>nuxeo-platform-collectionspace</module>
+		<module>nuxeo-platform-listener</module>
 		<module>nuxeo-platform-quote-api</module>
 		<module>nuxeo-platform-quote</module>
 		<module>nuxeo-platform-thumbnail</module>