From: Richard Millet <remillet@yahoo.com>
Date: Wed, 25 Apr 2018 21:54:38 +0000 (-0700)
Subject: DRYD-387: Add env vars for installing a default/primary tenant UI plugin.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=a1208959da7540370cadc2659f0dc5382d48202e;p=tmp%2Fjakarta-migration.git

DRYD-387: Add env vars for installing a default/primary tenant UI plugin.
---

diff --git a/build.properties b/build.properties
index 90f9a2186..4fb7d4c9f 100644
--- a/build.properties
+++ b/build.properties
@@ -19,6 +19,7 @@ domain.nuxeo=nuxeo-server
 # CSpace UI
 cspace.ui.dest=
 cspace.ui.version=latest
+cspace.ui.basename=/cspace/core
 cspace.ui.webapp=cspace#core
 cspace.ui.webapp.name=cspaceUI
 cspace.ui.js=${cspace.ui.webapp.name}@${cspace.ui.version}.min.js
diff --git a/cspace-ui/build.xml b/cspace-ui/build.xml
index 7996ef12e..f91bfdfda 100644
--- a/cspace-ui/build.xml
+++ b/cspace-ui/build.xml
@@ -1,109 +1,171 @@
-<project name="react.ui" default="package" basedir=".">
-    <description>
-        CollectionSpace UI Component buil
-    </description>
-    <!-- set global properties for this build -->
-    <property name="services.trunk" value=".."/>
-    <!-- enviornment should be declared before reading build.properties -->
-    <property environment="env" />
-    <property file="${services.trunk}/build.properties" />
+<project name="react.ui" default="package" basedir="." xmlns:if="ant:if" xmlns:unless="ant:unless">
+	<description>
+		CollectionSpace UI Component build
+	</description>
 	
+	<!-- set global properties for this build -->
+	<property name="services.trunk" value=".."/>
+	<!-- enviornment should be declared before reading build.properties -->
+	<property environment="env" />
+	<property file="${services.trunk}/build.properties" />
+	
+	<condition property="osfamily-unix">
+		<os family="unix" />
+	</condition>
+	<condition property="osfamily-windows">
+		<os family="windows" />
+	</condition>
+
 	<!--
 		Profile version numbers
 	-->
-    <property name="publicart.profile.plugin.version" value="latest" />
-    <property name="publicart.profile.plugin.name" value="cspaceUIPluginProfilePublicArt" />
-    <property name="publicart.profile.plugin.dir" value="cspace#publicart" />
-    <property name="publicart.profile.plugin.js" value="${publicart.profile.plugin.name}@${publicart.profile.plugin.version}.min.js" />
+	<property name="publicart.profile.plugin.version" value="latest" />
+	<property name="publicart.profile.plugin.name" value="cspaceUIPluginProfilePublicArt" />
+	<property name="publicart.profile.plugin.dir" value="cspace#publicart" />
+	<property name="publicart.profile.plugin.js" value="${publicart.profile.plugin.name}@${publicart.profile.plugin.version}.min.js" />
+	<property name="publicart.profile.plugin.basename" value="/cspace/publicart" />
 
