no longer need to build war as a special case

releng.wtpbuilder/components/wst-sdk/customTargets.xml

@@ -213,10 +213,30 @@
 
     <!-- ===================================================================== -->
     <!-- Steps to do before running assemble. -->
-    <!-- ===================================================================== -->
-    <target name="preAssemble">
-        <ant
-            antfile="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml">
+    <!-- Note: in version 2.0 (and previous) we need to build the 
+        explorer war file by invoking script. In 3.0 forward, we do not, 
+        so this simple existence check allows us to use the same script for 
+        both streams -->
+    <!-- ===================================================================== -->
+    <property
+        name="buildwarfilename"
+        value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml" />
+    <target
+        name="preAssemble"
+        depends="buildwar">
+    </target>
+
+    <target name="checkForBuildFile">
+        <condition property="buildFileExists">
+            <available file="${buildwarfilename}" />
+        </condition>
+    </target>
+
+    <target
+        name="buildwar"
+        depends="checkForBuildFile"
+        if="buildFileExists">
+        <ant antfile="${buildwarfilename}">
             <property
                 name="baseLocation"
                 value="${baseLocation}" />

releng.wtpbuilder/components/wst/customTargets.xml

@@ -217,8 +217,40 @@
 
     <!-- ===================================================================== -->
     <!-- Steps to do before running assemble. -->
-    <!-- ===================================================================== -->
-    <target name="preAssemble">
+    <!-- Note: in version 2.0 (and previous) we need to build the 
+        explorer war file by invoking script. In 3.0 forward, we do not, 
+        so this simple existence check allows us to use the same script for 
+        both streams -->
+    <!-- ===================================================================== -->
+    <property
+        name="buildwarfilename"
+        value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml" />
+    <target
+        name="preAssemble"
+        depends="buildwar">
+    </target>
+
+    <target name="checkForBuildFile">
+        <condition property="buildFileExists">
+            <available file="${buildwarfilename}" />
+        </condition>
+    </target>
+
+    <target
+        name="buildwar"
+        depends="checkForBuildFile"
+        if="buildFileExists">
+        <ant antfile="${buildwarfilename}">
+            <property
+                name="baseLocation"
+                value="${baseLocation}" />
+            <property
+                name="basedir"
+                value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer" />
+            <property
+                name="buildDirectory"
+                value="${buildDirectory}" />
+        </ant>
     </target>
 
     <!-- ===================================================================== -->