move to packaging construct
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index e941d21..948abf2 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -1,231 +1,252 @@
 <project name="Build specific targets and properties"
          default="noDefault">
-    <property name="postingDirectory"
+	<property name="postingDirectory"
               value="${buildDirectory}" />
 
-    <!-- ===================================================================== -->
-    <!-- Run a given ${target} on all elements being built -->
-    <!-- Add on <ant> task for each top level element being built. -->
-    <!-- ===================================================================== -->
-    <target name="allElements">
-        <echo message="Target:${target} " />
-        <echo message="basedir: ${basedir}" />
-        <echo message="component: ${component}" />
-        <echo message="buildDirectory: ${buildDirectory}" />
-        <echo message="baseLocation: ${baseLocation}" />
-        <ant antfile="${genericTargets}" target="${target}">
-            <property name="type" value="feature" />
-            <property name="id"
-                      value="org.eclipse.wst.sdk" />
-        </ant>
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Targets to assemble the built elements for particular configurations  -->
-    <!-- These generally call the generated assemble scripts (named in -->
-    <!-- ${assembleScriptName}) but may also add pre and post processing -->
-    <!-- Add one target for each root element and each configuration -->
-    <!-- ===================================================================== -->
-
-    <target name="assemble.org.eclipse.wst.sdk">
-        <property name="archiveName"
-                  value="wtp-wst-sdk-${buildLabel}.zip" />
-        <ant antfile="${assembleScriptName}"
-             dir="${buildDirectory}" />
-
-       	<ant antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" target="unpackUpdateJarsAndCreateZippedPackages">
-        		<property name="postingDirectory" value="${postingDirectory}"/>
-        		<property name="buildDirectory" value="${buildDirectory}"/>
-        		<property name="buildLabel" value="${buildLabel}"/>
-    			<property name="archiveName" value="${archiveName}"/>
-        	</ant>
-        		
-        	<ant antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" target="createChecksums">
-        		<property name="postingDirectory" value="${postingDirectory}"/>
-        		<property name="buildLabel" value="${buildLabel}"/>
-    			<property name="archiveName" value="${archiveName}"/>
-        	</ant>
-          	
-    	
-    </target>
-
-	
-	
 	<!-- ===================================================================== -->
-    <!-- Check out map files from correct repository -->
-    <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-    <!-- ===================================================================== -->
-    <target name="checkLocal">
-        <available property="mapsLocal"
+	<!-- Run a given ${target} on all elements being built -->
+	<!-- Add on <ant> task for each top level element being built. -->
+	<!-- ===================================================================== -->
+	<target name="allElements">
+		<echo message="Target:${target} " />
+		<echo message="basedir: ${basedir}" />
+		<echo message="component: ${component}" />
+		<echo message="buildDirectory: ${buildDirectory}" />
+		<echo message="baseLocation: ${baseLocation}" />
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id"
+                      value="org.eclipse.wst.sdk" />
+		</ant>
+	</target>
+
+	<!-- ===================================================================== -->
+	<!-- Targets to assemble the built elements for particular configurations  -->
+	<!-- These generally call the generated assemble scripts (named in -->
+	<!-- ${assembleScriptName}) but may also add pre and post processing -->
+	<!-- Add one target for each root element and each configuration -->
+	<!-- ===================================================================== -->
+
+	<target name="assemble.org.eclipse.wst.sdk">
+		<property name="archiveName"
+                  value="wtp-wst-sdk-${buildLabel}.zip" />
+		<ant antfile="${assembleScriptName}"
+             dir="${buildDirectory}" />
+	</target>
+
+	<target name="prePackage" />
+
+	<target name="postPackage">
+
+		<property name="archiveName" 
+			value="wtp-wst-sdk-${buildLabel}.zip" />
+
+		<ant antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" target="unpackUpdateJarsAndCreateZippedPackages">
+			<property name="postingDirectory" value="${postingDirectory}"/>
+			<property name="buildDirectory" value="${buildDirectory}"/>
+			<property name="buildLabel" value="${buildLabel}"/>
+			<property name="archiveName" value="${archiveName}"/>
+		</ant>
+
+
+
+		<!-- not sure this merge should be necessary here ... it is current partially because currently 
+		third party plugins do not have "src" build properties. 
+		but, eventually, we also want to make sdk features "require" (not include) 
+		runtime features, so then we'll always have to "manually" merge when creating the 
+		zips.	
+	-->
+		<zip destfile="${postingDirectory}/${buildLabel}/${archiveName}" update="true">
+			<zipfileset src="${postingDirectory}/${buildLabel}/wtp-wst-${buildLabel}.zip"/>
+		</zip>
+
+
+
+		<ant antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" target="createChecksums">
+			<property name="postingDirectory" value="${postingDirectory}"/>
+			<property name="buildLabel" value="${buildLabel}"/>
+			<property name="archiveName" value="${archiveName}"/>
+		</ant>
+
+
+	</target>
+
+
+
+	<!-- ===================================================================== -->
+	<!-- Check out map files from correct repository -->
+	<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
+	<!-- ===================================================================== -->
+	<target name="checkLocal">
+		<available property="mapsLocal"
                    file="${buildDirectory}/maps/releng" />