-    <property name="anthro.profile.plugin.version" value="latest" />
-    <property name="anthro.profile.plugin.name" value="cspaceUIPluginProfileAnthro" />
-    <property name="anthro.profile.plugin.dir" value="cspace#anthro" />
-    <property name="anthro.profile.plugin.js" value="${anthro.profile.plugin.name}@${anthro.profile.plugin.version}.min.js" />
-    
-	<property name="dvp.profile.plugin.version" value="latest" />
-	<property name="dvp.profile.plugin.name" value="cspaceUIPluginProfileDartmouthVietnamProject" />
-	<property name="dvp.profile.plugin.dir" value="cspace#dvp" />
-	<property name="dvp.profile.plugin.js" value="${dvp.profile.plugin.name}@${dvp.profile.plugin.version}.min.js" />
+	<property name="anthro.profile.plugin.version" value="latest" />
+	<property name="anthro.profile.plugin.name" value="cspaceUIPluginProfileAnthro" />
+	<property name="anthro.profile.plugin.dir" value="cspace#anthro" />
+	<property name="anthro.profile.plugin.js" value="${anthro.profile.plugin.name}@${anthro.profile.plugin.version}.min.js" />
+	<property name="anthro.profile.plugin.basename" value="/cspace/anthro" />
+	
+	<target name="package" depends="deploy">
+	</target>
+	
+	<target name="set_primary" if="${env.CSPACE_PRIMARY_UIPLUGIN}">
+		<echo>Setting primary vars</echo>
+		<property name="primary.profile.plugin.name" value="${env.CSPACE_PRIMARY_UIPLUGIN_NAME}" />
+		<property name="primary.profile.plugin.version" value="${env.CSPACE_PRIMARY_UIPLUGIN_VERSION}" />
+		<property name="primary.profile.plugin.package" value="${env.CSPACE_PRIMARY_UIPLUGIN_PACKAGE}" /> 
+		<property name="primary.profile.plugin.dir" value="${env.CSPACE_PRIMARY_UIPLUGIN_DIR}" />
+		<property name="primary.profile.plugin.js" value="${primary.profile.plugin.name}@${primary.profile.plugin.version}.min.js" />
+		<property name="primary.profile.plugin.basename" value="${env.CSPACE_PRIMARY_UIPLUGIN_BASENAME}" />
+	</target>
 
