Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavid_williams2011-03-07 15:22:21 -0500
committerdavid_williams2011-03-07 15:22:21 -0500
commit0f599afcf693c18b6819f1a01e25c960ca669c75 (patch)
tree8258ee00a095c29735c452bc335d77cdf2f58241
parentd2922e3b6fab2dd7fce9cacfc71fa80b0857cddc (diff)
downloadwebtools.maps-0f599afcf693c18b6819f1a01e25c960ca669c75.tar.gz
webtools.maps-0f599afcf693c18b6819f1a01e25c960ca669c75.tar.xz
webtools.maps-0f599afcf693c18b6819f1a01e25c960ca669c75.zip
cleanup and format
-rw-r--r--releng/.project16
-rw-r--r--releng/distribution/wtp.site/prereqsToDisplay.php2
-rw-r--r--releng/distribution/wtp4x.site/prereqsToDisplay.php2
-rw-r--r--releng/galileo/jsdttestdependency.xml150
-rw-r--r--releng/galileo/testdependency.xml102
5 files changed, 101 insertions, 171 deletions
diff --git a/releng/.project b/releng/.project
index 9838d30fc..f43ab1e38 100644
--- a/releng/.project
+++ b/releng/.project
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>releng</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
+ <name>releng</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
</projectDescription>
diff --git a/releng/distribution/wtp.site/prereqsToDisplay.php b/releng/distribution/wtp.site/prereqsToDisplay.php
index 4d11eb73c..f58ac9d5c 100644
--- a/releng/distribution/wtp.site/prereqsToDisplay.php
+++ b/releng/distribution/wtp.site/prereqsToDisplay.php
@@ -1,4 +1,4 @@
-<?php
+<?php
$prereq_eclipse="true";
$prereq_e4x="false";
diff --git a/releng/distribution/wtp4x.site/prereqsToDisplay.php b/releng/distribution/wtp4x.site/prereqsToDisplay.php
index db7ae1992..33d535100 100644
--- a/releng/distribution/wtp4x.site/prereqsToDisplay.php
+++ b/releng/distribution/wtp4x.site/prereqsToDisplay.php
@@ -1,4 +1,4 @@
-<?php
+<?php
$prereq_eclipse="false";
$prereq_e4x="true";
diff --git a/releng/galileo/jsdttestdependency.xml b/releng/galileo/jsdttestdependency.xml
index 06afad79e..6de6c4844 100644
--- a/releng/galileo/jsdttestdependency.xml
+++ b/releng/galileo/jsdttestdependency.xml
@@ -8,8 +8,7 @@
<project
name="test"
default="get">
- <property
- environment="env"/>
+ <property environment="env"/>
<!-- required to get proper value of dropinsFolder -->
<property
name="keyCfgFile"
@@ -17,107 +16,69 @@
<echo
level="info"
message="keyCfgFile: ${keyCfgFile}"/>
- <fail
- message="Required property file does not exist: ${keyCfgFile}">
+ <fail message="Required property file does not exist: ${keyCfgFile}">
<condition>
<not>
- <available
- file="${keyCfgFile}"/>
+ <available file="${keyCfgFile}"/>
</not>
</condition>
</fail>
- <property
- file="${keyCfgFile}"/>
- <condition
- property="getprereq.eclipse">
- <istrue
- value="true"/>
+ <property file="${keyCfgFile}"/>
+ <condition property="getprereq.eclipse">
+ <istrue value="true"/>
</condition>
- <condition
- property="getprereq.eclipseplatform">
- <istrue
- value="false"/>
+ <condition property="getprereq.eclipseplatform">
+ <istrue value="false"/>
</condition>
- <condition
- property="getprereq.emf">
- <istrue
- value="false"/>
+ <condition property="getprereq.emf">
+ <istrue value="false"/>
</condition>
- <condition
- property="getprereq.emfxsd">
- <istrue
- value="false"/>
+ <condition property="getprereq.emfxsd">
+ <istrue value="false"/>
</condition>
- <condition
- property="getprereq.emfvalidation">
- <istrue
- value="false"/>
+ <condition property="getprereq.emfvalidation">
+ <istrue value="false"/>
</condition>
- <condition
- property="getprereq.gef">
- <istrue
- value="false"/>
+ <condition property="getprereq.gef">
+ <istrue value="false"/>
</condition>
- <condition
- property="getprereq.dtp">
- <istrue
- value="false"/>
+ <condition property="getprereq.dtp">
+ <istrue value="false"/>
</condition>
- <condition
- property="getprereq.wst">
- <istrue
- value="false"/>
+ <condition property="getprereq.wst">
+ <istrue value="false"/>
</condition>
- <condition
- property="getprereq.jst">
- <istrue
- value="false"/>
+ <condition property="getprereq.jst">
+ <istrue value="false"/>
</condition>
- <condition
- property="getprereq.wtp">
- <istrue
- value="false"/>
+ <condition property="getprereq.wtp">
+ <istrue value="false"/>
</condition>
- <condition
- property="getprereq.dltk">
- <istrue
- value="false"/>
+ <condition property="getprereq.dltk">
+ <istrue value="false"/>
</condition>
- <target
- name="get">
+ <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">
+ <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">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="eclipseTestFramework"/>
@@ -126,8 +87,7 @@
<target
name="prereq.eclipse"
if="getprereq.eclipse">
- <antcall
- target="getAndInstallBase">
+ <antcall target="getAndInstallBase">
<param
name="groupId"
value="eclipse"/>
@@ -136,8 +96,7 @@
<target
name="prereq.eclipseplatform"
if="getprereq.eclipseplatform">
- <antcall
- target="getAndInstallBase">
+ <antcall target="getAndInstallBase">
<param
name="groupId"
value="eclipseplatform"/>
@@ -146,8 +105,7 @@
<target
name="prereq.emf"
if="getprereq.emf">
- <antcall
- target="getAndInstallDropins">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="emf"/>
@@ -156,8 +114,7 @@
<target
name="prereq.emfxsd"
if="getprereq.emfxsd">
- <antcall
- target="getAndInstallDropins">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="emfxsd"/>
@@ -166,8 +123,7 @@
<target
name="prereq.emfvalidation"
if="getprereq.emfvalidation">
- <antcall
- target="getAndInstallDropins">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="emfvalidation"/>
@@ -176,8 +132,7 @@
<target
name="prereq.gef"
if="getprereq.gef">
- <antcall
- target="getAndInstallDropins">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="gef"/>
@@ -186,8 +141,7 @@
<target
name="prereq.dtp"
if="getprereq.dtp">
- <antcall
- target="getAndInstallDropins">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="dtp"/>
@@ -196,8 +150,7 @@
<target
name="prereq.wst"
if="getprereq.wst">
- <antcall
- target="getAndInstallDropins">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="wst"/>
@@ -206,8 +159,7 @@
<target
name="prereq.jst"
if="getprereq.jst">
- <antcall
- target="getAndInstallDropins">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="jst"/>
@@ -216,8 +168,7 @@
<target
name="prereq.wtp"
if="getprereq.wtp">
- <antcall
- target="getAndInstallDropins">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="wtp"/>
@@ -226,8 +177,7 @@
<target
name="prereq.dltk"
if="getprereq.dltk">
- <antcall
- target="getAndInstallDropins">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="dltk"/>
diff --git a/releng/galileo/testdependency.xml b/releng/galileo/testdependency.xml
index bdbd5d852..124cf23f9 100644
--- a/releng/galileo/testdependency.xml
+++ b/releng/galileo/testdependency.xml
@@ -8,8 +8,7 @@
<project
name="test"
default="get">
- <property
- environment="env"/>
+ <property environment="env"/>
<!-- required to get proper value of dropinsFolder -->
<property
name="keyCfgFile"
@@ -17,106 +16,87 @@
<echo
level="info"
message="keyCfgFile: ${keyCfgFile}"/>
- <fail
- message="Required property file does not exist: ${keyCfgFile}">
+ <fail message="Required property file does not exist: ${keyCfgFile}">
<condition>
<not>
- <available
- file="${keyCfgFile}"/>
+ <available file="${keyCfgFile}"/>
</not>
</condition>
</fail>
- <property
- file="${keyCfgFile}"/>
- <target
- name="get">
+ <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">
+ <property file="${dependency.properties}"/>
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="emf"/>
</antcall>
- <antcall
- target="getAndInstallDropins">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="emfxsd"/>
</antcall>
- <antcall
- target="getAndInstallDropins">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="emfvalidation"/>
</antcall>
- <antcall
- target="getAndInstallDropins">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="gef"/>
</antcall>
- <antcall
- target="getAndInstallDropins">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="dtp"/>
</antcall>
- <antcall
- target="getAndInstallBase">
+ <antcall target="getAndInstallBase">
<param
name="groupId"
value="eclipse"/>
</antcall>
- <antcall
- target="getAndInstallRepo">
+ <antcall target="getAndInstallRepo">
<param
name="groupId"
value="eclipseTestFramework"/>
</antcall>
- <antcall
- target="getAndInstallBase">
+ <antcall target="getAndInstallBase">
<param
name="groupId"
value="tomcat.5"/>
</antcall>
- <antcall
- target="getAndInstallBase">
+ <antcall target="getAndInstallBase">
<param
name="groupId"
value="jonas.4"/>
</antcall>
- <antcall
- target="getAndInstallBase">
+ <antcall target="getAndInstallBase">
<param
name="groupId"
value="oagis.release"/>
</antcall>
- <antcall
- target="getAndInstallBase">
+ <antcall target="getAndInstallBase">
<param
name="groupId"
value="oagis.wsdl"/>
</antcall>
- <antcall
- target="getAndInstallBase">
+ <antcall target="getAndInstallBase">
<param
name="groupId"
value="jsf.1_1"/>
</antcall>
- <antcall
- target="getAndInstallBase">
+ <antcall target="getAndInstallBase">
<param
name="groupId"
value="jpt-persistence.jar"/>
</antcall>
- <antcall
- target="getAndInstallBase">
+ <antcall target="getAndInstallBase">
<param
name="groupId"
value="jpt-eclipselink.jar"/>
@@ -164,25 +144,25 @@
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>
+ <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

Back to the top