-    </target>
-    <target name="getMapFiles"
+	</target>
+	<target name="getMapFiles"
             depends="checkLocal"
             unless="mapsLocal">
 
-        <!-- ***  change the repo info -->
-        <property name="mapCvsRoot"
+		<!-- ***  change the repo info -->
+		<property name="mapCvsRoot"
                   value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
-        <property name="mapVersionTag" value="HEAD" />
-        <echo message="${mapCvsRoot} ${mapVersionTag} ">
-        </echo>
-        <cvs cvsRoot="${mapCvsRoot}"
+		<property name="mapVersionTag" value="HEAD" />
+		<echo message="${mapCvsRoot} ${mapVersionTag} ">
+		</echo>
+		<cvs cvsRoot="${mapCvsRoot}"
              package="releng"
              dest="${buildDirectory}/maps"
              tag="${mapVersionTag}" />
-        <!--tag the map files project-->
-        <antcall target="tagMapFiles">
-            <param name="mapCvsRoot"
+		<!--tag the map files project-->
+		<antcall target="tagMapFiles">
+			<param name="mapCvsRoot"
                    value="${mapCvsRoot}" />
-        </antcall>
-    </target>
+		</antcall>
+	</target>
 
-    <target name="tagMapFiles" if="tagMaps">
-        <cvs cvsRoot="${mapCvsRoot}"
+	<target name="tagMapFiles" if="tagMaps">
+		<cvs cvsRoot="${mapCvsRoot}"
              dest="${buildDirectory}/maps"
              command="tag v${buildType}${timestamp}" />
-    </target>
+	</target>
 
-    <!-- ===================================================================== -->
-    <!-- Steps to do before setup -->
-    <!-- ===================================================================== -->
-    <target name="preSetup">
-    </target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do before setup -->
+	<!-- ===================================================================== -->
+	<target name="preSetup">
+	</target>
 
-    <!-- ===================================================================== -->
-    <!-- Steps to do after setup but before starting the build proper -->
-    <!-- ===================================================================== -->
-    <target name="postSetup">
-        <dirname file="${ant.file}"
+	<!-- ===================================================================== -->
+	<!-- Steps to do after setup but before starting the build proper -->
+	<!-- ===================================================================== -->
+	<target name="postSetup">
+		<dirname file="${ant.file}"
                  property="component.dir" />
-        <echo message="${buildDirectory}/maps/releng/maps/dependencies.properties" />
-        <ant antfile="${component.dir}/dependency.xml"
+		<echo message="${buildDirectory}/maps/releng/maps/dependencies.properties" />
+		<ant antfile="${component.dir}/dependency.xml"
              target="get">
-            <property name="dependency.properties"
+			<property name="dependency.properties"
                       value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
-            <property name="base.install.dir"
+			<property name="base.install.dir"
                       value="${buildRoot}" />
-        </ant>
-    </target>
+		</ant>
+	</target>
 
-    <!-- ===================================================================== -->
-    <!-- Steps to do before fetching the build elements -->
-    <!-- ===================================================================== -->
-    <target name="preFetch">
-    </target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do before fetching the build elements -->
+	<!-- ===================================================================== -->
+	<target name="preFetch">
+	</target>
 
-    <!-- ===================================================================== -->
-    <!-- Steps to do after fetching the build elements -->
-    <!-- ===================================================================== -->
-    <target name="postFetch">
-    </target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do after fetching the build elements -->
+	<!-- ===================================================================== -->
+	<target name="postFetch">
+	</target>
 
-    <!-- ===================================================================== -->
-    <!-- Steps to do before generating the build scripts. -->
-    <!-- ===================================================================== -->
-    <target name="preGenerate">
-    </target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do before generating the build scripts. -->
+	<!-- ===================================================================== -->
+	<target name="preGenerate">
+	</target>
 
-    <!-- ===================================================================== -->
-    <!-- Steps to do after generating the build scripts. -->
-    <!-- ===================================================================== -->
-    <target name="postGenerate">
-    </target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do after generating the build scripts. -->
+	<!-- ===================================================================== -->
+	<target name="postGenerate">
+	</target>
 
 
-    <!-- ===================================================================== -->
-    <!-- Steps to do before running the build.xmls for the elements being built. -->
-    <!-- ===================================================================== -->
-    <target name="preProcess">
-        <replace dir="${buildDirectory}/plugins"
+	<!-- ===================================================================== -->
+	<!-- Steps to do before running the build.xmls for the elements being built. -->
+	<!-- ===================================================================== -->
+	<target name="preProcess">
+		<replace dir="${buildDirectory}/plugins"
                  value="${timestamp}"
                  token="@build@">
