From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 4 Dec 2012 01:51:17 +0000 (-0800)
Subject: CSPACE-5498: Renaming module, package names per Richard's suggestions.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=971cc2708d7ce3fbcd69c19e71ee41995a514d17;p=tmp%2Fjakarta-migration.git

CSPACE-5498: Renaming module, package names per Richard's suggestions.
---

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/build.xml b/3rdparty/nuxeo/nuxeo-platform-listener/build.xml
index 6f4e46c82..df24a5091 100644
--- a/3rdparty/nuxeo/nuxeo-platform-listener/build.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/build.xml
@@ -113,17 +113,17 @@
 
     <target name="deploy" depends="package"
             description="deploy nuxeo server libs to ${jee.server.cspace}">
-        <ant antfile="relation/build.xml" target="deploy" inheritall="false"/>
+        <ant antfile="updaterelationsondelete/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
             description="undeploy nuxeo server libs from ${jee.server.cspace}">
-        <ant antfile="relation/build.xml" target="undeploy" inheritall="false"/>
+        <ant antfile="updaterelationsondelete/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"/>
+        <ant antfile="updaterelationsondelete/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 6eb8d8b7c..cc508824c 100644
--- a/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
@@ -13,7 +13,7 @@
     <name>services.3rdparty.nuxeo.listener</name>
 
     <modules>
-        <module>relation</module>
+        <module>updaterelationsondelete</module>
     </modules>
 
     <dependencies>
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/build.properties b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/build.properties
new file mode 100644
index 000000000..4254efff2
--- /dev/null
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/build.properties
@@ -0,0 +1 @@
+listener.module.name=updaterelationsondelete
\ No newline at end of file
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/relation/build.xml b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/build.xml
similarity index 79%
rename from 3rdparty/nuxeo/nuxeo-platform-listener/relation/build.xml
rename to 3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/build.xml
index 83c0398a1..2ebeeb101 100644
--- a/3rdparty/nuxeo/nuxeo-platform-listener/relation/build.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/build.xml
@@ -1,22 +1,26 @@
-<project name="org.collectionspace.services.3rdparty.nuxeo.listener.relations" default="package" basedir=".">
+<project name="org.collectionspace.services.3rdparty.nuxeo.listener.updaterelationsondelete" default="package" basedir=".">
   <description>
-    CollectionSpace Nuxeo Relations listener component type
+    CollectionSpace Nuxeo listener component type
   </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 -->
+  <!-- Environment should be declared before reading build.properties -->
   <property environment="env" />
+  <!-- Set global properties for this build -->
   <property file="${services.trunk}/build.properties" />
+  <!-- Set local properties for this build -->
+  <property file="build.properties" />
   <property name="mvn.opts" value="" />
   <property name="src" location="src"/>
   <property name="build" location="build"/>
   <property name="dist"  location="dist"/>
 
-  <property name="nuxeo.collectionspace.listener.relations.jar"
-    value="org.collectionspace.services.3rdparty.nuxeo.listener.relations-${cspace.release}.jar"/>
+  <!-- module.name variable is set in the local properties file -->
+  <property name="jar.name"
+    value="org.collectionspace.services.listener.${listener.module.name}-${cspace.release}.jar"/>
 
-  <property name="nuxeo.collectionspace.listener.relations.jar.all"
-    value="org.collectionspace.services.3rdparty.nuxeo.listener.relations-*.jar"/>
+  <property name="jar.all"
+    value="org.collectionspace.services.listener.${listener.module.name}-*.jar"/>
   
   <condition property="osfamily-unix">
     <os family="unix" />
@@ -84,7 +88,7 @@
   
   <target name="deploy" depends="install"
     description="deploy collectionspace core doctype in ${jee.server.nuxeo}">
-    <copy file="${basedir}/target/${nuxeo.collectionspace.listener.relations.jar}"
+    <copy file="${basedir}/target/${jar.name}"
       todir="${jee.deploy.nuxeo.plugins}"/>
   </target>
   
@@ -92,7 +96,7 @@
     description="undeploy collectionspace Thumbnail service from ${jee.server.nuxeo}">
     <delete>
       <fileset dir="${jee.deploy.nuxeo.plugins}">
