CSPACE-6959: Added support for optional property variables. Property …

…variables with a '_OPT' suffix will be treat as optional. Non-optional property variables need to be defined as environment variables or JVM system variables.
ray-lee · Jun 24, 2016 · abc06b9 · abc06b9
1 parent 370cee7
commit abc06b9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/...ation/src/main/java/org/collectionspace/chain/installation/ServiceBindingsGeneration.java b/...ation/src/main/java/org/collectionspace/chain/installation/ServiceBindingsGeneration.java
@@ -294,11 +294,17 @@ private void makeRemoteClients(Element tenantBindingElement) {
 				ele = remoteClientElement.addElement(new QName("password", nstenant));
 				ele.addText(remoteClient.getPassword());
 
-				ele = remoteClientElement.addElement(new QName("tenantId", nstenant));
-				ele.addText(remoteClient.getTenantId());
+				// Optional
+				if (remoteClient.getTenantId() != null) {
+					ele = remoteClientElement.addElement(new QName("tenantId", nstenant));
+					ele.addText(remoteClient.getTenantId());
+				}
 
-				ele = remoteClientElement.addElement(new QName("tenantName", nstenant));
-				ele.addText(remoteClient.getTenantName());
+				// Optional
+				if (remoteClient.getTenantName() != null) {
+					ele = remoteClientElement.addElement(new QName("tenantName", nstenant));
+					ele.addText(remoteClient.getTenantName());
+				}
 
 				ele = remoteClientElement.addElement(new QName("ssl", nstenant));
 				ele.addText(remoteClient.getSSL());

diff --git a/tomcat-main/src/main/resources/tenants/materials/settings.xml b/tomcat-main/src/main/resources/tenants/materials/settings.xml
@@ -73,13 +73,11 @@
 			<remoteclients>
 				<remoteclient>
 					<name>default</name>
-					<url>${CSPACE_CLIENT_SAS_URL}</url>
-					<user>${CSPACE_CLIENT_SAS_USER}</user>
-					<password>${CSPACE_CLIENT_SAS_PASSWORD}</password>
-					<ssl>${CSPACE_CLIENT_SAS_SSL}</ssl>
+					<url>${CSPACE_CLIENT_SAS_URL_OPT}</url>
+					<user>${CSPACE_CLIENT_SAS_USER_OPT}</user>
+					<password>${CSPACE_CLIENT_SAS_PASSWORD_OPT}</password>
+					<ssl>${CSPACE_CLIENT_SAS_SSL_OPT}</ssl>
 					<auth>true</auth>
-					<tenantId>2</tenantId>
-					<tenantName>testsci.collectionspace.org</tenantName>
 				</remoteclient>
 			</remoteclients>			
             <ims-url>/collectionspace/tenant/materials/</ims-url>