From: Richard Millet <remillet@berkeley.edu>
Date: Fri, 30 Nov 2012 04:54:26 +0000 (-0800)
Subject: CSPACE-5678: Added Nuxeo deployment location constants for plugins location so the... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=04a3c77d25d8ec187b85ea1c29ce97d1c54111b5;p=tmp%2Fjakarta-migration.git

CSPACE-5678: Added Nuxeo deployment location constants for plugins location so the App schema and bundle generation code can reference it.
---

diff --git a/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java b/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java
new file mode 100644
index 000000000..8ebd399bb
--- /dev/null
+++ b/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java
@@ -0,0 +1,7 @@
+package org.collectionspace.services.common.api;
+
+public interface JEEServerDeployment {
+	public final static String NUXEO_CLIENT_DIR = "nuxeo-client";
+	public final static String NUXEO_SERVER_DIR = "nuxeo-server";
+	public final static String NUXEO_SERVER_PLUGINS_DIR = NUXEO_SERVER_DIR + "/" + "plugins";
+}
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
index bda350a79..4d3e266db 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
@@ -7,6 +7,7 @@ import java.util.Iterator;
 
 import javax.servlet.ServletContext;
 
+import org.collectionspace.services.common.api.JEEServerDeployment;
 import org.collectionspace.services.config.RepositoryClientConfigType;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.nuxeo.ecm.core.api.DocumentModel;
@@ -23,8 +24,8 @@ public class NuxeoConnectorEmbedded {
  */
 	private Logger logger = LoggerFactory.getLogger(NuxeoConnectorEmbedded.class);
 
-	public final static String NUXEO_CLIENT_DIR = "nuxeo-client";
-	public final static String NUXEO_SERVER_DIR = "nuxeo-server";
+	public final static String NUXEO_CLIENT_DIR = JEEServerDeployment.NUXEO_CLIENT_DIR;
+	public final static String NUXEO_SERVER_DIR = JEEServerDeployment.NUXEO_SERVER_DIR;
 	private final static String ERROR_CONNECTOR_NOT_INITIALIZED = "NuxeoConnector is not initialized!";