-    <condition property="osfamily-unix">
-        <os family="unix" />
-    </condition>
-    <condition property="osfamily-windows">
-        <os family="windows" />
-    </condition>
-    
-    <target name="package" depends="deploy">
-    </target>
-    
-    <target name="download">
-    	<!-- Core UI -->
-        <exec executable="curl"  failonerror="true">
-            <arg line="-o ${cspace.ui.js} --fail --insecure --remote-name --location https://unpkg.com/cspace-ui@${cspace.ui.version}/dist/${cspace.ui.webapp.name}.min.js"/>
-        </exec>
-        
-        <!-- Public Art Profile -->
-        <exec executable="curl"  failonerror="true">
-            <arg line="-o ${publicart.profile.plugin.js} --fail --insecure --remote-name --location https://unpkg.com/cspace-ui-plugin-profile-publicart@${publicart.profile.plugin.version}/dist/${publicart.profile.plugin.name}.min.js"/>
-        </exec>
-        
-        <!-- Anthropology Profile -->
-        <exec executable="curl"  failonerror="true">
-            <arg line="-o ${anthro.profile.plugin.js} --fail --insecure --remote-name --location https://unpkg.com/cspace-ui-plugin-profile-anthro@${anthro.profile.plugin.version}/dist/${anthro.profile.plugin.name}.min.js"/>
-        </exec>
-        
-        <!-- DVP Profile -->
-        <exec executable="curl"  failonerror="true">
-            <arg line="-o ${dvp.profile.plugin.js} --fail --insecure --remote-name --location https://unpkg.com/cspace-ui-plugin-profile-dvp@${dvp.profile.plugin.version}/dist/${dvp.profile.plugin.name}.min.js"/>
-        </exec>
-    </target>
-    
-    <target name="deploy" depends="download" description="deploy cspace ui to ${jee.server.cspace}">
-    	<!-- Core UI Webapp-->
-        <filter token="UI_VERSION" value="${cspace.ui.version}" />
-        <copy todir="${jee.deploy.cspace}/${cspace.ui.webapp}" filtering="true" overwrite="true">
-            <fileset dir="${cspace.ui.webapp}"/>
-        </copy>
-        <move file="${cspace.ui.webapp.name}@${cspace.ui.version}.min.js" todir="${jee.deploy.cspace.ui.shared}"></move>
-        
-        <!-- Public Art Profile -->
+	<!--
+		Primary tenant
+	-->
+	<target name="download_primary" depends="set_primary" if="${env.CSPACE_PRIMARY_UIPLUGIN}">
+		<!-- Default primary tenant -->
+		<exec executable="curl"	 failonerror="true">
+			<arg line="-o ${primary.profile.plugin.js} --fail --insecure --remote-name --location https://unpkg.com/${primary.profile.plugin.package}@${primary.profile.plugin.version}/dist/${primary.profile.plugin.name}.min.js"/>
+		</exec>
+		</target>
+
+	<target name="deploy_primary" depends="download_primary" if="${env.CSPACE_PRIMARY_UIPLUGIN}" description="deploy cspace ui to ${jee.server.cspace}">				
+		<filter token="PLUGIN_VERSION" value="${primary.profile.plugin.version}" />
+		<filter token="PLUGIN_BASENAME" value="${primary.profile.plugin.basename}" />
+		<copy todir="${jee.deploy.cspace}/${primary.profile.plugin.dir}" filtering="true" overwrite="true">
+			<fileset dir="${primary.profile.plugin.dir}"/>
+		</copy>
+		<move file="${primary.profile.plugin.js}" todir="${jee.deploy.cspace.ui.shared}"></move>
+	</target>		 
+		
+	<target name="undeploy_primary" if="${env.CSPACE_PRIMARY_UIPLUGIN}" depends="set_primary" description="undeploy collectionspace ui components from ${jee.server.cspace}">				 
+		<delete dir="${jee.deploy.cspace}/${primary.profile.plugin.dir}" />
+		<delete file="${jee.deploy.cspace.ui.shared}/${primary.profile.plugin.js}" />
+	</target>		 
+		
+	<!--
+		Core UI components
+	-->
+	<target name="download_core">
+		<!-- Core UI -->
+		<exec executable="curl"	 failonerror="true">
+			<arg line="-o ${cspace.ui.js} --fail --insecure --remote-name --location https://unpkg.com/cspace-ui@${cspace.ui.version}/dist/${cspace.ui.webapp.name}.min.js"/>
+		</exec>
+		<move file="${cspace.ui.js}" todir="${jee.deploy.cspace.ui.shared}"></move>
+	</target>
+		
+	<target name="deploy_core" depends="download_core" unless="${env.CSPACE_CORE_CREATE_DISABLED_OPT}">
+		<!-- Core UI Webapp-->
+		<filter token="UI_VERSION" value="${cspace.ui.version}" />
+		<filter token="PLUGIN_BASENAME" value="${cspace.ui.basename}" />
+		<copy todir="${jee.deploy.cspace}/${cspace.ui.webapp}" filtering="true" overwrite="true">
+			<fileset dir="${cspace.ui.webapp}"/>
+		</copy>
+	</target>
+		
+	<target name="undeploy_core" description="undeploy collectionspace ui components from ${jee.server.cspace}">
+		<!-- Core webapp -->
+			<delete dir="${jee.deploy.cspace}/${cspace.ui.webapp}" />
+			<delete file="${jee.deploy.cspace.ui.shared}/${cspace.ui.js}" />				
+	</target>		 
+		
+	<!--
+		Public Art Tenant
+	-->
+	<target name="download_publicart" unless="${env.CSPACE_PUBLICART_CREATE_DISABLED_OPT}">
+		<!-- Public Art Profile -->
+		<exec executable="curl"	 failonerror="true">
+			<arg line="-o ${publicart.profile.plugin.js} --fail --insecure --remote-name --location https://unpkg.com/cspace-ui-plugin-profile-publicart@${publicart.profile.plugin.version}/dist/${publicart.profile.plugin.name}.min.js"/>
+		</exec>
+	</target>
+		
+	<target name="deploy_publicart" depends="download_publicart" unless="${env.CSPACE_PUBLICART_CREATE_DISABLED_OPT}">
+		<!-- Public Art Profile -->
+		<filter token="UI_VERSION" value="${cspace.ui.version}" />		
 		<filter token="PLUGIN_VERSION" value="${publicart.profile.plugin.version}" />
