NOJIRA: Update deploy target for UI plugins to better handling tentants using the...

diff --git a/cspace-ui/build.xml b/cspace-ui/build.xml
index 05df8849e08f379eb89aa1a8add0d23574959823..3ca12515745fa903cd14d0703e43fba7f567ecda 100644 (file)
--- 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>