Author: thomas.diesler(a)jboss.com Date: 2010-04-08 04:15:00 -0400 (Thu, 08 Apr 2010) New Revision: 103679 Added: projects/jboss-osgi/trunk/reactor/osgitck/ projects/jboss-osgi/trunk/reactor/osgitck/.project projects/jboss-osgi/trunk/reactor/osgitck/ant.properties.example projects/jboss-osgi/trunk/reactor/osgitck/build.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/.project projects/jboss-osgi/trunk/reactor/osgitck/hudson/apache-tomcat/ projects/jboss-osgi/trunk/reactor/osgitck/hudson/build.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/ projects/jboss-osgi/trunk/reactor/osgitck/overlay/ projects/jboss-osgi/trunk/reactor/osgitck/readme.txt Removed: projects/jboss-osgi/trunk/reactor/osgitck-setup/ projects/jboss-osgi/trunk/reactor/osgitck/.project projects/jboss-osgi/trunk/reactor/osgitck/ant.properties.example projects/jboss-osgi/trunk/reactor/osgitck/build.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/.project projects/jboss-osgi/trunk/reactor/osgitck/hudson/apache-tomcat/ projects/jboss-osgi/trunk/reactor/osgitck/hudson/build.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/ projects/jboss-osgi/trunk/reactor/osgitck/overlay/ projects/jboss-osgi/trunk/reactor/osgitck/readme.txt Log: cleanup osgitck-setup Copied: projects/jboss-osgi/trunk/reactor/osgitck (from rev 103678, projects/jboss-osgi/trunk/reactor/osgitck-setup) Deleted: projects/jboss-osgi/trunk/reactor/osgitck/.project =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/.project 2010-04-08 08:12:59 UTC (rev 103678) +++ projects/jboss-osgi/trunk/reactor/osgitck/.project 2010-04-08 08:15:00 UTC (rev 103679) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jboss-osgi-tcksetup</name> - <comment></comment> - <projects> - </projects> -</projectDescription> Copied: projects/jboss-osgi/trunk/reactor/osgitck/.project (from rev 103676, projects/jboss-osgi/trunk/reactor/osgitck-setup/.project) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/.project (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck/.project 2010-04-08 08:15:00 UTC (rev 103679) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jboss-osgi-tcksetup</name> + <comment></comment> + <projects> + </projects> +</projectDescription> Deleted: projects/jboss-osgi/trunk/reactor/osgitck/ant.properties.example =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/ant.properties.example 2010-04-08 08:12:59 UTC (rev 103678) +++ projects/jboss-osgi/trunk/reactor/osgitck/ant.properties.example 2010-04-08 08:15:00 UTC (rev 103679) @@ -1,44 +0,0 @@ -# -# A sample ant properties file -# -# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ - -# The JBoss OSGi framework version -framework.version=1.0.0.Alpha4-SNAPSHOT -framework.svn.url=https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/framework/trunk - -# The aQute Bnd version -aQute.bnd.version=0.0.366-SNAPSHOT - -# The location of the OSGi TCK -# osgitck.dir=/home/username/svn/osgi.org/build/trunk - -# The location of the local maven repository -# maven.local.repository=/home/username/.m2/repository - -# Hudson Setup ---------------------------------------------------------------- - -# Hudson workspace root -# hudson.root=/home/username/workspace/osgitck - -# Hudson QA Environment -# hudson.username=username - -# The Hudson OSGi TCK checkout URL -osgitck.svn.url=https://www.osgi.org/members/svn/build/trunk -osgitck.core.svn.url=https://www.osgi.org/members/svn/build/tags/r4v42-core-cmpn-final - -# JDK settings -java.home.jdk15=/usr/java/jdk1.5.0_22 -java.home.jdk16=/usr/java/jdk1.6.0_17 - -# Maven setup -hudson.maven.name=apache-maven-2.2.1 -hudson.maven.path=/usr/java/apache-maven-2.2.1 - -hudson.host=localhost -hudson.admin.port=8150 -hudson.http.port=8180 - -apache-tomcat=5.5.27 -sun-hudson=1.336 Copied: projects/jboss-osgi/trunk/reactor/osgitck/ant.properties.example (from rev 103676, projects/jboss-osgi/trunk/reactor/osgitck-setup/ant.properties.example) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/ant.properties.example (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck/ant.properties.example 2010-04-08 08:15:00 UTC (rev 103679) @@ -0,0 +1,44 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ + +# The JBoss OSGi framework version +framework.version=1.0.0.Alpha4-SNAPSHOT +framework.svn.url=https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/framework/trunk + +# The aQute Bnd version +aQute.bnd.version=0.0.366-SNAPSHOT + +# The location of the OSGi TCK +# osgitck.dir=/home/username/svn/osgi.org/build/trunk + +# The location of the local maven repository +# maven.local.repository=/home/username/.m2/repository + +# Hudson Setup ---------------------------------------------------------------- + +# Hudson workspace root +# hudson.root=/home/username/workspace/osgitck + +# Hudson QA Environment +# hudson.username=username + +# The Hudson OSGi TCK checkout URL +osgitck.svn.url=https://www.osgi.org/members/svn/build/trunk +osgitck.core.svn.url=https://www.osgi.org/members/svn/build/tags/r4v42-core-cmpn-final + +# JDK settings +java.home.jdk15=/usr/java/jdk1.5.0_22 +java.home.jdk16=/usr/java/jdk1.6.0_17 + +# Maven setup +hudson.maven.name=apache-maven-2.2.1 +hudson.maven.path=/usr/java/apache-maven-2.2.1 + +hudson.host=localhost +hudson.admin.port=8150 +hudson.http.port=8180 + +apache-tomcat=5.5.27 +sun-hudson=1.336 Deleted: projects/jboss-osgi/trunk/reactor/osgitck/build.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/build.xml 2010-04-08 08:12:59 UTC (rev 103678) +++ projects/jboss-osgi/trunk/reactor/osgitck/build.xml 2010-04-08 08:15:00 UTC (rev 103679) @@ -1,183 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id: build.xml 93515 2009-09-15 07:18:21Z thomas.diesler(a)jboss.com $ --> - -<project default="setup.vi"> - - <property name="target.dir" value="${basedir}/target" /> - <property name="reports.dir" value="${target.dir}/test-reports" /> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="init"> - - <!-- Check if ant.properties is available --> - <available property="ant.properties.available" file="${basedir}/ant.properties" /> - <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available" /> - - <property file="${basedir}/ant.properties" /> - - <!-- Setup property defaults --> - <property environment="env" /> - <property name="hudson.username" value="${env.USER}" /> - <property name="osgitck.dir" value="${basedir}/../osgitck.dir" /> - <property name="maven.local.repository" value="/home/${hudson.username}/.m2/repository" /> - <property name="hudson.root" value="/home/${hudson.username}/workspace/osgitck" /> - - <echo>************************************************</echo> - <echo message="hudson.username=${hudson.username}" /> - <echo message="aQute.bnd.version=${aQute.bnd.version}" /> - <echo message="framework.version=${framework.version}" /> - <echo message="osgitck.dir=${osgitck.dir}" /> - <echo>************************************************</echo> - - <!-- Check if the osgitck dir is available --> - <available property="osgitck.dir.available" file="${osgitck.dir}" /> - <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> - - <!-- Check if the aQute.bnd jar is available --> - <property name="aQute.bnd.jar" value="${maven.local.repository}/biz/aQute/aQute.bnd/${aQute.bnd.version}/aQute.bnd-${aQute.bnd.version}.jar" /> - <available property="aQute.bnd.available" file="${aQute.bnd.jar}" /> - <fail message="Cannot find: ${aQute.bnd.jar}" unless="aQute.bnd.available" /> - - <!-- Check if the jboss.osgi.framework jar is available --> - <property name="jboss.osgi.framework.jar" value="${maven.local.repository}/org/jboss/osgi/framework/jboss-osgi-framework/${framework.version}/jboss-osgi-framework-${framework.version}-all.jar" /> - <available property="jboss.osgi.framework.available" file="${jboss.osgi.framework.jar}" /> - <fail message="Cannot find: ${jboss.osgi.framework.jar}" unless="jboss.osgi.framework.available" /> - - </target> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <!-- Setup the TCK to use the RI (equinox) --> - <target name="setup.ri" description="Setup the TCK using the RI (Equinox)" depends="init"> - - <!-- Copy the aQute.bnd --> - <copy file="${aQute.bnd.jar}" tofile="${osgitck.dir}/licensed/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar" overwrite="true" /> - - <!-- Build the TCK --> - <ant dir="${osgitck.dir}" target="build-clean" /> - </target> - - <!-- Setup the TCK to use the Vendor Implemenation --> - <target name="setup.vi" description="Setup the TCK using the Vendor Implemenation" depends="init,update-framework"> - - <!-- Copy the aQute.bnd --> - <copy file="${aQute.bnd.jar}" tofile="${osgitck.dir}/licensed/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar" overwrite="true" /> - - <!-- Overlay the TCK setup --> - <copy todir="${osgitck.dir}" overwrite="true"> - <fileset dir="${basedir}/overlay" /> - </copy> - - <!-- Build the TCK --> - <ant dir="${osgitck.dir}" target="build-clean" /> - </target> - - <!-- Update the JBoss OSGi Framework --> - <target name="update-framework" description="Update the JBoss OSGi Framework" depends="init"> - <!-- Copy the OSGi Framework --> - <mkdir dir="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework" /> - <echo message="jboss.osgi.framework.jar=${jboss.osgi.framework.jar}"/> - <copy file="${jboss.osgi.framework.jar}" tofile="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework/org.jboss.osgi.framework-1.0.0.jar" - overwrite="true" /> - </target> - - <!-- ================================================================== --> - <!-- Hudson --> - <!-- ================================================================== --> - - <target name="hudson-setup" description="Setup the TCK Hudson instance" depends="init"> - <ant dir="${basedir}/hudson" target="hudson-setup" /> - </target> - - <target name="hudson-start" description="Start the TCK Hudson instance" depends="init"> - <ant dir="${basedir}/hudson" target="hudson-start" /> - </target> - - <target name="hudson-stop" description="Stop the TCK Hudson instance" depends="init"> - <ant dir="${basedir}/hudson" target="hudson-stop" /> - </target> - - <!-- ================================================================== --> - <!-- TCK Tests --> - <!-- ================================================================== --> - - <target name="run-core-tests" description="Run the TCK core tests" depends="init"> - <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> - <ant dir="${osgitck.dir}/osgi.ct" target="osgi.core.tests" /> - </target> - - <target name="run-blueprint-tests" description="Run the TCK blueprint tests" depends="init"> - <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> - <ant dir="${osgitck.dir}/org.osgi.test.cases.blueprint" target="test" /> - <ant dir="${osgitck.dir}/org.osgi.test.cases.blueprint.secure" target="test" /> - </target> - - <target name="run-jdbc-tests" description="Run the TCK jdbc tests" depends="init"> - <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> - <ant dir="${osgitck.dir}/org.osgi.test.cases.jdbc" target="test" /> - </target> - - <target name="run-jmx-tests" description="Run the TCK jmx tests" depends="init"> - <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> - <ant dir="${osgitck.dir}/org.osgi.test.cases.jmx" target="test" /> - </target> - - <target name="run-jndi-tests" description="Run the TCK jndi tests" depends="init"> - <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> - <ant dir="${osgitck.dir}/org.osgi.test.cases.jndi" target="test" /> - </target> - - <target name="run-jpa-tests" description="Run the TCK jpa tests" depends="init"> - <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> - <ant dir="${osgitck.dir}/org.osgi.test.cases.jpa" target="test" /> - </target> - - <target name="run-jta-tests" description="Run the TCK jta tests" depends="init"> - <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> - <ant dir="${osgitck.dir}/org.osgi.test.cases.transaction" target="test" /> - </target> - - <target name="run-webapp-tests" description="Run the TCK webapp tests" depends="init"> - <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> - <ant dir="${osgitck.dir}/org.osgi.test.cases.webcontainer" target="test" /> - </target> - - <target name="test-reports" description="Generate the TCK test reports" depends="init"> - <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> - <mkdir dir="${reports.dir}" /> - <junitreport todir="${reports.dir}"> - <fileset dir="${osgitck.dir}"> - <include name="**/test-reports/TEST-*.xml" /> - </fileset> - <report format="frames" todir="${reports.dir}/html" /> - </junitreport> - - <echo /> - <echo message="Generated test reports: ${reports.dir}" /> - <echo /> - </target> - - <!-- ================================================================== --> - <!-- Clean --> - <!-- ================================================================== --> - - <target name="clean" description="Clean the TCK setup"> - <delete dir="${target.dir}" /> - </target> - -</project> Copied: projects/jboss-osgi/trunk/reactor/osgitck/build.xml (from rev 103676, projects/jboss-osgi/trunk/reactor/osgitck-setup/build.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/build.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck/build.xml 2010-04-08 08:15:00 UTC (rev 103679) @@ -0,0 +1,183 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id: build.xml 93515 2009-09-15 07:18:21Z thomas.diesler(a)jboss.com $ --> + +<project default="setup.vi"> + + <property name="target.dir" value="${basedir}/target" /> + <property name="reports.dir" value="${target.dir}/test-reports" /> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="init"> + + <!-- Check if ant.properties is available --> + <available property="ant.properties.available" file="${basedir}/ant.properties" /> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available" /> + + <property file="${basedir}/ant.properties" /> + + <!-- Setup property defaults --> + <property environment="env" /> + <property name="hudson.username" value="${env.USER}" /> + <property name="osgitck.dir" value="${basedir}/../osgitck.dir" /> + <property name="maven.local.repository" value="/home/${hudson.username}/.m2/repository" /> + <property name="hudson.root" value="/home/${hudson.username}/workspace/osgitck" /> + + <echo>************************************************</echo> + <echo message="hudson.username=${hudson.username}" /> + <echo message="aQute.bnd.version=${aQute.bnd.version}" /> + <echo message="framework.version=${framework.version}" /> + <echo message="osgitck.dir=${osgitck.dir}" /> + <echo>************************************************</echo> + + <!-- Check if the osgitck dir is available --> + <available property="osgitck.dir.available" file="${osgitck.dir}" /> + <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> + + <!-- Check if the aQute.bnd jar is available --> + <property name="aQute.bnd.jar" value="${maven.local.repository}/biz/aQute/aQute.bnd/${aQute.bnd.version}/aQute.bnd-${aQute.bnd.version}.jar" /> + <available property="aQute.bnd.available" file="${aQute.bnd.jar}" /> + <fail message="Cannot find: ${aQute.bnd.jar}" unless="aQute.bnd.available" /> + + <!-- Check if the jboss.osgi.framework jar is available --> + <property name="jboss.osgi.framework.jar" value="${maven.local.repository}/org/jboss/osgi/framework/jboss-osgi-framework/${framework.version}/jboss-osgi-framework-${framework.version}-all.jar" /> + <available property="jboss.osgi.framework.available" file="${jboss.osgi.framework.jar}" /> + <fail message="Cannot find: ${jboss.osgi.framework.jar}" unless="jboss.osgi.framework.available" /> + + </target> + + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> + + <!-- Setup the TCK to use the RI (equinox) --> + <target name="setup.ri" description="Setup the TCK using the RI (Equinox)" depends="init"> + + <!-- Copy the aQute.bnd --> + <copy file="${aQute.bnd.jar}" tofile="${osgitck.dir}/licensed/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar" overwrite="true" /> + + <!-- Build the TCK --> + <ant dir="${osgitck.dir}" target="build-clean" /> + </target> + + <!-- Setup the TCK to use the Vendor Implemenation --> + <target name="setup.vi" description="Setup the TCK using the Vendor Implemenation" depends="init,update-framework"> + + <!-- Copy the aQute.bnd --> + <copy file="${aQute.bnd.jar}" tofile="${osgitck.dir}/licensed/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar" overwrite="true" /> + + <!-- Overlay the TCK setup --> + <copy todir="${osgitck.dir}" overwrite="true"> + <fileset dir="${basedir}/overlay" /> + </copy> + + <!-- Build the TCK --> + <ant dir="${osgitck.dir}" target="build-clean" /> + </target> + + <!-- Update the JBoss OSGi Framework --> + <target name="update-framework" description="Update the JBoss OSGi Framework" depends="init"> + <!-- Copy the OSGi Framework --> + <mkdir dir="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework" /> + <echo message="jboss.osgi.framework.jar=${jboss.osgi.framework.jar}"/> + <copy file="${jboss.osgi.framework.jar}" tofile="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework/org.jboss.osgi.framework-1.0.0.jar" + overwrite="true" /> + </target> + + <!-- ================================================================== --> + <!-- Hudson --> + <!-- ================================================================== --> + + <target name="hudson-setup" description="Setup the TCK Hudson instance" depends="init"> + <ant dir="${basedir}/hudson" target="hudson-setup" /> + </target> + + <target name="hudson-start" description="Start the TCK Hudson instance" depends="init"> + <ant dir="${basedir}/hudson" target="hudson-start" /> + </target> + + <target name="hudson-stop" description="Stop the TCK Hudson instance" depends="init"> + <ant dir="${basedir}/hudson" target="hudson-stop" /> + </target> + + <!-- ================================================================== --> + <!-- TCK Tests --> + <!-- ================================================================== --> + + <target name="run-core-tests" description="Run the TCK core tests" depends="init"> + <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> + <ant dir="${osgitck.dir}/osgi.ct" target="osgi.core.tests" /> + </target> + + <target name="run-blueprint-tests" description="Run the TCK blueprint tests" depends="init"> + <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> + <ant dir="${osgitck.dir}/org.osgi.test.cases.blueprint" target="test" /> + <ant dir="${osgitck.dir}/org.osgi.test.cases.blueprint.secure" target="test" /> + </target> + + <target name="run-jdbc-tests" description="Run the TCK jdbc tests" depends="init"> + <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> + <ant dir="${osgitck.dir}/org.osgi.test.cases.jdbc" target="test" /> + </target> + + <target name="run-jmx-tests" description="Run the TCK jmx tests" depends="init"> + <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> + <ant dir="${osgitck.dir}/org.osgi.test.cases.jmx" target="test" /> + </target> + + <target name="run-jndi-tests" description="Run the TCK jndi tests" depends="init"> + <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> + <ant dir="${osgitck.dir}/org.osgi.test.cases.jndi" target="test" /> + </target> + + <target name="run-jpa-tests" description="Run the TCK jpa tests" depends="init"> + <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> + <ant dir="${osgitck.dir}/org.osgi.test.cases.jpa" target="test" /> + </target> + + <target name="run-jta-tests" description="Run the TCK jta tests" depends="init"> + <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> + <ant dir="${osgitck.dir}/org.osgi.test.cases.transaction" target="test" /> + </target> + + <target name="run-webapp-tests" description="Run the TCK webapp tests" depends="init"> + <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> + <ant dir="${osgitck.dir}/org.osgi.test.cases.webcontainer" target="test" /> + </target> + + <target name="test-reports" description="Generate the TCK test reports" depends="init"> + <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" /> + <mkdir dir="${reports.dir}" /> + <junitreport todir="${reports.dir}"> + <fileset dir="${osgitck.dir}"> + <include name="**/test-reports/TEST-*.xml" /> + </fileset> + <report format="frames" todir="${reports.dir}/html" /> + </junitreport> + + <echo /> + <echo message="Generated test reports: ${reports.dir}" /> + <echo /> + </target> + + <!-- ================================================================== --> + <!-- Clean --> + <!-- ================================================================== --> + + <target name="clean" description="Clean the TCK setup"> + <delete dir="${target.dir}" /> + </target> + +</project> Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/.project =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/.project 2010-04-08 08:12:59 UTC (rev 103678) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/.project 2010-04-08 08:15:00 UTC (rev 103679) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>hudson</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription> Copied: projects/jboss-osgi/trunk/reactor/osgitck/hudson/.project (from rev 103676, projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/.project) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/.project (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/.project 2010-04-08 08:15:00 UTC (rev 103679) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>hudson</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> Copied: projects/jboss-osgi/trunk/reactor/osgitck/hudson/apache-tomcat (from rev 103676, projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/apache-tomcat) Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/build.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/build.xml 2010-04-08 08:12:59 UTC (rev 103678) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/build.xml 2010-04-08 08:15:00 UTC (rev 103679) @@ -1,192 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id: $ --> - -<project> - - <property name="hudson.dir" value="${basedir}"/> - <property name="hudson.target.dir" value="${hudson.dir}/target"/> - <property name="project.root.dir" value="${basedir}/.."/> - - <!-- ================================================================== --> - <!-- Hudson Jobs --> - <!-- ================================================================== --> - - <macrodef name="copyjobs"> - <sequential> - <copy todir="${hudson.home}/jobs" overwrite="true"> - <fileset dir="${hudson.dir}/hudson-home/jobs"> - <include name="*/config.xml"/> - </fileset> - <filterset> - <filter token="tcksetup.svn.url" value="${tcksetup.svn.url}"/> - <filtersfile file="${project.root.dir}/ant.properties"/> - </filterset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="init"> - <!-- Check if ant.properties is available --> - <available property="ant.properties.available" file="${project.root.dir}/ant.properties"/> - <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> - - <property file="${project.root.dir}/ant.properties"/> - </target> - - <target name="init-hudson" depends="init"> - <property name="hudson.tomcat" value="${hudson.root}/apache-tomcat"/> - <property name="hudson.home" value="${hudson.root}/hudson-home"/> - - <echo/> - <echo message="hudson.root = ${hudson.root}"/> - <echo message="hudson.home = ${hudson.home}"/> - <echo/> - - <available file="${hudson.root}" property="hudson.root.available"/> - <available file="${hudson.tomcat}" property="hudson.tomcat.available"/> - <fail message="Hudson root not available: ${hudson.root}" unless="hudson.root.available"/> - - <property name="hudson.username.${hudson.username}" value="true"/> - <fail message="Cannot use default hudson username: ${hudson.username}" if="hudson.username.changeme"/> - </target> - - <target name="init-thirdparty" depends="init-hudson"> - <property name="thirdparty.dir" value="${hudson.target.dir}/thirdparty"/> - <mkdir dir="${thirdparty.dir}"/> - <available property="apache.tomcat.available" file="${thirdparty.dir}/apache-tomcat.zip"/> - <available property="sun.hudson.available" file="${thirdparty.dir}/hudson.war"/> - </target> - - <!-- - Get thirdparty dependencies - --> - <target name="thirdparty" depends="init-thirdparty,get-tomcat,get-hudson"> - </target> - <target name="get-tomcat" depends="init-thirdparty" unless="apache.tomcat.available"> - <get src="http://www.apache.org/dist/tomcat/tomcat-5/v${apache-tomcat}/bi... dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> - </target> - <target name="get-hudson" depends="init-thirdparty" unless="sun.hudson.available"> - <get src="http://hudson-ci.org/download/war/${sun-hudson}/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> - </target> - - <!-- - Setup the Hudson Tomcat instance - --> - <target name="hudson-tomcat-setup" depends="thirdparty" unless="hudson.tomcat.available"> - - <!-- Install Tomcat --> - <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/> - <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/> - <chmod perm="+x"> - <fileset dir="${hudson.tomcat}/bin"> - <include name="*.sh"/> - </fileset> - </chmod> - - <!-- Install Hudson --> - <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> - - </target> - - <!-- - Update the Hudson version - --> - <target name="hudson-update" depends="init-thirdparty"> - <get src="https://hudson.dev.java.net/files/documents/${sun-hudson}/hudso... dest="${thirdparty.dir}/hudson.war" usetimestamp="false" verbose="true"/> - <delete dir="${hudson.tomcat}/webapps/hudson"/> - <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war" overwrite="true"/> - </target> - - <!-- - Setup the Hudson QA environment - --> - <target name="hudson-setup" depends="init-hudson,hudson-tomcat-setup" description="Setup the Hudson QA environment"> - - <!-- get the svn url --> - <exec dir="${project.root.dir}" executable="svn" failonerror="true" output="${hudson.target.dir}/svn-info.xml"> - <arg line="info"/> - <arg line="--xml"/> - </exec> - <xmlproperty file="${hudson.target.dir}/svn-info.xml"/> - <property name="tcksetup.svn.url" value="${info.entry.url}"/> - - <!-- Configure Tomcat --> - <copy todir="${hudson.tomcat}" overwrite="true"> - <fileset dir="${hudson.dir}/apache-tomcat"> - <include name="**/*.xml"/> - </fileset> - <filterset> - <filtersfile file="${project.root.dir}/ant.properties"/> - <filter token="hudson.home" value="${hudson.home}"/> - </filterset> - </copy> - - <!-- Configure Hudson Home --> - <copy todir="${hudson.home}" overwrite="false"> - <fileset dir="${hudson.dir}/hudson-home"> - <include name="*.xml"/> - </fileset> - <filterset> - <filtersfile file="${project.root.dir}/ant.properties"/> - <filter token="hudson.username" value="${hudson.username}"/> - </filterset> - </copy> - - <!-- Configure Hudson Jobs --> - <copyjobs/> - - <echo/> - <echo message="*************************************"/> - <echo message="* Hudson setup successfully *"/> - <echo message="* ant hudson-start *"/> - <echo message="*************************************"/> - <echo/> - - </target> - - <target name="hudson-stop" depends="init-hudson" description="Stops the Hudson QA environment"> - - <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true"> - <arg line="stop"/> - </exec> - - <echo/> - <echo message="*************************************"/> - <echo message="* Hudson stopped successfully *"/> - <echo message="* ant hudson-start *"/> - <echo message="*************************************"/> - <echo/> - - </target> - - <target name="hudson-start" depends="init-hudson" description="Start the Hudson QA environment"> - - <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${hudson.target.dir}/hudson.log"> - <env key="CATALINA_OPTS" value="-Xmx512m -DHUDSON_HOME=${hudson.home} -Djava.awt.headless=true"/> - <arg line="start"/> - </exec> - - <echo/> - <echo message="*************************************"/> - <echo message="* Hudson started successfully *"/> - <echo message="* http://localhost:${hudson.http.port}/hudson *"/> - <echo message="*************************************"/> - <echo/> - - </target> - -</project> Copied: projects/jboss-osgi/trunk/reactor/osgitck/hudson/build.xml (from rev 103676, projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/build.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/build.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/build.xml 2010-04-08 08:15:00 UTC (rev 103679) @@ -0,0 +1,192 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id: $ --> + +<project> + + <property name="hudson.dir" value="${basedir}"/> + <property name="hudson.target.dir" value="${hudson.dir}/target"/> + <property name="project.root.dir" value="${basedir}/.."/> + + <!-- ================================================================== --> + <!-- Hudson Jobs --> + <!-- ================================================================== --> + + <macrodef name="copyjobs"> + <sequential> + <copy todir="${hudson.home}/jobs" overwrite="true"> + <fileset dir="${hudson.dir}/hudson-home/jobs"> + <include name="*/config.xml"/> + </fileset> + <filterset> + <filter token="tcksetup.svn.url" value="${tcksetup.svn.url}"/> + <filtersfile file="${project.root.dir}/ant.properties"/> + </filterset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="init"> + <!-- Check if ant.properties is available --> + <available property="ant.properties.available" file="${project.root.dir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + + <property file="${project.root.dir}/ant.properties"/> + </target> + + <target name="init-hudson" depends="init"> + <property name="hudson.tomcat" value="${hudson.root}/apache-tomcat"/> + <property name="hudson.home" value="${hudson.root}/hudson-home"/> + + <echo/> + <echo message="hudson.root = ${hudson.root}"/> + <echo message="hudson.home = ${hudson.home}"/> + <echo/> + + <available file="${hudson.root}" property="hudson.root.available"/> + <available file="${hudson.tomcat}" property="hudson.tomcat.available"/> + <fail message="Hudson root not available: ${hudson.root}" unless="hudson.root.available"/> + + <property name="hudson.username.${hudson.username}" value="true"/> + <fail message="Cannot use default hudson username: ${hudson.username}" if="hudson.username.changeme"/> + </target> + + <target name="init-thirdparty" depends="init-hudson"> + <property name="thirdparty.dir" value="${hudson.target.dir}/thirdparty"/> + <mkdir dir="${thirdparty.dir}"/> + <available property="apache.tomcat.available" file="${thirdparty.dir}/apache-tomcat.zip"/> + <available property="sun.hudson.available" file="${thirdparty.dir}/hudson.war"/> + </target> + + <!-- + Get thirdparty dependencies + --> + <target name="thirdparty" depends="init-thirdparty,get-tomcat,get-hudson"> + </target> + <target name="get-tomcat" depends="init-thirdparty" unless="apache.tomcat.available"> + <get src="http://www.apache.org/dist/tomcat/tomcat-5/v${apache-tomcat}/bi... dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> + </target> + <target name="get-hudson" depends="init-thirdparty" unless="sun.hudson.available"> + <get src="http://hudson-ci.org/download/war/${sun-hudson}/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> + </target> + + <!-- + Setup the Hudson Tomcat instance + --> + <target name="hudson-tomcat-setup" depends="thirdparty" unless="hudson.tomcat.available"> + + <!-- Install Tomcat --> + <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/> + <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/> + <chmod perm="+x"> + <fileset dir="${hudson.tomcat}/bin"> + <include name="*.sh"/> + </fileset> + </chmod> + + <!-- Install Hudson --> + <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> + + </target> + + <!-- + Update the Hudson version + --> + <target name="hudson-update" depends="init-thirdparty"> + <get src="https://hudson.dev.java.net/files/documents/${sun-hudson}/hudso... dest="${thirdparty.dir}/hudson.war" usetimestamp="false" verbose="true"/> + <delete dir="${hudson.tomcat}/webapps/hudson"/> + <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war" overwrite="true"/> + </target> + + <!-- + Setup the Hudson QA environment + --> + <target name="hudson-setup" depends="init-hudson,hudson-tomcat-setup" description="Setup the Hudson QA environment"> + + <!-- get the svn url --> + <exec dir="${project.root.dir}" executable="svn" failonerror="true" output="${hudson.target.dir}/svn-info.xml"> + <arg line="info"/> + <arg line="--xml"/> + </exec> + <xmlproperty file="${hudson.target.dir}/svn-info.xml"/> + <property name="tcksetup.svn.url" value="${info.entry.url}"/> + + <!-- Configure Tomcat --> + <copy todir="${hudson.tomcat}" overwrite="true"> + <fileset dir="${hudson.dir}/apache-tomcat"> + <include name="**/*.xml"/> + </fileset> + <filterset> + <filtersfile file="${project.root.dir}/ant.properties"/> + <filter token="hudson.home" value="${hudson.home}"/> + </filterset> + </copy> + + <!-- Configure Hudson Home --> + <copy todir="${hudson.home}" overwrite="false"> + <fileset dir="${hudson.dir}/hudson-home"> + <include name="*.xml"/> + </fileset> + <filterset> + <filtersfile file="${project.root.dir}/ant.properties"/> + <filter token="hudson.username" value="${hudson.username}"/> + </filterset> + </copy> + + <!-- Configure Hudson Jobs --> + <copyjobs/> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson setup successfully *"/> + <echo message="* ant hudson-start *"/> + <echo message="*************************************"/> + <echo/> + + </target> + + <target name="hudson-stop" depends="init-hudson" description="Stops the Hudson QA environment"> + + <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true"> + <arg line="stop"/> + </exec> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson stopped successfully *"/> + <echo message="* ant hudson-start *"/> + <echo message="*************************************"/> + <echo/> + + </target> + + <target name="hudson-start" depends="init-hudson" description="Start the Hudson QA environment"> + + <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${hudson.target.dir}/hudson.log"> + <env key="CATALINA_OPTS" value="-Xmx512m -DHUDSON_HOME=${hudson.home} -Djava.awt.headless=true"/> + <arg line="start"/> + </exec> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson started successfully *"/> + <echo message="* http://localhost:${hudson.http.port}/hudson *"/> + <echo message="*************************************"/> + <echo/> + + </target> + +</project> Copied: projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home (from rev 103676, projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home) Copied: projects/jboss-osgi/trunk/reactor/osgitck/overlay (from rev 103676, projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay) Deleted: projects/jboss-osgi/trunk/reactor/osgitck/readme.txt =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/readme.txt 2010-04-08 08:12:59 UTC (rev 103678) +++ projects/jboss-osgi/trunk/reactor/osgitck/readme.txt 2010-04-08 08:15:00 UTC (rev 103679) @@ -1,37 +0,0 @@ -Setup the OSGi TCK ------------------- - -Checkout the OSGi TCK setup project - - svn co https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/osgitck/... osgitck-setup - -Copy and edit the setup properties - - cd osgitck-setup - cp ant.properties.example ant.properties - vi ant.properties - -Running the OSGi TCK against the RI (Equinox) - - ant clean setup.ri - ant run-core-tests - ant test-reports - -Running the OSGi TCK against the JBoss OSGi Framework - - ant clean setup.vi - ant run-core-tests - ant test-reports - -Setup the OSGi TCK Hudson instance - - ant hudson-setup - ant hudson-start - sign up in hudson using your username. - -The Hudson setup uses the RI. You should see no errors when you run the jobs initially. - -Running Tests with JPDA ------------------------ - -export ANT_OPTS="-Djpda=-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y" Copied: projects/jboss-osgi/trunk/reactor/osgitck/readme.txt (from rev 103676, projects/jboss-osgi/trunk/reactor/osgitck-setup/readme.txt) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/readme.txt (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck/readme.txt 2010-04-08 08:15:00 UTC (rev 103679) @@ -0,0 +1,37 @@ +Setup the OSGi TCK +------------------ + +Checkout the OSGi TCK setup project + + svn co https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/osgitck/... osgitck-setup + +Copy and edit the setup properties + + cd osgitck-setup + cp ant.properties.example ant.properties + vi ant.properties + +Running the OSGi TCK against the RI (Equinox) + + ant clean setup.ri + ant run-core-tests + ant test-reports + +Running the OSGi TCK against the JBoss OSGi Framework + + ant clean setup.vi + ant run-core-tests + ant test-reports + +Setup the OSGi TCK Hudson instance + + ant hudson-setup + ant hudson-start + sign up in hudson using your username. + +The Hudson setup uses the RI. You should see no errors when you run the jobs initially. + +Running Tests with JPDA +----------------------- + +export ANT_OPTS="-Djpda=-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"