cleanup/make consistent

4 files changed, 0 insertions, 911 deletions

diff --git a/releng/galileo/jsdttestdependency.xml b/releng/galileo/jsdttestdependency.xml
deleted file mode 100644
index 06afad79e..000000000
--- a/releng/galileo/jsdttestdependency.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="info"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.dltk">
-        <istrue
-            value="false"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    	 <antcall
-    	     target="prereq.dltk"/>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dltk"
-        if="getprereq.dltk">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dltk"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng/galileo/testdependency.xml b/releng/galileo/testdependency.xml
deleted file mode 100644
index 1b205c124..000000000
--- a/releng/galileo/testdependency.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="info"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="tomcat.5"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jonas.4"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="oagis.release"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="oagis.wsdl"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jsf.1_1"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jpt-persistence.jar"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jpt-eclipselink.jar"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng/helios/jsdttestdependency.xml b/releng/helios/jsdttestdependency.xml
deleted file mode 100644
index 06afad79e..000000000
--- a/releng/helios/jsdttestdependency.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="info"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="true"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="false"/>
-    </condition>
-    <condition
-        property="getprereq.dltk">
-        <istrue
-            value="false"/>
-    </condition>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="prereq.emf"/>
-        <antcall
-            target="prereq.emfxsd"/>
-        <antcall
-            target="prereq.emfvalidation"/>
-        <antcall
-            target="prereq.gef"/>
-        <antcall
-            target="prereq.dtp"/>
-        <antcall
-            target="prereq.wst"/>
-        <antcall
-            target="prereq.jst"/>
-        <antcall
-            target="prereq.wtp"/>
-    	 <antcall
-    	     target="prereq.dltk"/>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipse"
-        if="getprereq.eclipse">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.eclipseplatform"
-        if="getprereq.eclipseplatform">
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipseplatform"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emf"
-        if="getprereq.emf">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfxsd"
-        if="getprereq.emfxsd">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.emfvalidation"
-        if="getprereq.emfvalidation">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.gef"
-        if="getprereq.gef">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dtp"
-        if="getprereq.dtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wst"
-        if="getprereq.wst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.jst"
-        if="getprereq.jst">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="jst"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.wtp"
-        if="getprereq.wtp">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-    </target>
-    <target
-        name="prereq.dltk"
-        if="getprereq.dltk">
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dltk"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/releng/helios/testdependency.xml b/releng/helios/testdependency.xml
deleted file mode 100644
index 1d4ad9980..000000000
--- a/releng/helios/testdependency.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0"?>
-    <!--
-        ======================================================================
-        Properties that must be passed to this script: base.install.dir
-        dependencyTargets local.cache.dir dependency.properties
-        ======================================================================
-    -->
-<project
-    name="test"
-    default="get">
-    <property
-        environment="env"/>
-    <!-- required to get proper value of dropinsFolder -->
-    <property
-        name="keyCfgFile"
-        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo
-        level="info"
-        message="keyCfgFile: ${keyCfgFile}"/>
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
-    <property
-        file="${keyCfgFile}"/>
-    <target
-        name="get">
-        <!--
-            read in this properties, just so we can make sure our
-            requested pre-reqs are defined, which we do later with
-            statements such if="${groupId}.url"
-        -->
-        <property
-            file="${dependency.properties}"/>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="emfvalidation"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="dtp"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="eclipse"/>
-        </antcall>
-        <antcall
-            target="getAndInstallDropins">
-            <param
-                name="groupId"
-                value="eclipseTestFramework"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="tomcat.5"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jonas.4"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="oagis.release"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="oagis.wsdl"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jsf.1_1"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jpt-persistence.jar"/>
-        </antcall>
-        <antcall
-            target="getAndInstallBase">
-            <param
-                name="groupId"
-                value="jpt-eclipselink.jar"/>
-        </antcall>
-    </target>
-    <target
-        name="getAndInstallBase"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}"/>
-        </ant>
-    </target>
-    <target
-        name="getAndInstallDropins"
-        if="${groupId}.url">
-        <ant
-            antfile="${dependencyTargets}"
-            target="checkDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-        </ant>
-        <ant
-            antfile="${dependencyTargets}"
-            target="installDependency">
-            <property
-                name="groupId"
-                value="${groupId}"/>
-            <property
-                name="install.destination"
-                value="${base.install.dir}${dropinsFolder}"/>
-        </ant>
-    </target>
-	    <target
-	        name="getAndInstallRepo"
-	        if="${groupId}.url">
-	        <ant
-	            antfile="${dependencyTargets}"
-	            target="checkDependency">
-	            <property
-	                name="groupId"
-	                value="${groupId}"/>
-	        </ant>
-	        <ant
-	            antfile="${dependencyTargets}"
-	            target="installRepo">
-	            <property
-	                name="groupId"
-	                value="${groupId}"/>
-	            <property
-	                name="install.destination"
-	                value="${base.install.dir}"/>
-	        </ant>
-	    </target>
-</project>
\ No newline at end of file