From 8359361a2fdcde08a13a4f5d76c321a87cf9be25 Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Thu, 2 Aug 2012 10:33:55 -0500
Subject: [PATCH] Issue #797 - deploy-install improvements; removed references
 to non-existent files from build.properties.

Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36

Former-commit-id: 642d57b71d22f527992a3050744d71a2395fa4ea [formerly dd1acbe70aed29f489084ba54b2f973aa90331e8] [formerly c6b2d65308aa990291b027cf30e773427b010e78] [formerly 5ca4a66fdc6f596880437c28772b226b3bb1df99 [formerly c6b2d65308aa990291b027cf30e773427b010e78 [formerly d64577e7804cc8a235efebff53722bac3cde9cc7]]]
Former-commit-id: 5ca4a66fdc6f596880437c28772b226b3bb1df99
Former-commit-id: f0e488e17505a4686cc6a6a7196566ed2a0f1fee [formerly f295ee11ead341a721ff94e7fd95acbaa58f1d9f]
Former-commit-id: 14c20083b067a7f9b9ee1c79328a5f04995ee887
---
 .../deploy-common/plugin-methods.xml          | 108 +++++++++++++-----
 .../build.properties                          |   3 +-
 .../build.properties                          |   3 +-
 3 files changed, 82 insertions(+), 32 deletions(-)

diff --git a/edexOsgi/build.edex/deploy-common/plugin-methods.xml b/edexOsgi/build.edex/deploy-common/plugin-methods.xml
index eaf70acce8..a71b710e38 100644
--- a/edexOsgi/build.edex/deploy-common/plugin-methods.xml
+++ b/edexOsgi/build.edex/deploy-common/plugin-methods.xml
@@ -112,34 +112,10 @@
 	 			<else>
 	 				<var name="plugin.utility"
 	 					value="${plugin.base}/utility" />
-	 				 			
-	 				<if>
-	 					<available file="${plugin.bin}" type="dir" />
-	 					<then>
-	 						<jar destfile="${jar.destfile}"
-	 						manifest="${plugin.base}/META-INF/MANIFEST.MF">
-	 							<fileset dir="${plugin.bin}"
-	 								includes="**/*.class" />
-	 							<fileset dir="${plugin.base}"
-	 								includes="res/**/*" />
-	 							<fileset dir="${plugin.base}"
-	 								includes="META-INF/**/*" />
-	 							<fileset dir="${plugin.base}"
-	 								includes="*.py" />
-	 						</jar>
-	 					</then>
-	 					<else>
-	 						<jar destfile="${jar.destfile}"
-	 						manifest="${plugin.base}/META-INF/MANIFEST.MF">
-	 							<fileset dir="${plugin.base}"
-	 								includes="res/**/*" />
-	 							<fileset dir="${plugin.base}"
-	 								includes="META-INF/**/*" />
-	 							<fileset dir="${plugin.base}"
-	 								includes="*.py" />
-	 						</jar>
-	 					</else>
-	 				</if>
+					
+	 				<jarPlugin
+	 					plugin.directory323="${plugin.base}"
+	 					jar.file323="${jar.destfile}" />
 	 			
 	 				<!-- copy the utility (localization) files. -->
 	 				<if>
@@ -157,4 +133,80 @@
 	 		</if>
 		</sequential>
 	</macrodef>
+	
+	<macrodef name="jarPlugin">
+		<!-- 
+			random character suffixes added to 
+			maintain uniqueness of variable names 
+		-->
+		<attribute name="plugin.directory323" />
+		<attribute name="jar.file323" />		
+		
+		<sequential>
+			<!-- 
+				initial jar file: currently we make the assumption
+				every plugin has a manifest file. 
+			-->
+			<jar destfile="@{jar.file323}"
+				manifest="@{plugin.directory323}/META-INF/MANIFEST.MF" />
+			
+			<!-- scan build.properties -->
+			<var file="@{plugin.directory323}/build.properties" />
+			
+			<!--
+				* iterate through bin.includes
+				* '.' is seen as the ${output..} directory, itself
+				* artifacts are only deployed if they are present
+			-->
+			<for list="${bin.includes}" param="include"
+			delimiter="," trim="true">
+				<sequential>					
+					<if>
+						<available file="@{plugin.directory323}/@{include}"
+							type="dir" />
+						<then>
+							<!-- deploy a directory -->
+							
+							<!-- is this the output directory? -->
+							<if>
+								<equals arg1="@{include}" arg2="." />
+								<then>
+	 								<jar destfile="@{jar.file323}" update="true">
+	 									<fileset 
+	 									dir="@{plugin.directory323}/${output..}" 
+	 									includes="**" />
+	 								</jar>
+								</then>
+								<else>
+									<jar destfile="@{jar.file323}" update="true">
+										<fileset 
+										dir="@{plugin.directory323}" 
+										includes="@{include}/**" />
+									</jar>
+								</else>
+							</if>
+						</then>
+						<else>
+							<!-- are we deploying a file? -->
+							<if>
+								<available file="@{plugin.directory323}/@{include}"
+									type="file" />
+								<then>
+ 									<jar destfile="@{jar.file323}" update="true">
+ 										<fileset 
+ 										file="@{plugin.directory323}/@{include}" />
+ 									</jar>
+								</then>
+								<else>
+									<!-- fail: unknown deployment artifact -->
+									<fail
+										message="Unable to deploy '@{include}' specified in @{plugin.directory323}/build.properties; unable to find the file / directory." />
+								</else>
+							</if>
+						</else>
+					</if>
+				</sequential>
+			</for>
+		</sequential>
+	</macrodef>
 </project>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/build.properties b/edexOsgi/com.raytheon.uf.common.dataplugin.airep/build.properties
index e9863e281e..34d2e4d2da 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/build.properties
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.airep/build.properties
@@ -1,5 +1,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               plugin.xml
+               .
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.level/build.properties b/edexOsgi/com.raytheon.uf.common.dataplugin.level/build.properties
index e4203be134..34d2e4d2da 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.level/build.properties
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.level/build.properties
@@ -1,5 +1,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               res
+               .