From be76ef22c5cdff52b5a9c210dbf5d9c3c44b11b1 Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@yahoo.com>
Date: Fri, 4 May 2018 10:51:58 -0700
Subject: [PATCH] NOJIRA: Update deploy target for UI plugins to better
 handling tentants using the default core UI plugin.

---
 cspace-ui/build.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cspace-ui/build.xml b/cspace-ui/build.xml
index 05df8849e..3ca125157 100644
--- a/cspace-ui/build.xml
+++ b/cspace-ui/build.xml
@@ -101,13 +101,15 @@
 		Since "core" is a special tenant, we need to do a special check
 	-->
 	<target name="deploy_core_as_generic" if="${is.primary.core}">
-		<antcall target="deploy_core" />
+		<property name="webapp.template.dir" value="cspace#core#template" />
+		<antcall target="deploy_primary" />
 	</target>
 	
 	<!--
 		Since "core" is a special tenant, we need to do a special check
 	-->
 	<target name="deploy_other_as_generic" unless="${is.primary.core}">
+		<property name="webapp.template.dir" value="cspace#template" />	
 		<antcall target="deploy_primary" />	
 	</target>
 	
@@ -137,7 +139,7 @@
 		<filter token="LOGO" value="${primary.profile.plugin.logo}" />
 		
 		<copy todir="${jee.deploy.cspace}/${primary.profile.plugin.dir}" filtering="true" overwrite="true">
-			<fileset dir="cspace#template"/>
+			<fileset dir="${webapp.template.dir}"/>
 		</copy>
 		<move file="${primary.profile.plugin.js}" todir="${jee.deploy.cspace.ui.shared}"></move>
 	</target>		 
-- 
2.47.3