trinidad _sdk_ feature not excluded when it should be
diff --git a/releng.wtpbuilder/one_time_use_scripts/fixzips2.xml b/releng.wtpbuilder/one_time_use_scripts/fixzips2.xml
new file mode 100644
index 0000000..67742f5
--- /dev/null
+++ b/releng.wtpbuilder/one_time_use_scripts/fixzips2.xml
@@ -0,0 +1,32 @@
+<project default="fixzips" basedir=".">
+	<target name="fixzips">
+		<property name="buildDirectory" value="/shared/webtools/committers/wtp-R3.0-R/20080616152118" />
+		<property name="buildLabel" value="R-3.0-20080616152118" />
+    <antcall target="fixzip">
+      <param name="newarchiveName" value="wtp-sdk-noop-R-3.0-20080616152118a.zip" />
+      <param name="archiveName" value="wtp-sdk-noop-R-3.0-20080616152118ORIG.zip" />
+    </antcall>
+	</target>
+	<target name="fixzip">
+		<zip destfile="${buildDirectory}/${buildLabel}/${newarchiveName}">
+			<zipfileset src="${buildDirectory}/${buildLabel}/${archiveName}" excludes="eclipse/features/org.eclipse.jpt.sdk*/**,eclipse/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport*/**" />
+		</zip>
+		<antcall target="createChecksums">
+			<param name="archiveName" value="${newarchiveName}" />
+		</antcall>
+	</target>
+	<target name="createChecksums">
+		<!-- This createChecksums task creates two files, for use in two contexts.
+          a. an x.md5 file, that has the name of the file in the contents.
+          This is good for some "third party" executables, like md5summ, that
+          expects the name in the file.
+          b. since ant does not deal well with md5 files with anything in them
+          other than the checksum, we provide same thing in a file with
+          an md5antformat extension, that has only the checksum.
+      -->
+		<mkdir dir="${buildDirectory}/${buildLabel}/checksum" />
+		<checksum file="${buildDirectory}/${buildLabel}/${archiveName}" property="md5" />
+		<echo message="${md5} *${archiveName}" file="${buildDirectory}/${buildLabel}/checksum/${archiveName}.md5" />
+		<echo message="${md5}" file="${buildDirectory}/${buildLabel}/checksum/${archiveName}.md5antformat" />
+	</target>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/releng.wtpbuilder build.xml.launch b/releng.wtpbuilder/releng.wtpbuilder build.xml.launch
index 30e6105..2fe9111 100644
--- a/releng.wtpbuilder/releng.wtpbuilder build.xml.launch
+++ b/releng.wtpbuilder/releng.wtpbuilder build.xml.launch
@@ -10,27 +10,27 @@
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="ANT_HOME" value="/home/shared/webtools/apps/apache-ant-1.7.0"/>
-<mapEntry key="CVS_RSH" value="ssh"/>
-<mapEntry key="DISPLAY" value="127.0.0.1:11.0"/>
-<mapEntry key="RELENGMAPS" value="webtools.maps"/>
-<mapEntry key="LOCAL_PREREQS_CACHE" value="/home/shared/workbenchbuild/prereqcache"/>
-<mapEntry key="BUILD_CVS_WRITE_PROTOCOL" value="ext"/>
-<mapEntry key="USE_LOCAL_MAPS" value="false"/>
 <mapEntry key="BUILD_HOME" value="/home/shared/workbenchbuild/"/>
-<mapEntry key="BASEWS" value="gtk"/>
-<mapEntry key="BUILD_CVS_WRITE_USER" value="david_williams"/>
+<mapEntry key="USE_LOCAL_MAPS" value="false"/>
+<mapEntry key="RELENGJSF" value="webtools.maps/releng.jsf"/>
 <mapEntry key="BUILD_CVS_SERVER" value="dev.eclipse.org"/>
-<mapEntry key="JAVA_5_HOME" value="/home/shared/webtools/apps/jdk1.5.0_12"/>
-<mapEntry key="RELENG" value="webtools.maps/releng"/>
-<mapEntry key="BASEARCH" value="x86"/>
-<mapEntry key="BASEOS" value="linux"/>
-<mapEntry key="LOCAL_BUILD_PROPERTIES_DIR" value="/home/shared/workbenchbuild/localBuildProperties"/>
 <mapEntry key="JAVA_4_HOME" value="/home/shared/webtools/apps/j2sdk1.4.2_14"/>
+<mapEntry key="ANT_HOME" value="/home/shared/webtools/apps/apache-ant-1.7.0"/>
+<mapEntry key="DISPLAY" value="127.0.0.1:11.0"/>
 <mapEntry key="RELENG_BUILDER" value="webtools.releng/releng.wtpbuilder"/>
 <mapEntry key="RELENGDALI" value="webtools.maps/releng.dali"/>
+<mapEntry key="CVS_RSH" value="ssh"/>
+<mapEntry key="RELENGMAPS" value="webtools.maps"/>
+<mapEntry key="JAVA_5_HOME" value="/home/shared/webtools/apps/jdk1.5.0_12"/>
+<mapEntry key="LOCAL_BUILD_PROPERTIES_DIR" value="/home/shared/workbenchbuild/localBuildProperties"/>
+<mapEntry key="BASEWS" value="gtk"/>
+<mapEntry key="BUILD_CVS_WRITE_PROTOCOL" value="ext"/>
 <mapEntry key="BUILD_CVS_ROOT" value="/cvsroot/webtools"/>
-<mapEntry key="RELENGJSF" value="webtools.maps/releng.jsf"/>
+<mapEntry key="RELENG" value="webtools.maps/releng"/>
+<mapEntry key="BASEOS" value="linux"/>
+<mapEntry key="LOCAL_PREREQS_CACHE" value="/home/shared/workbenchbuild/prereqcache"/>
+<mapEntry key="BUILD_CVS_WRITE_USER" value="david_williams"/>
+<mapEntry key="BASEARCH" value="x86"/>
 </mapAttribute>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
@@ -41,15 +41,15 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="releng.wtpbuilder"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
+<mapEntry key="eclipse.pdebuild.home" value="/home/davidw/eclipse/plugins/org.eclipse.pde.build_3.3.0.v20070517/./"/>
+<mapEntry key="buildBranch" value="R3.0"/>
+<mapEntry key="releng.dali-mapVersionTag" value="HEAD"/>
+<mapEntry key="mapVersionTag" value="HEAD"/>
 <mapEntry key="eclipse.pdebuild.scripts" value="/home/davidw/eclipse/plugins/org.eclipse.pde.build_3.3.0.v20070517/scripts/"/>
+<mapEntry key="eclipse.pdebuild.templates" value="/home/davidw/eclipse/plugins/org.eclipse.pde.build_3.3.0.v20070517/templates/"/>
 <mapEntry key="releng.jsf-mapVersionTag" value="HEAD"/>
 <mapEntry key="build.distribution" value="wtp"/>
-<mapEntry key="mapVersionTag" value="HEAD"/>
-<mapEntry key="releng.dali-mapVersionTag" value="HEAD"/>
-<mapEntry key="eclipse.pdebuild.templates" value="/home/davidw/eclipse/plugins/org.eclipse.pde.build_3.3.0.v20070517/templates/"/>
 <mapEntry key="buildType" value="I"/>
-<mapEntry key="buildBranch" value="R3.0"/>
-<mapEntry key="eclipse.pdebuild.home" value="/home/davidw/eclipse/plugins/org.eclipse.pde.build_3.3.0.v20070517/./"/>
 </mapAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/releng.wtpbuilder/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-d"/>