257098 Setup build process for XML Security Tools
diff --git a/releng.wtpbuilder/buildtemplates/build.xml b/releng.wtpbuilder/buildtemplates/build.xml
index 78d7438..525818c 100644
--- a/releng.wtpbuilder/buildtemplates/build.xml
+++ b/releng.wtpbuilder/buildtemplates/build.xml
@@ -47,29 +47,29 @@
script to create new component build
</description>
- <property name="componentpropertyfile" value="jaxws.properties" />
+ <property name="componentpropertyfile" value="xmlsec.properties" />
<target name="default" depends="replaceTokens">
<property file="${componentpropertyfile}" />
<echo message=" Creating build files for ${shortname}" />
- <move todir="../temp/components/${shortname}">
+ <move todir="../components/${shortname}">
<fileset dir="../temp/components/template" />
</move>
- <move todir="../temp/components/${shortname}_sdk">
+ <move todir="../components/${shortname}_sdk">
<fileset dir="../temp/components/template_sdk" />
</move>
- <move todir="../temp/components/${shortname}_tests">
+ <move todir="../components/${shortname}_tests">
<fileset dir="../temp/components/template_tests" />
</move>
- <move todir="../temp/distribution/${shortname}.build">
+ <move todir="../distribution/${shortname}.build">
<fileset dir="../temp/distribution/template.build" />
</move>
- <move todir="../temp/distribution/${shortname}.site">
+ <move todir="../distribution/${shortname}.site">
<fileset dir="../temp/distribution/template.site" />
</move>
- <move todir="../temp/distribution/${shortname}.tests">
+ <move todir="../distribution/${shortname}.tests">
<fileset dir="../temp/distribution/template.tests" />
</move>
</target>
diff --git a/releng.wtpbuilder/components/xmlsec/customTargets.xml b/releng.wtpbuilder/components/xmlsec/customTargets.xml
index e05cd30..f555aa4 100644
--- a/releng.wtpbuilder/components/xmlsec/customTargets.xml
+++ b/releng.wtpbuilder/components/xmlsec/customTargets.xml
@@ -67,7 +67,7 @@
value="feature"/>
<property
name="id"
- value="org.eclipse.jst.ws.cxf .feature"/>
+ value="org.eclipse.wst.xml.security .feature"/>
</ant>
</target>
<!--
@@ -78,10 +78,10 @@
each configuration
-->
<target
- name="assemble.org.eclipse.jst.ws.cxf .feature">
+ name="assemble.org.eclipse.wst.xml.security .feature">
<property
name="archiveName"
- value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+ value="wtp-incubator-xmlsecurity-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
@@ -92,7 +92,7 @@
name="postPackage">
<property
name="archiveName"
- value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+ value="wtp-incubator-xmlsecurity-${buildLabel}.zip"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="unpackUpdateJarsAndCreateZippedPackages">
@@ -128,7 +128,7 @@
target="maputil">
<property
name="mapcomponent"
- value="${env.RELENGJAXWS}"/>
+ value="${env.RELENGXMLSEC}"/>
<property
name="mapTag"
value="${mapVersionTag}"/>
@@ -290,7 +290,7 @@
dest="${buildDirectory}/${buildLabel}/compilelogs"
overwrite="true">
<fileset
- dir="${buildDirectory}/features/org.eclipse.jst.ws.cxf .feature">
+ dir="${buildDirectory}/features/org.eclipse.wst.xml.security .feature">
<include
name="**/*.log.zip"/>
</fileset>
diff --git a/releng.wtpbuilder/components/xmlsec/dependency.xml b/releng.wtpbuilder/components/xmlsec/dependency.xml
index 9ddeb56..8710ae7 100644
--- a/releng.wtpbuilder/components/xmlsec/dependency.xml
+++ b/releng.wtpbuilder/components/xmlsec/dependency.xml
@@ -45,7 +45,13 @@
target="getAndInstall">
<param
name="groupId"
- value="xml"/>
+ value="dtp"/>
+ </antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="wtp"/>
</antcall>
</target>
<target
diff --git a/releng.wtpbuilder/components/xmlsec_sdk/customTargets.xml b/releng.wtpbuilder/components/xmlsec_sdk/customTargets.xml
index 54be6e0..1edd0d7 100644
--- a/releng.wtpbuilder/components/xmlsec_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/xmlsec_sdk/customTargets.xml
@@ -67,7 +67,7 @@
value="feature"/>
<property
name="id"
- value="org.eclipse.jst.ws.cxf _sdk.feature"/>
+ value="org.eclipse.wst.xml.security _sdk.feature"/>
</ant>
</target>
<!--
@@ -78,10 +78,10 @@
each configuration
-->
<target
- name="assemble.org.eclipse.jst.ws.cxf _sdk.feature">
+ name="assemble.org.eclipse.wst.xml.security _sdk.feature">
<property
name="archiveName"
- value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+ value="wtp-incubator-xmlsecurity-sdk-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
@@ -92,7 +92,7 @@
name="postPackage">
<property
name="archiveName"
- value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+ value="wtp-incubator-xmlsecurity-sdk-${buildLabel}.zip"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="unpackUpdateJarsAndCreateZippedPackages">
@@ -128,7 +128,7 @@
target="maputil">
<property
name="mapcomponent"
- value="${env.RELENGJAXWS}"/>
+ value="${env.RELENGXMLSEC}"/>
<property
name="mapTag"
value="${mapVersionTag}"/>
@@ -290,7 +290,7 @@
dest="${buildDirectory}/${buildLabel}/compilelogs"
overwrite="true">
<fileset
- dir="${buildDirectory}/features/org.eclipse.jst.ws.cxf _sdk.feature">
+ dir="${buildDirectory}/features/org.eclipse.wst.xml.security _sdk.feature">
<include
name="**/*.log.zip"/>
</fileset>
diff --git a/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml b/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml
index 191c279..364e5bc 100644
--- a/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml
@@ -35,8 +35,15 @@
target="getAndInstall">
<param
name="groupId"
- value="xml"/>
+ value="dtp"/>
</antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="wtp"/>
+ </antcall>
+
</target>
<target
name="getAndInstall"
diff --git a/releng.wtpbuilder/components/xmlsec_tests/customTargets.xml b/releng.wtpbuilder/components/xmlsec_tests/customTargets.xml
index 06a6e5e..15566b2 100644
--- a/releng.wtpbuilder/components/xmlsec_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/xmlsec_tests/customTargets.xml
@@ -67,7 +67,7 @@
value="feature"/>
<property
name="id"
- value="org.eclipse.jst.ws.cxf _tests.feature"/>
+ value="org.eclipse.wst.xml.security _tests.feature"/>
</ant>
</target>
<!--
@@ -78,10 +78,10 @@
each configuration
-->
<target
- name="assemble.org.eclipse.jst.ws.cxf _tests.feature">
+ name="assemble.org.eclipse.wst.xml.security _tests.feature">
<property
name="archiveName"
- value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+ value="wtp-incubator-xmlsecurity-tests-${buildLabel}.zip"/>
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}"/>
@@ -92,7 +92,7 @@
name="postPackage">
<property
name="archiveName"
- value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+ value="wtp-incubator-xmlsecurity-tests-${buildLabel}.zip"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="unpackUpdateJarsAndCreateZippedPackages">
@@ -128,7 +128,7 @@
target="maputil">
<property
name="mapcomponent"
- value="${env.RELENGJAXWS}"/>
+ value="${env.RELENGXMLSEC}"/>
<property
name="mapTag"
value="${mapVersionTag}"/>
@@ -290,7 +290,7 @@
dest="${buildDirectory}/${buildLabel}/testcompilelogs"
overwrite="true">
<fileset
- dir="${buildDirectory}/features/org.eclipse.jst.ws.cxf _tests.feature">
+ dir="${buildDirectory}/features/org.eclipse.wst.xml.security _tests.feature">
<include
name="**/*.log.zip"/>
</fileset>
diff --git a/releng.wtpbuilder/components/xmlsec_tests/dependency.xml b/releng.wtpbuilder/components/xmlsec_tests/dependency.xml
index 8565e7e..1f45cda 100644
--- a/releng.wtpbuilder/components/xmlsec_tests/dependency.xml
+++ b/releng.wtpbuilder/components/xmlsec_tests/dependency.xml
@@ -41,8 +41,15 @@
target="getAndInstall">
<param
name="groupId"
- value="xml"/>
+ value="dtp"/>
</antcall>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="wtp"/>
+ </antcall>
+
</target>
<target
name="getAndInstall"
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/build.xml b/releng.wtpbuilder/distribution/xmlsec.site/build.xml
index 7c7d077..00ecb30 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/build.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.site/build.xml
@@ -38,6 +38,11 @@
<jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
<jvmarg
value="-Dprojectname=${projectname}" />
+ <jvmarg
+ value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
+ <jvmarg
+ value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log"/>
+
<arg value="-data" />
<arg value="${basedir}/workspace" />
<arg value="-application" />
@@ -114,6 +119,26 @@
file="${buildDirectory}/buildmachineinfo.properties"
tofile="${result}/buildmachineinfo.properties" />
+ <!-- http access logs -->
+ <copy
+ todir="${result}/"
+ failonerror="false">
+ <fileset
+ dir="${buildDirectory}"
+ includes="*.log"/>
+ </copy>
+
+ <!-- ant build log, from control directory -->
+ <copy
+ todir="${result}/"
+ failonerror="false">
+ <fileset
+ dir="${env.ANT_WORKING}/${projectname}"
+ includes="antBuilderOutput.log"/>
+ </copy>
+
+
+
<!-- final count files -->
<countBuildFiles
sourceDirectory="${buildDirectory}/${buildLabel}"
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/access_err.gif
new file mode 100644
index 0000000..4f0748a
--- /dev/null
+++ b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/access_err.gif
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/access_warn.gif
new file mode 100644
index 0000000..8386e3e
--- /dev/null
+++ b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/access_warn.gif
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/compile_err.gif
new file mode 100644
index 0000000..c2bfdd6
--- /dev/null
+++ b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/compile_err.gif
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/compile_warn.gif
new file mode 100644
index 0000000..cf4fdf9
--- /dev/null
+++ b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/compile_warn.gif
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/junit_err.gif
new file mode 100644
index 0000000..1b7ff9d
--- /dev/null
+++ b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/junit_err.gif
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/pending.gif
new file mode 100644
index 0000000..66db2a6
--- /dev/null
+++ b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/pending.gif
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/pending1.gif
new file mode 100644
index 0000000..1b2ea6e
--- /dev/null
+++ b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/pending1.gif
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
index cb1da63..2f6aeac 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
@@ -85,7 +85,7 @@
$downloadprefix=$defaultWTPMirrorPrefix;
-$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-incubator-jaxws-sdk-$build.zip";
+$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-incubator-xmlsecurity-sdk-$build.zip";
if (isMirrored($keytestMirrorString) ) {
$mirrorScript=$eclipseMirrorScript;
$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
@@ -337,7 +337,7 @@
<p>Executable code only.</p>
</td>
<?php
- $zipfilename="wtp-incubator-jaxws-${build}";
+ $zipfilename="wtp-incubator-xmlsecurity-${build}";
$filename=$zipfilename.".zip";
$zipfilesize=fileSizeForDisplay($filename);
$fileShortDescription="xmlsec";
@@ -351,7 +351,7 @@
<p>Executable code and source code.</p>
</td>
<?php
- $zipfilename="wtp-incubator-jaxws-sdk-${build}";
+ $zipfilename="wtp-incubator-xmlsecurity-sdk-${build}";
$filename=$zipfilename.".zip";
$zipfilesize=fileSizeForDisplay($filename);
$fileShortDescription="xmlsec sdk";
@@ -364,7 +364,7 @@
<p>Unit tests.</p>
</td>
<?php
- $zipfilename="wtp-incubator-jaxws-tests-${build}";
+ $zipfilename="wtp-incubator-xmlsecurity-tests-${build}";
$filename=$zipfilename.".zip";
$zipfilesize=fileSizeForDisplay($filename);
$fileShortDescription="xmlsec tests";
diff --git a/releng.wtpbuilder/distribution/xmlsec.tests/build.xml b/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
index f1c4961..e6d5366 100644
--- a/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
@@ -112,7 +112,7 @@
executable="unzip"
failonerror="true">
<arg
- line="-o -qq wtp-incubator-jaxws-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
+ line="-o -qq wtp-incubator-xmlsecurity-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
</exec>
<echo
message="installing tests" />
@@ -121,7 +121,7 @@
executable="unzip"
failonerror="true">
<arg
- line="-o -qq wtp-incubator-jaxws-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
+ line="-o -qq wtp-incubator-xmlsecurity-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
</exec>
</target>