-        <copy todir="${jee.deploy.cspace}/${publicart.profile.plugin.dir}" filtering="true" overwrite="true">
-            <fileset dir="${publicart.profile.plugin.dir}"/>
-        </copy>
-        <move file="${publicart.profile.plugin.name}@${publicart.profile.plugin.version}.min.js" todir="${jee.deploy.cspace.ui.shared}"></move>
-        
-        <!-- Anthropology Profile -->
+		<filter token="PLUGIN_BASENAME" value="${publicart.profile.plugin.basename}" />
+		<copy todir="${jee.deploy.cspace}/${publicart.profile.plugin.dir}" filtering="true" overwrite="true">
+			<fileset dir="${publicart.profile.plugin.dir}"/>
+		</copy>
+		<move file="${publicart.profile.plugin.name}@${publicart.profile.plugin.version}.min.js" todir="${jee.deploy.cspace.ui.shared}"></move>
+	</target>
+
+	<target name="undeploy_publicart" unless="${env.CSPACE_PUBLICART_CREATE_DISABLED_OPT}" description="undeploy collectionspace ui components from ${jee.server.cspace}">
+		<!-- Public Art Profile -->
+		<delete dir="${jee.deploy.cspace}/${publicart.profile.plugin.dir}" />
+		<delete file="${jee.deploy.cspace.ui.shared}/${publicart.profile.plugin.js}" />
+	</target>
+
+	<!--
+		Anthropology Tenant
+	-->
+	<target name="download_anthro" unless="${env.CSPACE_ANTHRO_CREATE_DISABLED_OPT}">
+		<!-- Anthropology Profile -->
+		<exec executable="curl"	 failonerror="true">
+			<arg line="-o ${anthro.profile.plugin.js} --fail --insecure --remote-name --location https://unpkg.com/cspace-ui-plugin-profile-anthro@${anthro.profile.plugin.version}/dist/${anthro.profile.plugin.name}.min.js"/>
+		</exec>
+	</target>
+		
+	<target name="deploy_anthro" unless="${env.CSPACE_ANTHRO_CREATE_DISABLED_OPT}" depends="download_anthro">
+		<!-- Anthropology Profile -->
 		<filter token="PLUGIN_VERSION" value="${anthro.profile.plugin.version}" />
-        <copy todir="${jee.deploy.cspace}/${anthro.profile.plugin.dir}" filtering="true" overwrite="true">
-            <fileset dir="${anthro.profile.plugin.dir}"/>
-        </copy>
-        <move file="${anthro.profile.plugin.name}@${anthro.profile.plugin.version}.min.js" todir="${jee.deploy.cspace.ui.shared}"></move>
-        
-        <!-- Dartmouth Vietname Profile -->
-		<filter token="PLUGIN_VERSION" value="${dvp.profile.plugin.version}" />
-        <copy todir="${jee.deploy.cspace}/${dvp.profile.plugin.dir}" filtering="true" overwrite="true">
-            <fileset dir="${dvp.profile.plugin.dir}"/>
-        </copy>
-        <move file="${dvp.profile.plugin.name}@${dvp.profile.plugin.version}.min.js" todir="${jee.deploy.cspace.ui.shared}"></move>
-    </target>
-    
-    <target name="undeploy" description="undeploy collectionspace ui components from ${jee.server.cspace}">
-    	<!-- Core webapp -->
-        <delete dir="${jee.deploy.cspace}/${cspace.ui.webapp}" />
-        <delete file="${jee.deploy.cspace.ui.shared}/${cspace.ui.js}" />
-        
-        <!-- Public Art Profile -->
-        <delete dir="${jee.deploy.cspace}/${publicart.profile.plugin.dir}" />
-        <delete file="${jee.deploy.cspace.ui.shared}/${publicart.profile.plugin.js}" />
-        
-        <!-- Anthropology Profile -->
-        <delete dir="${jee.deploy.cspace}/${anthro.profile.plugin.dir}" />
-        <delete file="${jee.deploy.cspace.ui.shared}/${anthro.profile.plugin.js}" />
-        
-        <!-- Dartmouth Vietnam Project -->
-        <delete dir="${jee.deploy.cspace}/${dvp.profile.plugin.dir}" />
-        <delete file="${jee.deploy.cspace.ui.shared}/${dvp.profile.plugin.js}" />
-    </target>
-    
+		<filter token="PLUGIN_BASENAME" value="${anthro.profile.plugin.basename}" />
+		<copy todir="${jee.deploy.cspace}/${anthro.profile.plugin.dir}" filtering="true" overwrite="true">
+			<fileset dir="${anthro.profile.plugin.dir}"/>
+		</copy>
+		<move file="${anthro.profile.plugin.js}" todir="${jee.deploy.cspace.ui.shared}"></move>
+	</target>
+		
+	<target name="undeploy_anthro" unless="${env.CSPACE_ANTHRO_CREATE_DISABLED_OPT}" description="undeploy collectionspace ui components from ${jee.server.cspace}">
+		<!-- Anthropology Profile -->
+		<delete dir="${jee.deploy.cspace}/${anthro.profile.plugin.dir}" />
+		<delete file="${jee.deploy.cspace.ui.shared}/${anthro.profile.plugin.js}" />
+	</target>
+
+	<!-- General deploy target -->
+		
+	<target name="deploy_others" unless="${env.CSPACE_PRIMARY_UIPLUGIN}">
+		<antcall target="deploy_publicart" />
+		<antcall target="deploy_anthro" />
+	</target>
+		
+	<target name="deploy" depends="deploy_core, deploy_primary, deploy_others" description="deploy cspace ui to ${jee.server.cspace}">				
+		<!-- Trigger dependencies -->
+	</target>
+		
+	<!-- General undeploy target -->
+
+	<target name="undeploy_others" unless="${env.CSPACE_PRIMARY_UIPLUGIN}">
+		<antcall target="undeploy_publicart" />
+		<antcall target="undeploy_anthro" />
+	</target>
+		
+	<target name="undeploy" depends="undeploy_core, undeploy_primary, undeploy_others" description="undeploy collectionspace ui components from ${jee.server.cspace}">
+	</target>
+
 </project>