-            <include name="**/about.mappings" />
-        </replace>
-    </target>
+			<include name="**/about.mappings" />
+		</replace>
+	</target>
 
-    <!-- ===================================================================== -->
-    <!-- Steps to do after running the build.xmls for the elements being built. -->
-    <!-- ===================================================================== -->
-    <target name="postProcess">
-        <condition property="logsAvailable">
-            <istrue value="${javacVerbose}" />
-        </condition>
-        <antcall target="gatherLogs" />
-    </target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do after running the build.xmls for the elements being built. -->
+	<!-- ===================================================================== -->
+	<target name="postProcess">
+		<condition property="logsAvailable">
+			<istrue value="${javacVerbose}" />
+		</condition>
+		<antcall target="gatherLogs" />
+	</target>
 
 
-    <!-- ===================================================================== -->
-    <!-- Steps to do before running assemble. -->
-    <!-- ===================================================================== -->
-    <target name="preAssemble">
-        <ant antfile="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml">
-            <property name="baseLocation"
+	<!-- ===================================================================== -->
+	<!-- Steps to do before running assemble. -->
+	<!-- ===================================================================== -->
+	<target name="preAssemble">
+		<ant antfile="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml">
+			<property name="baseLocation"
                       value="${baseLocation}" />
-            <property name="basedir"
+			<property name="basedir"
                       value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer" />
-            <property name="buildDirectory"
+			<property name="buildDirectory"
                       value="${buildDirectory}" />
-        </ant>
+		</ant>
 
-    </target>
+	</target>
 
-    <!-- ===================================================================== -->
-    <!-- Steps to do after  running assemble. -->
-    <!-- ===================================================================== -->
-    <target name="postAssemble">
+	<!-- ===================================================================== -->
+	<!-- Steps to do after  running assemble. -->
+	<!-- ===================================================================== -->
+	<target name="postAssemble">
 
-    </target>
+	</target>
 
-    <!-- ===================================================================== -->
-    <!-- Steps to do after the build is done. -->
-    <!-- ===================================================================== -->
-    <target name="postBuild">
-    </target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do after the build is done. -->
+	<!-- ===================================================================== -->
+	<target name="postBuild">
+	</target>
 
 
+	<!-- ===================================================================== -->
+	<!-- Steps to do to test the build results -->
+	<!-- ===================================================================== -->
+	<target name="test">
+	</target>
 
-    <!-- ===================================================================== -->
-    <!-- Steps to do to test the build results -->
-    <!-- ===================================================================== -->
-    <target name="test">
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Steps to do to publish the build results -->
-    <!-- ===================================================================== -->
-    <target name="publish">
-    </target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do to publish the build results -->
+	<!-- ===================================================================== -->
+	<target name="publish">
+	</target>
 
 
-    <!-- ===================================================================== -->
-    <!-- Helper targets -->
-    <!-- ===================================================================== -->
-    <target name="gatherLogs" if="logsAvailable">
-        <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-        <antcall target="allElements">
-            <param name="target" value="gatherLogs" />
-        </antcall>
+	<!-- ===================================================================== -->
+	<!-- Helper targets -->
+	<!-- ===================================================================== -->
+	<target name="gatherLogs" if="logsAvailable">
+		<mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
+		<antcall target="allElements">
+			<param name="target" value="gatherLogs" />
+		</antcall>
 
-        <unzip dest="${buildDirectory}/${buildLabel}/compilelogs"
+		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs"
                overwrite="true">
-            <fileset dir="${buildDirectory}/features/org.eclipse.wst.sdk">
-                <include name="*.log.zip" />
-            </fileset>
-        </unzip>
-    </target>
+			<fileset dir="${buildDirectory}/features/org.eclipse.wst.sdk">
+				<include name="*.log.zip" />
+			</fileset>
+		</unzip>
+	</target>
 
-    <target name="clean" unless="noclean">
-        <antcall target="allElements">
-            <param name="target" value="cleanElement" />
-        </antcall>
-    </target>
+	<target name="clean" unless="noclean">
+		<antcall target="allElements">
+			<param name="target" value="cleanElement" />
+		</antcall>
+	</target>
 
-    <!-- ===================================================================== -->
-    <!-- Default target                                                        -->
-    <!-- ===================================================================== -->
-    <target name="noDefault">
-        <echo message="You must specify a target when invoking this file" />
-    </target>
+	<!-- ===================================================================== -->
+	<!-- Default target                                                        -->
+	<!-- ===================================================================== -->
+	<target name="noDefault">
+		<echo message="You must specify a target when invoking this file" />
+	</target>
 
 </project>