From 48e0656dffbb9ff724edac374b52ae2ca3e38044 Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Wed, 2 Jul 2014 15:58:50 -0500
Subject: [PATCH] Omaha #3339 - allow deployment of a WA-specific esb directory
 to provide EDEX configuration.

The WA-specific directory is assumed to be in the edex directory of the work assignment and named deploy.edex-${NAME} where ${NAME} is the name of the Work Assignment.


Former-commit-id: 7220057d304f6bdf8feca6db045b69569aa16189 [formerly 32aa07f1fcb10f54e05abd0a0f327f51d1f895e2] [formerly 984842331df5e95fef105b40a90e6e379a7a193d] [formerly 49ffec76ff2e5fff39f2213d3cebc74de8a14470 [formerly 984842331df5e95fef105b40a90e6e379a7a193d [formerly 146e5ebed335bf25cbae152eef1b0544e833f741]]]
Former-commit-id: 49ffec76ff2e5fff39f2213d3cebc74de8a14470
Former-commit-id: a0e7e5fc3cecd53e7af40ec39cf5fd688ffa6a2e [formerly 9fa0118ce944b4edf1712674c67339786f65c16a]
Former-commit-id: 4e295dba499a21d1bc339ff4e795951b8828a238
---
 .../build.edex/deploy-common/deploy-esb.xml   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/edexOsgi/build.edex/deploy-common/deploy-esb.xml b/edexOsgi/build.edex/deploy-common/deploy-esb.xml
index f257cadbeb..040323265b 100644
--- a/edexOsgi/build.edex/deploy-common/deploy-esb.xml
+++ b/edexOsgi/build.edex/deploy-common/deploy-esb.xml
@@ -10,6 +10,11 @@
 		
 		<antcall target="cleanup" />
 		
+		<!-- Determine if any Work Assignments have been specified. -->
+		<condition property="wa.enabled">
+			<not><equals arg1="${wa.to.deploy}" arg2="" /></not>
+		</condition>
+		
 		<antcall target="deploy.esb" />
 		<if>
 			<equals arg1="${deploy.data}" arg2="true" />
@@ -17,6 +22,32 @@
 				<antcall target="deploy.esb-data" />
 			</then>
 		</if>
+		
+		<if>
+			<isset property="wa.enabled" />
+			<then>
+				<for list="${wa.to.deploy}" param="wa"
+				delimiter="${path.separator}">
+					<sequential>
+						<basename property="wa.name" file="@{wa}" />
+						<var name="wa.base.directory"
+							value="@{wa}/edex/deploy.edex-${wa.name}" /> 
+						<if>
+							<available file="${wa.base.directory}/esb" 
+								type="dir" />	
+							<then>
+								<copy todir="${edex.root.directory}"
+								overwrite="${esb.overwrite}" failonerror="true">
+									<fileset dir="${wa.base.directory}/esb">
+										<include name="**/*" />
+									</fileset>
+								</copy>
+							</then>
+						</if>
+					</sequential>
+				</for>
+			</then>
+		</if>
 	</target>
 	
 	<target name="cleanup">