diff --git a/cspace-ui/cspace#anthro/index.html b/cspace-ui/cspace#anthro/index.html
index a51e06f43..25573678a 100644
--- a/cspace-ui/cspace#anthro/index.html
+++ b/cspace-ui/cspace#anthro/index.html
@@ -8,7 +8,7 @@
 		<script src="/cspace-ui/cspaceUIPluginProfileAnthro@@PLUGIN_VERSION@.min.js"></script>
 		<script>
 			cspaceUI({
-				basename: '/cspace/anthro',
+				basename: '@PLUGIN_BASENAME@',
 				prettyUrls: true,
 				plugins: [
 					cspaceUIPluginProfileAnthro(),
diff --git a/cspace-ui/cspace#core/index.html b/cspace-ui/cspace#core/index.html
index dc5b11501..dbc009f2d 100644
--- a/cspace-ui/cspace#core/index.html
+++ b/cspace-ui/cspace#core/index.html
@@ -7,7 +7,7 @@
 		<script src="/cspace-ui/cspaceUI@@UI_VERSION@.min.js"></script>
 		<script>
 			cspaceUI({
-				basename: '/cspace/core',
+				basename: '@PLUGIN_BASENAME@',
 				prettyUrls: true,
 			});
 		</script>
diff --git a/cspace-ui/cspace#dvp/index.html b/cspace-ui/cspace#dvp/index.html
index 0f183e61e..d394d7d62 100644
--- a/cspace-ui/cspace#dvp/index.html
+++ b/cspace-ui/cspace#dvp/index.html
@@ -8,7 +8,7 @@
 		<script src="/cspace-ui/cspaceUIPluginProfileDartmouthVietnamProject@@PLUGIN_VERSION@.min.js"></script>
 		<script>
 			cspaceUI({
-				basename: '/cspace/dvp',
+				basename: '@PLUGIN_BASENAME@',
 				prettyUrls: true,
 				plugins: [
 					cspaceUIPluginProfileDartmouthVietnamProject(),
diff --git a/cspace-ui/cspace#publicart/index.html b/cspace-ui/cspace#publicart/index.html
index 69661fe8d..562f52446 100644
--- a/cspace-ui/cspace#publicart/index.html
+++ b/cspace-ui/cspace#publicart/index.html
@@ -8,7 +8,7 @@
 		<script src="/cspace-ui/cspaceUIPluginProfilePublicArt@@PLUGIN_VERSION@.min.js"></script>
 		<script>
 			cspaceUI({
-				basename: '/cspace/publicart',
+				basename: '@PLUGIN_BASENAME@',
 				prettyUrls: true,
 				plugins: [
 					cspaceUIPluginProfilePublicArt(),