-        <include name="${nuxeo.collectionspace.listener.relations.jar.all}"/>
+        <include name="${jar.all}"/>
       </fileset>
     </delete>
   </target>
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/relation/pom.xml b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/pom.xml
similarity index 91%
rename from 3rdparty/nuxeo/nuxeo-platform-listener/relation/pom.xml
rename to 3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/pom.xml
index 8b17c6298..a4294aea9 100644
--- a/3rdparty/nuxeo/nuxeo-platform-listener/relation/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/pom.xml
@@ -8,12 +8,13 @@
         <groupId>org.collectionspace.services</groupId>
         <version>3.2-SNAPSHOT</version>
     </parent>
-    <artifactId>org.collectionspace.services.3rdparty.nuxeo.listener.relations</artifactId>
-    <name>org.collectionspace.services.3rdparty.nuxeo.listener.relations</name>
-    <url>http://maven.apache.org</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+    <artifactId>org.collectionspace.services.listener.updaterelationsondelete</artifactId>
+    <name>org.collectionspace.services.listener.updaterelationsondelete</name>
+    <url>http://maven.apache.org</url>
+
 	
     <dependencies>
         <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/updaterelationsondelete/src/main/java/org/collectionspace/services/listener/UpdateRelationsOnDelete.java
similarity index 93%
rename from 3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/java/org/collectionspace/services/nuxeo/listener/relation/RelationSubOrObjDeletionListener.java
rename to 3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/java/org/collectionspace/services/listener/UpdateRelationsOnDelete.java
index b609ce3bb..8efc9c120 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/updaterelationsondelete/src/main/java/org/collectionspace/services/listener/UpdateRelationsOnDelete.java
@@ -1,11 +1,9 @@
-package org.collectionspace.services.nuxeo.listener.relation;
+package org.collectionspace.services.listener;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.collectionspace.services.common.document.DocumentFilter;
 import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.CoreSession;
 import org.nuxeo.ecm.core.api.DocumentModel;
@@ -16,7 +14,7 @@ import org.nuxeo.ecm.core.event.EventContext;
 import org.nuxeo.ecm.core.event.EventListener;
 import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
 
-public class RelationSubOrObjDeletionListener implements EventListener {
+public class UpdateRelationsOnDelete implements EventListener {
 
     // FIXME: Consider adding the following constant to
     // org.collectionspace.services.common.workflow.jaxb.WorkflowJAXBSchema
@@ -31,10 +29,11 @@ public class RelationSubOrObjDeletionListener implements EventListener {
 
     // FIXME: We might experiment here with using log4j instead of Apache Commons Logging;
     // am using the latter to follow Ray's pattern for now
-    final Log logger = LogFactory.getLog(RelationSubOrObjDeletionListener.class);
+    final Log logger = LogFactory.getLog(UpdateRelationsOnDelete.class);
 
+    @Override
     public void handleEvent(Event event) throws ClientException {
-        logger.info("In handleEvent in RelationSubOrObjDeletionListener ...");
+        logger.info("In handleEvent in UpdateRelationsOnDelete ...");
 
         EventContext eventContext = event.getContext();
 
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/META-INF/MANIFEST.MF b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from 3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/META-INF/MANIFEST.MF
rename to 3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/resources/META-INF/MANIFEST.MF
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/core-types-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/resources/OSGI-INF/core-types-contrib.xml
similarity index 100%
rename from 3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/core-types-contrib.xml
rename to 3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/resources/OSGI-INF/core-types-contrib.xml
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/updaterelationsondelete/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml
similarity index 100%
rename from 3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml
rename to 3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/resources/OSGI-INF/default-life-cycle-contrib.xml
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/deployment-fragment.xml b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/resources/OSGI-INF/deployment-fragment.xml
similarity index 100%
rename from 3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/deployment-fragment.xml
rename to 3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/resources/OSGI-INF/deployment-fragment.xml
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/resources/OSGI-INF/ecm-types-contrib.xml
similarity index 74%
rename from 3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/ecm-types-contrib.xml
rename to 3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index 1781383a9..d25de03a7 100644
--- a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -3,7 +3,7 @@
     
     <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">
+                          class="org.collectionspace.services.listener.UpdateRelationsOnDelete" priority="999">
             <event>lifecycle_transition_event</event>
         </listener>
     </extension>
diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/layouts-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/resources/OSGI-INF/layouts-contrib.xml
similarity index 100%
rename from 3rdparty/nuxeo/nuxeo-platform-listener/relation/src/main/resources/OSGI-INF/layouts-contrib.xml
rename to 3rdparty/nuxeo/nuxeo-platform-listener/updaterelationsondelete/src/main/resources/OSGI-INF/layouts-contrib.xml