try to get "capabilities build" working again
diff --git a/releng.wtpbuilder/components/wtp-buildTools/build.properties b/releng.wtpbuilder/components/wtp-buildTools/build.properties
index 8838625..26834a5 100644
--- a/releng.wtpbuilder/components/wtp-buildTools/build.properties
+++ b/releng.wtpbuilder/components/wtp-buildTools/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2010 IBM Corporation and others.
+# Copyright (c) 2003, 2012 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -40,6 +40,11 @@
 p2.compress=true
 skipMirroring=true
 
+#############################################################
+
+# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
+# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
+
 flattenDependencies=true
 parallelCompilation=true
 
diff --git a/releng.wtpbuilder/components/wtpcap/allElements.xml b/releng.wtpbuilder/components/wtpcap/allElements.xml
new file mode 100644
index 0000000..2bcb686
--- /dev/null
+++ b/releng.wtpbuilder/components/wtpcap/allElements.xml
@@ -0,0 +1,108 @@
+<project name="allElements Delegator">
+    <property
+        name="defaultAssemblyEnabled"
+        value="true"/>
+    <!--
+        =====================================================================
+    -->
+    <!-- Run a given ${target} on all elements being built -->
+    <!--
+        By default ${topLevelElementType} and ${topLevelElementId}
+        should be
+    -->
+    <!--
+        defined in the builder's build.properties file. You can
+        customize by
+    -->
+    <!-- setting the type/id values directly here. -->
+    <!--
+        You can add additional calls to ${genericTargets} to build more
+        top
+    -->
+    <!-- level elements. -->
+    <!-- -->
+    <!--
+        The top level must exist in the ${buildDirectory},
+        ${baseLocation} or
+    -->
+    <!-- ${pluginPath} locations. -->
+    <!--
+        =====================================================================
+    -->
+    <target name="allElementsDelegator">
+        <ant
+            antfile="${genericTargets}"
+            target="${target}">
+            <property
+                name="type"
+                value="${topLevelElementType}"/>
+            <property
+                name="id"
+                value="${topLevelElementId}"/>
+        </ant>
+    </target>
+    <!--
+        ======================================================================
+    -->
+    <!--
+        The default assemble target, this will be called to assemble
+        each
+    -->
+    <!-- config if a custom assemble target is not defined. -->
+    <!-- The following properties will be defined: -->
+    <!--
+        config : The configuration being assembled eg "win32.win32.x86"
+    -->
+    <!-- element: The element being assembled eg "org.eclipse.sdk" -->
+    <!-- assembleScriptName: The assemble script to be called -->
+    <!--
+        ======================================================================
+    -->
+    <target name="defaultAssemble">
+        <echo message="defaultAssemble assembleScriptName: ${assembleScriptName}"/>
+        <ant
+            antfile="${assembleScriptName}"
+            dir="${buildDirectory}"/>
+    </target>
+    <!--
+        =====================================================================
+    -->
+    <!-- Custom 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 for
+        which
+    -->
+    <!--
+        custom processing is desired. Replace element.id with the id of
+        the
+    -->
+    <!--
+        top level element being built. A property with a matching name
+        must
+    -->
+    <!--
+        be defined for this custom target to be called instead of the
+    -->
+    <!-- defaultAssemble target above. -->
+    <!-- Example: name="assemble.org.eclipse.sdk" -->
+    <!-- Example: name="assemble.org.eclipse.sdk.win32.win32.x86" -->
+    <!--
+        ======================================================================
+    -->
+    <property
+        name="assemble.element.id[.config.spec]"
+        value="true"/>
+    <target name="assemble.element.id[.config.spec]">
+        <ant
+            antfile="${assembleScriptName}"
+            dir="${buildDirectory}"/>
+    </target>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtpcap/build.properties b/releng.wtpbuilder/components/wtpcap/build.properties
new file mode 100644
index 0000000..3ad40b4
--- /dev/null
+++ b/releng.wtpbuilder/components/wtpcap/build.properties
@@ -0,0 +1,58 @@
+###############################################################################
+# Copyright (c) 2003, 2012 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+
+# This property file is used automatically by the PDE build process
+
+runPackager=true
+
+# This is a subdirectory of $buildDirectory
+# Set collectingFolder and archivePrefix to . if you want to create archives without
+# trailing eclipse in the paths of the included files
+collectingFolder=eclipse
+logExtension=.xml
+# The prefix that will be used in the generated archive.
+# Does not make sense to use a different archivePrefix than collectingFolder, 
+# because zip wouldn't find any files to include into the target zip otherwise
+archivePrefix=eclipse
+
+# Whether or not to include debug info in the output jars
+javacDebugInfo=true 
+
+# Whether or not to fail the build if there are compiler errors
+javacFailOnError=false
+
+##################################################
+# Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
+# using the JDT Compiler Adapter to compile.
+javacVerbose=true
+
+sign=true
+
+p2.gathering=true
+p2.compress=true
+skipMirroring=true
+
+#############################################################
+
+# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See
+# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
+
+flattenDependencies=true
+parallelCompilation=true
+
+generateSourceReferences=true
+
+compilelogsDir=compilelogs
+
+topLevelElementType=feature
+
+topLevelElementId=org.eclipse.wtp.capabilities.feature
+
diff --git a/releng.wtpbuilder/components/wtpcap/customTargets.xml b/releng.wtpbuilder/components/wtpcap/customTargets.xml
new file mode 100644
index 0000000..9e3c1a2
--- /dev/null
+++ b/releng.wtpbuilder/components/wtpcap/customTargets.xml
@@ -0,0 +1,344 @@
+<project
+    name="PDECustomTargets"
+    default="noDefault"
+    basedir=".">
+    <!--
+        = = = standard properties pattern = = = Note to be
+        cross-platform, "environment variables" are only appropriate for
+        some variables, e.g. ones we set, since properties are case
+        sensitive, even if the environment variables on your operating
+        system are not, e.g. it will be ${env.Path} not ${env.PATH} on
+        Windows
+    -->
+    <property environment="env"/>
+    <!--
+        Let users override standard properties, if desired. If
+        directory, file, or some properties do not exist, then standard
+        properties will be used.
+    -->
+    <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
+
+    <!-- let this project specify properties, if not already set -->
+    <property file="build.properties"/>
+    <fail
+        message="dependency.properties must be specified by distribution script"
+        unless="dependency.properties"/>
+    <fail
+        unless="buildDirectory"
+        message="buildDirectory must be set"/>
+
+    <property
+        name="archiveName"
+        value="${component}-buildrepo-${buildLabel}.zip"/>
+    <property
+        name="p2.metadata.repo.name"
+        value="WTP Build repository: ${buildLabel}/${component}"/>
+    <property
+        name="p2.artifact.repo.name"
+        value="WTP Build repository: ${buildLabel}/${component}"/>
+    <property
+        name="p2buildrepoDirectory"
+        value="${buildDirectory}/${buildLabel}/buildrepository/${component}/"/>
+    <property
+        name="p2.build.repo"
+        value="file://${p2buildrepoDirectory}/"/>
+    <property
+        name="p2.category.definition.file"
+        value="${buildDirectory}/maps/${env.RELENG}/components/${component}/category.xml"/>
+
+    <property
+        name="p2.category.definition"
+        value="file:/${p2.category.definition.file}"/>
+
+<!--
+        Run a given ${target} on all elements being built Add on <ant>
+        task for each top level element being built.
+    -->
+    <available
+        property="allElementsFile"
+        file="${builder}/allElements.xml"
+        value="${builder}/allElements.xml"/>
+    <property
+        name="allElementsFile"
+        location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
+    <import file="${allElementsFile}"/>
+    <target
+        name="allElements"
+        depends="init">
+
+        <antcall target="allElementsDelegator"/>
+    </target>
+
+    <!--
+        Check out map files from repository
+    -->
+    <target name="getMapFiles">
+        <!-- for now, get all, at once. May componetize later. -->
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
+            target="fetchAllMaps"/>
+    </target>
+
+
+    <!--
+        Steps to do before setup
+    -->
+    <target name="preSetup">
+    </target>
+    <!--
+        Steps to do after setup but before starting the build proper
+    -->
+    <target
+        name="postSetup"
+        depends="init">
+        <dirname
+            file="${ant.file}"
+            property="component.dir"/>
+
+        <!-- Get the dependencies -->
+        <antcall target="getDependencies"/>
+
+        <antcall target="updateCategoriesFiles"/>
+    </target>
+    <!--
+        =====================================================================
+    -->
+    <!-- Get the dependencies based on releng maps -->
+    <!--
+        =====================================================================
+    -->
+    <target name="getDependencies">
+        <ant
+            antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
+            target="get">
+            <property
+                name="base.install.dir"
+                value="${buildRoot}"/>
+            <property
+                name="tobeinstalled.properties"
+                value="${buildDirectory}/maps/${env.RELENG}/components/${component}/tobeInstalled.properties"/>
+
+        </ant>
+    </target>
+
+    <!--
+      Steps to do before fetching the build elements
+    -->
+    <target name="preFetch">
+    </target>
+    <target name="postFetch">
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
+            target="unrewriteMaps"/>
+
+    </target>
+    <!--
+        Steps to do before the repositories are being processed
+    -->
+    <target name="preProcessRepos">
+    </target>
+    <!--
+        Steps to do after the repositories have been processed
+    -->
+    <target name="postProcessRepos">
+    </target>
+
+    <!-- 
+        Steps to do before generating the build scripts. 
+     -->
+    <target name="preGenerate">
+    </target>
+
+    <!-- 
+      Steps to do after generating the build scripts.
+     -->
+    <target name="postGenerate">
+
+        <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
+    </target>
+    <!--
+        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>
+    <!--
+        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">
+    </target>
+
+
+
+    <!--
+      Steps to do after  running assemble.
+    -->
+    <target name="postAssemble">
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
+            target="conditionAndSignJars"/>
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
+            target="finishPackages"/>
+
+    </target>
+
+    <!--
+      Steps to do after the build is done.
+    -->
+    <target name="prePackage">
+    </target>
+
+    <!-- Steps to do after  running package. -->
+    <target name="postPackage">
+    </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 publish the build results
+    -->
+    <target name="publish">
+    </target>
+
+    <!--
+      Helper targets
+    -->
+    <target
+        name="gatherLogs"
+        if="logsAvailable"
+        depends="init">
+        <mkdir dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
+
+        <antcall target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/${compilelogsDir}"
+            overwrite="true">
+            <fileset dir="${buildDirectory}/features/${topLevelElementId}">
+                <include name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+    </target>
+    <target
+        name="clean"
+        unless="noclean">
+        <antcall target="allElements">
+            <param
+                name="target"
+                value="cleanElement"/>
+        </antcall>
+    </target>
+
+    <!--
+   Note: buildId is typically of the form "3.3.0"
+   may want to use buildLabel, which is of form I-3.3.0-20100912032913
+   -->
+
+    <target
+        name="updateCategoriesFiles"
+        depends="checkCategoriesFiles"
+        if="categoryFileExists">
+        <replace
+            file="${p2.category.definition.file}"
+            value="${buildId}"
+            token="@buildversionid@">
+        </replace>
+
+
+    </target>
+    <target name="checkCategoriesFiles">
+        <available
+            file="${p2.category.definition.file}"
+            property="categoryFileExists"/>
+    </target>     
+
+
+    <!--
+        Default target
+    -->
+    <target name="noDefault">
+        <echo
+            level="error"
+            message="You must specify a target when invoking this file"/>
+    </target>
+
+
+    <target
+        name="init"
+        unless="customTargetsInitialized">
+
+        <echo message="buildDirectory: ${buildDirectory}"/>
+        <echo message="p2.build.repo: ${p2.build.repo}"/>
+        <echo message="p2.category.definition: ${p2.category.definition}"/>
+        <echo
+            level="info"
+            message="target: ${target} "/>
+        <echo
+            level="info"
+            message="basedir: ${basedir}"/>
+        <echo
+            level="info"
+            message="component: ${component}"/>
+        <echo
+            level="info"
+            message="buildDirectory: ${buildDirectory}"/>
+        <echo
+            level="info"
+            message="baseLocation: ${baseLocation}"/>
+        <echo
+            level="info"
+            message="generic target: ${genericTargets}"/>
+        <echo
+            level="info"
+            message="topLevelElementId: ${topLevelElementId}"/>
+        <echo message="compilerArg: ${compilerArg}"/>
+        <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+        <echo
+            level="debug"
+            message="ant.file: ${ant.file}"/>
+        <echo
+            level="debug"
+            message="component.dir: ${component.dir}"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <property
+            name="customTargetsInitialized"
+            value="true"/>
+
+
+    </target>
+
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpcap.build/build.xml b/releng.wtpbuilder/distribution/wtpcap.build/build.xml
index 2cbc3a2..c9f2901 100644
--- a/releng.wtpbuilder/distribution/wtpcap.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.build/build.xml
@@ -44,6 +44,7 @@
                 name="component"
                 value="wtpcap"/>
         </ant>
+        <!--
         <ant antfile="${buildTargets}">
             <property
                 name="component"
@@ -54,7 +55,7 @@
                 name="component"
                 value="wtpcap_tests"/>
         </ant>
-
+         -->
         <!-- we fail for compilation problems only at end, so everything gets a chance to try 
              and compile -->
         <ant antfile="${wtp.builder.home}/scripts/build/checkForCompilationProblems.xml"/>
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/publish.xml b/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
index b9d78aa..47cb089 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
@@ -82,7 +82,6 @@
         <property
             name="dependency.properties"
             value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
-
         <available
             file="${dependency.properties}"
             property="dependency.properties.exists"/>