[jboss-osgi-commits] JBoss-OSGI SVN: r103102 - in projects/jboss-osgi/trunk/reactor: osgitck and 32 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-03-29 06:00:49 -0400 (Mon, 29 Mar 2010) New Revision: 103102 Added: projects/jboss-osgi/trunk/reactor/osgitck-setup/ projects/jboss-osgi/trunk/reactor/osgitck-setup/.project projects/jboss-osgi/trunk/reactor/osgitck-setup/ant.properties.example projects/jboss-osgi/trunk/reactor/osgitck-setup/build.xml projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/.project projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/apache-tomcat/ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/apache-tomcat/conf/ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/apache-tomcat/conf/server.xml projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/build.xml projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/config.xml projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/hudson.tasks.Maven.xml projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/aQute.bnd/ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/aQute.bnd/config.xml projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.blueprint.tests/ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.core.tests/ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.core.tests/config.xml projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jdbc.tests/ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jmx.tests/ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jndi.tests/ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.webapp.tests/ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/ projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/cnf/ projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/cnf/build.bnd projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/cnf/src/ projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/cnf/src/Packaging.java projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/org.osgi.test.cases.startlevel/ projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/org.osgi.test.cases.startlevel/bnd.bnd projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/osgi.ri/ projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/osgi.ri/osgi.core.impls.bnd projects/jboss-osgi/trunk/reactor/osgitck-setup/readme.txt Removed: 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/conf/server.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/build.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/config.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/hudson.tasks.Maven.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/aQute.bnd/config.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.core.tests/config.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml projects/jboss-osgi/trunk/reactor/osgitck/overlay/cnf/build.bnd projects/jboss-osgi/trunk/reactor/osgitck/overlay/cnf/src/Packaging.java projects/jboss-osgi/trunk/reactor/osgitck/overlay/org.osgi.test.cases.startlevel/bnd.bnd projects/jboss-osgi/trunk/reactor/osgitck/overlay/osgi.ri/osgi.core.impls.bnd projects/jboss-osgi/trunk/reactor/osgitck/readme.txt Log: Rename osgitck osgitck-setup Deleted: projects/jboss-osgi/trunk/reactor/osgitck/.project =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/.project 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/.project 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,7 +0,0 @@ -<?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/ant.properties.example 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/ant.properties.example 2010-03-29 10:00:49 UTC (rev 103102) @@ -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 Deleted: projects/jboss-osgi/trunk/reactor/osgitck/build.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/build.xml 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/build.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -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> Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/.project =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/.project 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/.project 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>hudson</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription> Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/apache-tomcat/conf/server.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/apache-tomcat/conf/server.xml 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/apache-tomcat/conf/server.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<Server port=&quot;@hudson.admin.port(a)&quot; shutdown="SHUTDOWN"> - - <GlobalNamingResources> - <!-- Used by Manager webapp --> - <Resource - name="UserDatabase" auth="Container" - type="org.apache.catalina.UserDatabase" - description="User database that can be updated and saved" - factory="org.apache.catalina.users.MemoryUserDatabaseFactory" - pathname="conf/tomcat-users.xml" /> - </GlobalNamingResources> - - <Service name="Catalina"> - - <Connector port=&quot;@hudson.http.port(a)&quot; /> - - <!-- This is here for compatibility only, not required - <Connector port="8009" protocol="AJP/1.3" /> - --> - - <Engine name="Catalina" defaultHost="localhost"> - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase" /> - <Host name="localhost" appBase="webapps"/> - </Engine> - - </Service> -</Server> Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/build.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/build.xml 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/build.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -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> Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/config.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/config.xml 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,61 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<hudson> - <version>1.336</version> - <numExecutors>1</numExecutors> - <mode>NORMAL</mode> - <useSecurity>true</useSecurity> - <authorizationStrategy class="hudson.security.GlobalMatrixAuthorizationStrategy"> - <permission>hudson.model.Run.Update:@hudson.username@</permission> - <permission>hudson.model.Computer.Delete:@hudson.username@</permission> - <permission>hudson.model.View.Delete:@hudson.username@</permission> - <permission>hudson.model.View.Configure:@hudson.username@</permission> - <permission>hudson.model.View.Create:@hudson.username@</permission> - <permission>hudson.model.Hudson.Read:@hudson.username@</permission> - <permission>hudson.model.Item.Create:@hudson.username@</permission> - <permission>hudson.model.Item.Build:@hudson.username@</permission> - <permission>hudson.model.Item.Configure:@hudson.username@</permission> - <permission>hudson.model.Item.Delete:@hudson.username@</permission> - <permission>hudson.model.Hudson.Administer:@hudson.username@</permission> - <permission>hudson.model.Item.Read:@hudson.username@</permission> - <permission>hudson.model.Computer.Configure:@hudson.username@</permission> - <permission>hudson.model.Run.Delete:@hudson.username@</permission> - <permission>hudson.scm.SCM.Tag:@hudson.username@</permission> - <permission>hudson.model.Item.Workspace:@hudson.username@</permission> - </authorizationStrategy> - <securityRealm class="hudson.security.HudsonPrivateSecurityRealm"> - <disableSignup>false</disableSignup> - </securityRealm> - <systemMessage> - <![CDATA[ -<h2>OSGi QA Environment</h2> -]]> - </systemMessage> - <jdks> - <jdk> - <name>jdk1.5</name> - <home&gt;@java.home.jdk15(a)&lt;/home&gt; - <properties/> - </jdk> - <jdk> - <name>jdk1.6</name> - <home&gt;@java.home.jdk16(a)&lt;/home&gt; - <properties/> - </jdk> - </jdks> - <clouds/> - <slaves/> - <quietPeriod>5</quietPeriod> - <scmCheckoutRetryCount>0</scmCheckoutRetryCount> - <views> - <hudson.model.AllView> - <owner class="hudson" reference="../../.."/> - <name>All</name> - </hudson.model.AllView> - </views> - <primaryView>All</primaryView> - <slaveAgentPort>0</slaveAgentPort> - <label></label> - <nodeProperties/> - <globalNodeProperties/> - <disabledAdministrativeMonitors/> -</hudson> \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/hudson.tasks.Maven.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/hudson.tasks.Maven.xml 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/hudson.tasks.Maven.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,9 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<hudson.tasks.Maven_-DescriptorImpl> - <installations> - <hudson.tasks.Maven_-MavenInstallation> - <name&gt;@hudson.maven.name(a)&lt;/name&gt; - <mavenHome&gt;@hudson.maven.path(a)&lt;/mavenHome&gt; - </hudson.tasks.Maven_-MavenInstallation> - </installations> -</hudson.tasks.Maven_-DescriptorImpl> \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/aQute.bnd/config.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/aQute.bnd/config.xml 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/aQute.bnd/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,40 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <actions/> - <description>Build and test the aQute Bnd tool</description> - <logRotator> - <daysToKeep>60</daysToKeep> - <numToKeep>-1</numToKeep> - </logRotator> - <keepDependencies>false</keepDependencies> - <properties/> - <scm class="hudson.scm.SubversionSCM"> - <locations> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/project... - <local>aQute.bnd</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - </locations> - <useUpdate>true</useUpdate> - <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> - <rootModule></rootModule> - </browser> - <excludedRegions></excludedRegions> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <jdk>jdk1.6</jdk> - <triggers class="vector"/> - <builders> - <hudson.tasks.Maven> - <targets>-U clean install</targets> - </hudson.tasks.Maven> - </builders> - <publishers> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>aQute.bnd/**/target/surefire-reports/TEST-*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - </publishers> - <buildWrappers/> -</project> Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,57 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <actions/> - <description></description> - <keepDependencies>false</keepDependencies> - <properties/> - <scm class="hudson.scm.SubversionSCM"> - <locations> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote&gt;@tcksetup.svn.url(a)&lt;/remote&gt; - <local>osgitck-setup</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote&gt;@osgitck.svn.url(a)&lt;/remote&gt; - <local>osgitck.dir</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - </locations> - <useUpdate>true</useUpdate> - <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> - <rootModule></rootModule> - </browser> - <excludedRegions></excludedRegions> - <excludedUsers></excludedUsers> - <excludedRevprop></excludedRevprop> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> - <jdk>jdk1.6</jdk> - <triggers class="vector"/> - <concurrentBuild>false</concurrentBuild> - <builders> - <hudson.tasks.Shell> - <command> -TCKSETUPDIR=$WORKSPACE/osgitck-setup - -# Setup the TCK -cd $TCKSETUPDIR -cp ant.properties.example ant.properties - -# Setup the TCK -ant clean setup.ri - -# Run the blueprint tests -ant run-blueprint-tests - </command> - </hudson.tasks.Shell> - </builders> - <publishers> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>osgitck.dir/*/generated/**/test-reports/TEST-*.xml</testResults> - <testDataPublishers/> - </hudson.tasks.junit.JUnitResultArchiver> - </publishers> - <buildWrappers/> -</project> \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.core.tests/config.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,70 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <actions/> - <description></description> - <keepDependencies>false</keepDependencies> - <properties/> - <scm class="hudson.scm.SubversionSCM"> - <locations> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote&gt;@tcksetup.svn.url(a)&lt;/remote&gt; - <local>osgitck-setup</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote&gt;@osgitck.core.svn.url(a)&lt;/remote&gt; - <local>osgitck.dir</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote&gt;@framework.svn.url(a)&lt;/remote&gt; - <local>jboss-osgi-framework</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - </locations> - <useUpdate>true</useUpdate> - <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> - <rootModule></rootModule> - </browser> - <excludedRegions></excludedRegions> - <excludedUsers></excludedUsers> - <excludedRevprop></excludedRevprop> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> - <jdk>jdk1.6</jdk> - <triggers class="vector"> - <hudson.triggers.TimerTrigger> - <spec>0 20 * * *</spec> - </hudson.triggers.TimerTrigger> - </triggers> - <concurrentBuild>false</concurrentBuild> - <builders> - <hudson.tasks.Shell> - <command> -TCKSETUPDIR=$WORKSPACE/osgitck-setup -FRAMEWORKDIR=$WORKSPACE/jboss-osgi-framework - -# Build and Install the Framework -cd $FRAMEWORKDIR -mvn -U -fae -Pall clean install - -# Setup the TCK -cd $TCKSETUPDIR -cp ant.properties.example ant.properties - -# Setup the TCK -ant clean setup.ri - -# Run the core tests -ant run-core-tests - </command> - </hudson.tasks.Shell> - </builders> - <publishers> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>osgitck.dir/*/generated/**/test-reports/TEST-*.xml</testResults> - <testDataPublishers/> - </hudson.tasks.junit.JUnitResultArchiver> - </publishers> - <buildWrappers/> -</project> \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,57 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <actions/> - <description></description> - <keepDependencies>false</keepDependencies> - <properties/> - <scm class="hudson.scm.SubversionSCM"> - <locations> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote&gt;@tcksetup.svn.url(a)&lt;/remote&gt; - <local>osgitck-setup</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote&gt;@osgitck.svn.url(a)&lt;/remote&gt; - <local>osgitck.dir</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - </locations> - <useUpdate>true</useUpdate> - <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> - <rootModule></rootModule> - </browser> - <excludedRegions></excludedRegions> - <excludedUsers></excludedUsers> - <excludedRevprop></excludedRevprop> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> - <jdk>jdk1.6</jdk> - <triggers class="vector"/> - <concurrentBuild>false</concurrentBuild> - <builders> - <hudson.tasks.Shell> - <command> -TCKSETUPDIR=$WORKSPACE/osgitck-setup - -# Setup the TCK -cd $TCKSETUPDIR -cp ant.properties.example ant.properties - -# Setup the TCK -ant clean setup.ri - -# Run the jdbc tests -ant run-jdbc-tests - </command> - </hudson.tasks.Shell> - </builders> - <publishers> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>osgitck.dir/*/generated/**/test-reports/TEST-*.xml</testResults> - <testDataPublishers/> - </hudson.tasks.junit.JUnitResultArchiver> - </publishers> - <buildWrappers/> -</project> \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,57 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <actions/> - <description></description> - <keepDependencies>false</keepDependencies> - <properties/> - <scm class="hudson.scm.SubversionSCM"> - <locations> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote&gt;@tcksetup.svn.url(a)&lt;/remote&gt; - <local>osgitck-setup</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote&gt;@osgitck.svn.url(a)&lt;/remote&gt; - <local>osgitck.dir</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - </locations> - <useUpdate>true</useUpdate> - <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> - <rootModule></rootModule> - </browser> - <excludedRegions></excludedRegions> - <excludedUsers></excludedUsers> - <excludedRevprop></excludedRevprop> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> - <jdk>jdk1.6</jdk> - <triggers class="vector"/> - <concurrentBuild>false</concurrentBuild> - <builders> - <hudson.tasks.Shell> - <command> -TCKSETUPDIR=$WORKSPACE/osgitck-setup - -# Setup the TCK -cd $TCKSETUPDIR -cp ant.properties.example ant.properties - -# Setup the TCK -ant clean setup.ri - -# Run the jmx tests -ant run-jmx-tests - </command> - </hudson.tasks.Shell> - </builders> - <publishers> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>osgitck.dir/*/generated/**/test-reports/TEST-*.xml</testResults> - <testDataPublishers/> - </hudson.tasks.junit.JUnitResultArchiver> - </publishers> - <buildWrappers/> -</project> \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,57 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <actions/> - <description></description> - <keepDependencies>false</keepDependencies> - <properties/> - <scm class="hudson.scm.SubversionSCM"> - <locations> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote&gt;@tcksetup.svn.url(a)&lt;/remote&gt; - <local>osgitck-setup</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote&gt;@osgitck.svn.url(a)&lt;/remote&gt; - <local>osgitck.dir</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - </locations> - <useUpdate>true</useUpdate> - <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> - <rootModule></rootModule> - </browser> - <excludedRegions></excludedRegions> - <excludedUsers></excludedUsers> - <excludedRevprop></excludedRevprop> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> - <jdk>jdk1.6</jdk> - <triggers class="vector"/> - <concurrentBuild>false</concurrentBuild> - <builders> - <hudson.tasks.Shell> - <command> -TCKSETUPDIR=$WORKSPACE/osgitck-setup - -# Setup the TCK -cd $TCKSETUPDIR -cp ant.properties.example ant.properties - -# Setup the TCK -ant clean setup.ri - -# Run the jta tests -ant run-jta-tests - </command> - </hudson.tasks.Shell> - </builders> - <publishers> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>osgitck.dir/*/generated/**/test-reports/TEST-*.xml</testResults> - <testDataPublishers/> - </hudson.tasks.junit.JUnitResultArchiver> - </publishers> - <buildWrappers/> -</project> \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,57 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <actions/> - <description></description> - <keepDependencies>false</keepDependencies> - <properties/> - <scm class="hudson.scm.SubversionSCM"> - <locations> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote&gt;@tcksetup.svn.url(a)&lt;/remote&gt; - <local>osgitck-setup</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - <hudson.scm.SubversionSCM_-ModuleLocation> - <remote&gt;@osgitck.svn.url(a)&lt;/remote&gt; - <local>osgitck.dir</local> - </hudson.scm.SubversionSCM_-ModuleLocation> - </locations> - <useUpdate>true</useUpdate> - <browser class="hudson.scm.browsers.FishEyeSVN"> - <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> - <rootModule></rootModule> - </browser> - <excludedRegions></excludedRegions> - <excludedUsers></excludedUsers> - <excludedRevprop></excludedRevprop> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> - <jdk>jdk1.6</jdk> - <triggers class="vector"/> - <concurrentBuild>false</concurrentBuild> - <builders> - <hudson.tasks.Shell> - <command> -TCKSETUPDIR=$WORKSPACE/osgitck-setup - -# Setup the TCK -cd $TCKSETUPDIR -cp ant.properties.example ant.properties - -# Setup the TCK -ant clean setup.ri - -# Run the webapp tests -ant run-webapp-tests - </command> - </hudson.tasks.Shell> - </builders> - <publishers> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>osgitck.dir/*/generated/**/test-reports/TEST-*.xml</testResults> - <testDataPublishers/> - </hudson.tasks.junit.JUnitResultArchiver> - </publishers> - <buildWrappers/> -</project> \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/osgitck/overlay/cnf/build.bnd =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/overlay/cnf/build.bnd 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/overlay/cnf/build.bnd 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,99 +0,0 @@ -# Very general -project.dependson = ${p-dependson;:} -project.bootclasspath = ${p-bootclasspath;:} -project.buildpath = ${p-buildpath;:} -project.sourcepath = ${p-sourcepath;:} -project.allsourcepath = ${p-allsourcepath;:} -project.output = ${p-output} -project.testpath = ${p-testpath;:} -project.workspace = ${workspace} -project.dir = ${project} - --verbose = true -src = src -bin = bin -target = ${project}/${target-dir} -release.target = ${if;${def;top};${def;top};${target}} -build = ${workspace}/cnf -licensed = ${workspace}/licensed -repo = ${build}/repo -licensed-repo = ${licensed}/repo -target-dir = generated -p = ${basename;${project}} -project.name = ${p} -bin.includes = ${project.name}.jar -prebuild = - -# Java compiler options -java = java -javac = javac -javac.debug = on -javac.source = 1.3 -javac.target = 1.2 - - -#Bnd options --sources = true --sourcepath = ${project}/src - --plugin = aQute.lib.deployer.FileRepo; \ - location=${repo}, \ - aQute.lib.deployer.FileRepo; \ - location=${licensed-repo}; \ - readonly=true, \ - aQute.bnd.signing.JartoolSigner; \ - keystore=${build}/keystore; \ - keypass=testtest; \ - storepass=testtest, \ - Packaging; \ - path:=${build}/${bin}; \ - command:=-pack, \ - SignatureTest; \ - path:=${build}/${bin}; \ - command:="-signaturetest" - - --make = \ - (*).(jar); type=bnd; recipe="bnd/$1.bnd", \ - (*).(ipa); type=bnd; recipe="ipa/$1.bnd" - - -junit = com.springsource.junit;version=3.8;export="junit.framework;version=3.8,junit.extensions;version=3.8" - -# Time options -# base.modified is used by bnd to not make when files are not changed -base.modified = ${fmodified;${build}/build.xml,${build}/build.bnd,${project}/build.properties,${project}/bnd.bnd,${project}/build.xml} -base.modified.readable = ${long2date;${base.modified}} -project.build = ${tstamp;yyyyMMddhhmm} - -copyright = Copyright (c) OSGi Alliance (2000, ${tstamp;yyyy}). All Rights Reserved. -copyright.html = Copyright &copy; OSGi Alliance (2000, ${tstamp;yyyy}). All Rights Reserved. - -osgi.release = 4 -osgi.version = 4.2.0 --versionpolicy = "[${version;==;${@}},${version;+;${@}})" - -osgi.release.version = ${osgi.version}.${project.build} -core.release.version = ${osgi.release.version} -cmpn.release.version = ${osgi.release.version} -mobile.release.version = ${osgi.release.version} -enterprise.release.version = ${osgi.release.version} -proposed.release.version = ${osgi.release.version} - - -# Documentation -Bundle-Copyright = ${copyright} -Bundle-Vendor = OSGi Alliance --removeheaders = Include-Resource, Private-Package - -# Define the OSGi vendor framework -osgi.vendor.framework = org.jboss.osgi.framework -osgi.vendor.version = 1.0.0 - --runpath = \ - ${osgi.vendor.framework}; version=${osgi.vendor.version}, \ - com.springsource.junit; version=3.8; export="junit.framework;version=3.8" - -testcases = ${classes;extending;junit.framework.TestCase|*DefaultTestBundleControl;concrete} - - Deleted: projects/jboss-osgi/trunk/reactor/osgitck/overlay/cnf/src/Packaging.java =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/overlay/cnf/src/Packaging.java 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/overlay/cnf/src/Packaging.java 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,250 +0,0 @@ -import java.io.*; -import java.util.*; -import java.util.jar.*; - -import aQute.bnd.build.*; -import aQute.bnd.service.*; -import aQute.lib.osgi.*; -import aQute.libg.header.*; -import aQute.libg.version.*; - -/** - * This script runs after the bnd file stuff has been done, before analyzing any - * classes. It will check if the bnd file contains -pack (the bnd file must - * contain it, not a parent). It will then pack all projects listed as its - * valued. For each project, a bnd file is created that has no longer references - * to the build. All dependent JAR files are stored in the jar directory for - * this purpose. Additionally, a runtests script is added and the bnd jar is - * included to make the tess self contained. - */ - -public class Packaging implements AnalyzerPlugin { - - final static String PACK = "-pack"; - final static String ROOT = ""; - - public boolean analyzeJar(Analyzer analyzer) throws Exception { - if (!(analyzer instanceof ProjectBuilder)) - return false; - - // Make sure -pack is set in the actual file or one of its includes - if (!analyzer.getProperties().containsKey(PACK)) - return false; - - String pack = analyzer.getProperty(PACK); - ProjectBuilder pb = (ProjectBuilder) analyzer; - Workspace workspace = pb.getProject().getWorkspace(); - Jar jar = analyzer.getJar(); - - // For each project listed ... - Map<String, Map<String, String>> ct = pb.parseHeader(pack); - for (Map.Entry<String, Map<String, String>> entry : ct.entrySet()) { - try { - Project project = workspace.getProject(entry.getKey()); - if (!project.isValid()) - analyzer.error("Invalid project to pack: %s", project); - else - pack(analyzer, jar, project); - } - catch (Exception t) { - analyzer.error("While packaging %s got %s", entry.getKey(), t); - throw t; - } - } - - // Include bnd so it is fully self contained, except for the - // java runtime. - Container c = pb.getProject().getBundle("biz.aQute.bnd", "latest", - Constants.STRATEGY_HIGHEST, null); - - File f = c.getFile(); - if (f != null) - jar.putResource("jar/bnd.jar", new FileResource(f)); - else - analyzer.error("Cannot find bnd's jar file in a repository "); - - List<Container> extra = pb.getProject().getBundles(Constants.STRATEGY_HIGHEST, "com.springsource.junit"); - flatten(analyzer,null,jar,extra,true); - - StringBuilder script = new StringBuilder(); - script.append("java -jar jar/bnd.jar runtests -title "); - script.append(pb.getProject()); - script.append("\n"); - jar.putResource("runtests", new EmbeddedResource(script.toString() - .getBytes("UTF-8"), 0)); - - return false; - } - - /** - * Store a project in a JAR so that we can later unzip this project and have - * all information. - * - * @param jar - * @param project - * @throws Exception - */ - @SuppressWarnings("unchecked") - private void pack(Analyzer analyzer, Jar jar, Project project) - throws Exception { - Collection<Container> runpath = project.getRunpath(); - Collection<Container> runbundles = project.getRunbundles(); - String runproperties = project.getProperty(Constants.RUNPROPERTIES); - StringBuilder sb = new StringBuilder(); - - sb.append("# bnd pack for project " + project + "\n"); - sb.append("# " + new Date() + "\n"); - sb.append("build=.\n"); - sb.append("\n"); - sb.append("-target = "); - flatten(analyzer, sb, jar, project, Collections.EMPTY_MAP, true); - sb.deleteCharAt(sb.length() - 1); - - sb.append("\n"); - sb.append("\n"); - sb.append("-runpath = "); - flatten(analyzer, sb, jar, runpath, false); - - sb.append("\n\n"); - sb.append("-runbundles = "); - flatten(analyzer, sb, jar, runbundles, false); - - Map<String, String> properties = OSGiHeader - .parseProperties(runproperties); - - String del = "\n\n" + Constants.RUNPROPERTIES + " = \\\n"; - properties.put("report", "true"); - for (Map.Entry<String, String> entry : properties.entrySet()) { - sb.append(del); - - sb.append(entry.getKey()); - sb.append("="); - if (entry.getKey().equals("org.osgi.framework.trust.repositories")) { - sb.append("keystore"); - - // Copy the key store - File keystore = analyzer.getFile(entry.getValue()); - if (keystore.exists() && keystore.isFile()) { - jar.putResource("keystore", new FileResource(keystore)); - } - else { - analyzer.error("The referred keystore %s is not a file", - entry.getValue()); - } - } - else { - sb.append("\""); - sb.append(entry.getValue()); - sb.append("\""); - } - del = ", \\\n"; - } - - // TDI: StartLevelControl should use framework properties - // https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1498 - String runvm = project.getProperty(Constants.RUNVM); - if (runvm != null && runvm.length() > 0) - { - sb.append("\n\n"); - sb.append(Constants.RUNVM + " = " + runvm); - } - - sb.append("\n\n\n\n"); - - Resource r = new EmbeddedResource(sb.toString().getBytes("UTF-8"), - project.lastModified()); - jar.putResource(project.getName() + ".bnd", r); - - } - - private void flatten(Analyzer analyzer, StringBuilder sb, Jar jar, - Collection<Container> path, boolean store) throws Exception { - for (Container container : path) { - flatten(analyzer, sb, jar, container, store); - } - if (sb != null) - sb.deleteCharAt(sb.length() - 2); - } - - private void flatten(Analyzer analyzer, StringBuilder sb, Jar jar, - Container container, boolean store) throws Exception { - switch (container.getType()) { - case LIBRARY : - flatten(analyzer, sb, jar, container.getMembers(), store); - return; - - case PROJECT : - flatten(analyzer, sb, jar, container.getProject(), container - .getAttributes(), store); - break; - - case EXTERNAL : - flatten(analyzer, sb, jar, container.getFile(), container - .getAttributes(), store); - break; - - case REPO : - flatten(analyzer, sb, jar, container.getFile(), container - .getAttributes(), store); - break; - } - } - - private void flatten(Analyzer analyzer, StringBuilder sb, Jar jar, - Project project, Map<String, String> map, boolean store) throws Exception { - File[] subs = project.getBuildFiles(); - analyzer.getInfo(project); - if (subs == null) { - analyzer.error("Project cannot build %s ", project); - } - else - for (File sub : subs) - flatten(analyzer, sb, jar, sub, map, store); - } - - private void flatten(Analyzer analyzer, StringBuilder sb, Jar jar, - File sub, Map<String, String> map, boolean store) throws Exception { - Jar s = new Jar(sub); - try { - Manifest m = s.getManifest(); - String bsn = m.getMainAttributes().getValue( - Constants.BUNDLE_SYMBOLICNAME); - int n = bsn.indexOf(';'); - if (n > 0) - bsn = bsn.substring(0, n); - - String version = m.getMainAttributes().getValue( - Constants.BUNDLE_VERSION); - if (version == null) - version = "0"; - Version v = new Version(version); - - String path = "jar/" + bsn + "-" + v.getMajor() + "." - + v.getMinor() + "." + v.getMicro() + ".jar"; - - if ( store ) - jar.putResource(path, new FileResource(sub)); - - if (sb != null) { - sb.append("\\\n "); - sb.append(path); - sb.append(";version=file"); - } - for (Map.Entry<String, String> entry : map.entrySet()) { - if (sb != null && !entry.getKey().equals("version")) { - sb.append(";"); - sb.append(entry.getKey()); - sb.append("=\""); - sb.append(entry.getValue()); - sb.append("\""); - } - } - if (sb != null) - sb.append(", "); - } - finally { - s.close(); - } - } - -} Deleted: projects/jboss-osgi/trunk/reactor/osgitck/overlay/org.osgi.test.cases.startlevel/bnd.bnd =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/overlay/org.osgi.test.cases.startlevel/bnd.bnd 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/overlay/org.osgi.test.cases.startlevel/bnd.bnd 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,35 +0,0 @@ -Bundle-Description: Tests the Start Level service control bundle -Bundle-Version : 4.2.0.${project.build} - -Private-Package = org.osgi.test.support.*, \ - ${p}.junit.* - -Export-Package = \ - - -Include-Resource = \ - tb1.jar, \ - tb2.jar, \ - tb3.jar, \ - tb4.jar, \ - tb5.jar - -Test-Cases = ${testcases} --signaturetest = org.osgi.service.startlevel - --buildpath = \ - org.osgi.test.support; version=project , \ - org.osgi.service.startlevel; version=project , \ - osgi.core; version=4.2 , \ - ee.minimum; version=1.2 , \ - ${junit} - --runbundles = \ - - --runproperties = report=true, \ - osgi.compatibility.bootdelegation=false, \ - osgi.resolverMode=strict - -# TDI: Reduce start level test timeouts to 20sec --runvm = osgi.tc.startlevel.sleeptime=200, osgi.tc.startlevel.timeout=100 \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/osgitck/overlay/osgi.ri/osgi.core.impls.bnd =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/overlay/osgi.ri/osgi.core.impls.bnd 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/overlay/osgi.ri/osgi.core.impls.bnd 2010-03-29 10:00:49 UTC (rev 103102) @@ -1,14 +0,0 @@ -Bundle-Description : \ - OSGi Service Platform Release ${version;=;${core.release.version}} Version ${version;==;${core.release.version}}, \ - Core Reference Implementation. - -Bundle-Version : ${core.release.version} - -Include-Resource : \ - \ - ${repo;${osgi.vendor.framework}}, \ - ${repo;osgi.core;${version;===;${core.release.version}}}, \ - \ - NOTICE=legal/NOTICE.txt, \ - {about.html=legal/about.html} - Deleted: projects/jboss-osgi/trunk/reactor/osgitck/readme.txt =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck/readme.txt 2010-03-29 09:57:27 UTC (rev 103101) +++ projects/jboss-osgi/trunk/reactor/osgitck/readme.txt 2010-03-29 10:00:49 UTC (rev 103102) @@ -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-setup/.project (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/.project) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/.project (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/.project 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,7 @@ +<?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-setup/ant.properties.example (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/ant.properties.example) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/ant.properties.example (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/ant.properties.example 2010-03-29 10:00:49 UTC (rev 103102) @@ -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 Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/build.xml (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/build.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/build.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/build.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -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> Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/.project (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/hudson/.project) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/.project (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/.project 2010-03-29 10:00:49 UTC (rev 103102) @@ -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-setup/hudson/apache-tomcat/conf/server.xml (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/hudson/apache-tomcat/conf/server.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/apache-tomcat/conf/server.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/apache-tomcat/conf/server.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<Server port=&quot;@hudson.admin.port(a)&quot; shutdown="SHUTDOWN"> + + <GlobalNamingResources> + <!-- Used by Manager webapp --> + <Resource + name="UserDatabase" auth="Container" + type="org.apache.catalina.UserDatabase" + description="User database that can be updated and saved" + factory="org.apache.catalina.users.MemoryUserDatabaseFactory" + pathname="conf/tomcat-users.xml" /> + </GlobalNamingResources> + + <Service name="Catalina"> + + <Connector port=&quot;@hudson.http.port(a)&quot; /> + + <!-- This is here for compatibility only, not required + <Connector port="8009" protocol="AJP/1.3" /> + --> + + <Engine name="Catalina" defaultHost="localhost"> + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase" /> + <Host name="localhost" appBase="webapps"/> + </Engine> + + </Service> +</Server> Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/build.xml (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/hudson/build.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/build.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/build.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -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-setup/hudson/hudson-home/config.xml (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/config.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/config.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,61 @@ +<?xml version='1.0' encoding='UTF-8'?> +<hudson> + <version>1.336</version> + <numExecutors>1</numExecutors> + <mode>NORMAL</mode> + <useSecurity>true</useSecurity> + <authorizationStrategy class="hudson.security.GlobalMatrixAuthorizationStrategy"> + <permission>hudson.model.Run.Update:@hudson.username@</permission> + <permission>hudson.model.Computer.Delete:@hudson.username@</permission> + <permission>hudson.model.View.Delete:@hudson.username@</permission> + <permission>hudson.model.View.Configure:@hudson.username@</permission> + <permission>hudson.model.View.Create:@hudson.username@</permission> + <permission>hudson.model.Hudson.Read:@hudson.username@</permission> + <permission>hudson.model.Item.Create:@hudson.username@</permission> + <permission>hudson.model.Item.Build:@hudson.username@</permission> + <permission>hudson.model.Item.Configure:@hudson.username@</permission> + <permission>hudson.model.Item.Delete:@hudson.username@</permission> + <permission>hudson.model.Hudson.Administer:@hudson.username@</permission> + <permission>hudson.model.Item.Read:@hudson.username@</permission> + <permission>hudson.model.Computer.Configure:@hudson.username@</permission> + <permission>hudson.model.Run.Delete:@hudson.username@</permission> + <permission>hudson.scm.SCM.Tag:@hudson.username@</permission> + <permission>hudson.model.Item.Workspace:@hudson.username@</permission> + </authorizationStrategy> + <securityRealm class="hudson.security.HudsonPrivateSecurityRealm"> + <disableSignup>false</disableSignup> + </securityRealm> + <systemMessage> + <![CDATA[ +<h2>OSGi QA Environment</h2> +]]> + </systemMessage> + <jdks> + <jdk> + <name>jdk1.5</name> + <home&gt;@java.home.jdk15(a)&lt;/home&gt; + <properties/> + </jdk> + <jdk> + <name>jdk1.6</name> + <home&gt;@java.home.jdk16(a)&lt;/home&gt; + <properties/> + </jdk> + </jdks> + <clouds/> + <slaves/> + <quietPeriod>5</quietPeriod> + <scmCheckoutRetryCount>0</scmCheckoutRetryCount> + <views> + <hudson.model.AllView> + <owner class="hudson" reference="../../.."/> + <name>All</name> + </hudson.model.AllView> + </views> + <primaryView>All</primaryView> + <slaveAgentPort>0</slaveAgentPort> + <label></label> + <nodeProperties/> + <globalNodeProperties/> + <disabledAdministrativeMonitors/> +</hudson> \ No newline at end of file Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/hudson.tasks.Maven.xml (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/hudson.tasks.Maven.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/hudson.tasks.Maven.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/hudson.tasks.Maven.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,9 @@ +<?xml version='1.0' encoding='UTF-8'?> +<hudson.tasks.Maven_-DescriptorImpl> + <installations> + <hudson.tasks.Maven_-MavenInstallation> + <name&gt;@hudson.maven.name(a)&lt;/name&gt; + <mavenHome&gt;@hudson.maven.path(a)&lt;/mavenHome&gt; + </hudson.tasks.Maven_-MavenInstallation> + </installations> +</hudson.tasks.Maven_-DescriptorImpl> \ No newline at end of file Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/aQute.bnd/config.xml (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/aQute.bnd/config.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/aQute.bnd/config.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/aQute.bnd/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,40 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <actions/> + <description>Build and test the aQute Bnd tool</description> + <logRotator> + <daysToKeep>60</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote>https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/project... + <local>aQute.bnd</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> + <rootModule></rootModule> + </browser> + <excludedRegions></excludedRegions> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <jdk>jdk1.6</jdk> + <triggers class="vector"/> + <builders> + <hudson.tasks.Maven> + <targets>-U clean install</targets> + </hudson.tasks.Maven> + </builders> + <publishers> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>aQute.bnd/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + </publishers> + <buildWrappers/> +</project> Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,57 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <actions/> + <description></description> + <keepDependencies>false</keepDependencies> + <properties/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@tcksetup.svn.url(a)&lt;/remote&gt; + <local>osgitck-setup</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@osgitck.svn.url(a)&lt;/remote&gt; + <local>osgitck.dir</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> + <rootModule></rootModule> + </browser> + <excludedRegions></excludedRegions> + <excludedUsers></excludedUsers> + <excludedRevprop></excludedRevprop> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> + <jdk>jdk1.6</jdk> + <triggers class="vector"/> + <concurrentBuild>false</concurrentBuild> + <builders> + <hudson.tasks.Shell> + <command> +TCKSETUPDIR=$WORKSPACE/osgitck-setup + +# Setup the TCK +cd $TCKSETUPDIR +cp ant.properties.example ant.properties + +# Setup the TCK +ant clean setup.ri + +# Run the blueprint tests +ant run-blueprint-tests + </command> + </hudson.tasks.Shell> + </builders> + <publishers> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>osgitck.dir/*/generated/**/test-reports/TEST-*.xml</testResults> + <testDataPublishers/> + </hudson.tasks.junit.JUnitResultArchiver> + </publishers> + <buildWrappers/> +</project> \ No newline at end of file Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.core.tests/config.xml (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.core.tests/config.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.core.tests/config.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,70 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <actions/> + <description></description> + <keepDependencies>false</keepDependencies> + <properties/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@tcksetup.svn.url(a)&lt;/remote&gt; + <local>osgitck-setup</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@osgitck.core.svn.url(a)&lt;/remote&gt; + <local>osgitck.dir</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@framework.svn.url(a)&lt;/remote&gt; + <local>jboss-osgi-framework</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> + <rootModule></rootModule> + </browser> + <excludedRegions></excludedRegions> + <excludedUsers></excludedUsers> + <excludedRevprop></excludedRevprop> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> + <jdk>jdk1.6</jdk> + <triggers class="vector"> + <hudson.triggers.TimerTrigger> + <spec>0 20 * * *</spec> + </hudson.triggers.TimerTrigger> + </triggers> + <concurrentBuild>false</concurrentBuild> + <builders> + <hudson.tasks.Shell> + <command> +TCKSETUPDIR=$WORKSPACE/osgitck-setup +FRAMEWORKDIR=$WORKSPACE/jboss-osgi-framework + +# Build and Install the Framework +cd $FRAMEWORKDIR +mvn -U -fae -Pall clean install + +# Setup the TCK +cd $TCKSETUPDIR +cp ant.properties.example ant.properties + +# Setup the TCK +ant clean setup.ri + +# Run the core tests +ant run-core-tests + </command> + </hudson.tasks.Shell> + </builders> + <publishers> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>osgitck.dir/*/generated/**/test-reports/TEST-*.xml</testResults> + <testDataPublishers/> + </hudson.tasks.junit.JUnitResultArchiver> + </publishers> + <buildWrappers/> +</project> \ No newline at end of file Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,57 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <actions/> + <description></description> + <keepDependencies>false</keepDependencies> + <properties/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@tcksetup.svn.url(a)&lt;/remote&gt; + <local>osgitck-setup</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@osgitck.svn.url(a)&lt;/remote&gt; + <local>osgitck.dir</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> + <rootModule></rootModule> + </browser> + <excludedRegions></excludedRegions> + <excludedUsers></excludedUsers> + <excludedRevprop></excludedRevprop> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> + <jdk>jdk1.6</jdk> + <triggers class="vector"/> + <concurrentBuild>false</concurrentBuild> + <builders> + <hudson.tasks.Shell> + <command> +TCKSETUPDIR=$WORKSPACE/osgitck-setup + +# Setup the TCK +cd $TCKSETUPDIR +cp ant.properties.example ant.properties + +# Setup the TCK +ant clean setup.ri + +# Run the jdbc tests +ant run-jdbc-tests + </command> + </hudson.tasks.Shell> + </builders> + <publishers> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>osgitck.dir/*/generated/**/test-reports/TEST-*.xml</testResults> + <testDataPublishers/> + </hudson.tasks.junit.JUnitResultArchiver> + </publishers> + <buildWrappers/> +</project> \ No newline at end of file Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,57 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <actions/> + <description></description> + <keepDependencies>false</keepDependencies> + <properties/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@tcksetup.svn.url(a)&lt;/remote&gt; + <local>osgitck-setup</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@osgitck.svn.url(a)&lt;/remote&gt; + <local>osgitck.dir</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> + <rootModule></rootModule> + </browser> + <excludedRegions></excludedRegions> + <excludedUsers></excludedUsers> + <excludedRevprop></excludedRevprop> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> + <jdk>jdk1.6</jdk> + <triggers class="vector"/> + <concurrentBuild>false</concurrentBuild> + <builders> + <hudson.tasks.Shell> + <command> +TCKSETUPDIR=$WORKSPACE/osgitck-setup + +# Setup the TCK +cd $TCKSETUPDIR +cp ant.properties.example ant.properties + +# Setup the TCK +ant clean setup.ri + +# Run the jmx tests +ant run-jmx-tests + </command> + </hudson.tasks.Shell> + </builders> + <publishers> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>osgitck.dir/*/generated/**/test-reports/TEST-*.xml</testResults> + <testDataPublishers/> + </hudson.tasks.junit.JUnitResultArchiver> + </publishers> + <buildWrappers/> +</project> \ No newline at end of file Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,57 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <actions/> + <description></description> + <keepDependencies>false</keepDependencies> + <properties/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@tcksetup.svn.url(a)&lt;/remote&gt; + <local>osgitck-setup</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@osgitck.svn.url(a)&lt;/remote&gt; + <local>osgitck.dir</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> + <rootModule></rootModule> + </browser> + <excludedRegions></excludedRegions> + <excludedUsers></excludedUsers> + <excludedRevprop></excludedRevprop> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> + <jdk>jdk1.6</jdk> + <triggers class="vector"/> + <concurrentBuild>false</concurrentBuild> + <builders> + <hudson.tasks.Shell> + <command> +TCKSETUPDIR=$WORKSPACE/osgitck-setup + +# Setup the TCK +cd $TCKSETUPDIR +cp ant.properties.example ant.properties + +# Setup the TCK +ant clean setup.ri + +# Run the jta tests +ant run-jta-tests + </command> + </hudson.tasks.Shell> + </builders> + <publishers> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>osgitck.dir/*/generated/**/test-reports/TEST-*.xml</testResults> + <testDataPublishers/> + </hudson.tasks.junit.JUnitResultArchiver> + </publishers> + <buildWrappers/> +</project> \ No newline at end of file Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,57 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <actions/> + <description></description> + <keepDependencies>false</keepDependencies> + <properties/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@tcksetup.svn.url(a)&lt;/remote&gt; + <local>osgitck-setup</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + <hudson.scm.SubversionSCM_-ModuleLocation> + <remote&gt;@osgitck.svn.url(a)&lt;/remote&gt; + <local>osgitck.dir</local> + </hudson.scm.SubversionSCM_-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossOSGi/</url> + <rootModule></rootModule> + </browser> + <excludedRegions></excludedRegions> + <excludedUsers></excludedUsers> + <excludedRevprop></excludedRevprop> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> + <jdk>jdk1.6</jdk> + <triggers class="vector"/> + <concurrentBuild>false</concurrentBuild> + <builders> + <hudson.tasks.Shell> + <command> +TCKSETUPDIR=$WORKSPACE/osgitck-setup + +# Setup the TCK +cd $TCKSETUPDIR +cp ant.properties.example ant.properties + +# Setup the TCK +ant clean setup.ri + +# Run the webapp tests +ant run-webapp-tests + </command> + </hudson.tasks.Shell> + </builders> + <publishers> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>osgitck.dir/*/generated/**/test-reports/TEST-*.xml</testResults> + <testDataPublishers/> + </hudson.tasks.junit.JUnitResultArchiver> + </publishers> + <buildWrappers/> +</project> \ No newline at end of file Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/cnf/build.bnd (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/overlay/cnf/build.bnd) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/cnf/build.bnd (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/cnf/build.bnd 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,99 @@ +# Very general +project.dependson = ${p-dependson;:} +project.bootclasspath = ${p-bootclasspath;:} +project.buildpath = ${p-buildpath;:} +project.sourcepath = ${p-sourcepath;:} +project.allsourcepath = ${p-allsourcepath;:} +project.output = ${p-output} +project.testpath = ${p-testpath;:} +project.workspace = ${workspace} +project.dir = ${project} + +-verbose = true +src = src +bin = bin +target = ${project}/${target-dir} +release.target = ${if;${def;top};${def;top};${target}} +build = ${workspace}/cnf +licensed = ${workspace}/licensed +repo = ${build}/repo +licensed-repo = ${licensed}/repo +target-dir = generated +p = ${basename;${project}} +project.name = ${p} +bin.includes = ${project.name}.jar +prebuild = + +# Java compiler options +java = java +javac = javac +javac.debug = on +javac.source = 1.3 +javac.target = 1.2 + + +#Bnd options +-sources = true +-sourcepath = ${project}/src + +-plugin = aQute.lib.deployer.FileRepo; \ + location=${repo}, \ + aQute.lib.deployer.FileRepo; \ + location=${licensed-repo}; \ + readonly=true, \ + aQute.bnd.signing.JartoolSigner; \ + keystore=${build}/keystore; \ + keypass=testtest; \ + storepass=testtest, \ + Packaging; \ + path:=${build}/${bin}; \ + command:=-pack, \ + SignatureTest; \ + path:=${build}/${bin}; \ + command:="-signaturetest" + + +-make = \ + (*).(jar); type=bnd; recipe="bnd/$1.bnd", \ + (*).(ipa); type=bnd; recipe="ipa/$1.bnd" + + +junit = com.springsource.junit;version=3.8;export="junit.framework;version=3.8,junit.extensions;version=3.8" + +# Time options +# base.modified is used by bnd to not make when files are not changed +base.modified = ${fmodified;${build}/build.xml,${build}/build.bnd,${project}/build.properties,${project}/bnd.bnd,${project}/build.xml} +base.modified.readable = ${long2date;${base.modified}} +project.build = ${tstamp;yyyyMMddhhmm} + +copyright = Copyright (c) OSGi Alliance (2000, ${tstamp;yyyy}). All Rights Reserved. +copyright.html = Copyright &copy; OSGi Alliance (2000, ${tstamp;yyyy}). All Rights Reserved. + +osgi.release = 4 +osgi.version = 4.2.0 +-versionpolicy = "[${version;==;${@}},${version;+;${@}})" + +osgi.release.version = ${osgi.version}.${project.build} +core.release.version = ${osgi.release.version} +cmpn.release.version = ${osgi.release.version} +mobile.release.version = ${osgi.release.version} +enterprise.release.version = ${osgi.release.version} +proposed.release.version = ${osgi.release.version} + + +# Documentation +Bundle-Copyright = ${copyright} +Bundle-Vendor = OSGi Alliance +-removeheaders = Include-Resource, Private-Package + +# Define the OSGi vendor framework +osgi.vendor.framework = org.jboss.osgi.framework +osgi.vendor.version = 1.0.0 + +-runpath = \ + ${osgi.vendor.framework}; version=${osgi.vendor.version}, \ + com.springsource.junit; version=3.8; export="junit.framework;version=3.8" + +testcases = ${classes;extending;junit.framework.TestCase|*DefaultTestBundleControl;concrete} + + Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/cnf/src/Packaging.java (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/overlay/cnf/src/Packaging.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/cnf/src/Packaging.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/cnf/src/Packaging.java 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,250 @@ +import java.io.*; +import java.util.*; +import java.util.jar.*; + +import aQute.bnd.build.*; +import aQute.bnd.service.*; +import aQute.lib.osgi.*; +import aQute.libg.header.*; +import aQute.libg.version.*; + +/** + * This script runs after the bnd file stuff has been done, before analyzing any + * classes. It will check if the bnd file contains -pack (the bnd file must + * contain it, not a parent). It will then pack all projects listed as its + * valued. For each project, a bnd file is created that has no longer references + * to the build. All dependent JAR files are stored in the jar directory for + * this purpose. Additionally, a runtests script is added and the bnd jar is + * included to make the tess self contained. + */ + +public class Packaging implements AnalyzerPlugin { + + final static String PACK = "-pack"; + final static String ROOT = ""; + + public boolean analyzeJar(Analyzer analyzer) throws Exception { + if (!(analyzer instanceof ProjectBuilder)) + return false; + + // Make sure -pack is set in the actual file or one of its includes + if (!analyzer.getProperties().containsKey(PACK)) + return false; + + String pack = analyzer.getProperty(PACK); + ProjectBuilder pb = (ProjectBuilder) analyzer; + Workspace workspace = pb.getProject().getWorkspace(); + Jar jar = analyzer.getJar(); + + // For each project listed ... + Map<String, Map<String, String>> ct = pb.parseHeader(pack); + for (Map.Entry<String, Map<String, String>> entry : ct.entrySet()) { + try { + Project project = workspace.getProject(entry.getKey()); + if (!project.isValid()) + analyzer.error("Invalid project to pack: %s", project); + else + pack(analyzer, jar, project); + } + catch (Exception t) { + analyzer.error("While packaging %s got %s", entry.getKey(), t); + throw t; + } + } + + // Include bnd so it is fully self contained, except for the + // java runtime. + Container c = pb.getProject().getBundle("biz.aQute.bnd", "latest", + Constants.STRATEGY_HIGHEST, null); + + File f = c.getFile(); + if (f != null) + jar.putResource("jar/bnd.jar", new FileResource(f)); + else + analyzer.error("Cannot find bnd's jar file in a repository "); + + List<Container> extra = pb.getProject().getBundles(Constants.STRATEGY_HIGHEST, "com.springsource.junit"); + flatten(analyzer,null,jar,extra,true); + + StringBuilder script = new StringBuilder(); + script.append("java -jar jar/bnd.jar runtests -title "); + script.append(pb.getProject()); + script.append("\n"); + jar.putResource("runtests", new EmbeddedResource(script.toString() + .getBytes("UTF-8"), 0)); + + return false; + } + + /** + * Store a project in a JAR so that we can later unzip this project and have + * all information. + * + * @param jar + * @param project + * @throws Exception + */ + @SuppressWarnings("unchecked") + private void pack(Analyzer analyzer, Jar jar, Project project) + throws Exception { + Collection<Container> runpath = project.getRunpath(); + Collection<Container> runbundles = project.getRunbundles(); + String runproperties = project.getProperty(Constants.RUNPROPERTIES); + StringBuilder sb = new StringBuilder(); + + sb.append("# bnd pack for project " + project + "\n"); + sb.append("# " + new Date() + "\n"); + sb.append("build=.\n"); + sb.append("\n"); + sb.append("-target = "); + flatten(analyzer, sb, jar, project, Collections.EMPTY_MAP, true); + sb.deleteCharAt(sb.length() - 1); + + sb.append("\n"); + sb.append("\n"); + sb.append("-runpath = "); + flatten(analyzer, sb, jar, runpath, false); + + sb.append("\n\n"); + sb.append("-runbundles = "); + flatten(analyzer, sb, jar, runbundles, false); + + Map<String, String> properties = OSGiHeader + .parseProperties(runproperties); + + String del = "\n\n" + Constants.RUNPROPERTIES + " = \\\n"; + properties.put("report", "true"); + for (Map.Entry<String, String> entry : properties.entrySet()) { + sb.append(del); + + sb.append(entry.getKey()); + sb.append("="); + if (entry.getKey().equals("org.osgi.framework.trust.repositories")) { + sb.append("keystore"); + + // Copy the key store + File keystore = analyzer.getFile(entry.getValue()); + if (keystore.exists() && keystore.isFile()) { + jar.putResource("keystore", new FileResource(keystore)); + } + else { + analyzer.error("The referred keystore %s is not a file", + entry.getValue()); + } + } + else { + sb.append("\""); + sb.append(entry.getValue()); + sb.append("\""); + } + del = ", \\\n"; + } + + // TDI: StartLevelControl should use framework properties + // https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1498 + String runvm = project.getProperty(Constants.RUNVM); + if (runvm != null && runvm.length() > 0) + { + sb.append("\n\n"); + sb.append(Constants.RUNVM + " = " + runvm); + } + + sb.append("\n\n\n\n"); + + Resource r = new EmbeddedResource(sb.toString().getBytes("UTF-8"), + project.lastModified()); + jar.putResource(project.getName() + ".bnd", r); + + } + + private void flatten(Analyzer analyzer, StringBuilder sb, Jar jar, + Collection<Container> path, boolean store) throws Exception { + for (Container container : path) { + flatten(analyzer, sb, jar, container, store); + } + if (sb != null) + sb.deleteCharAt(sb.length() - 2); + } + + private void flatten(Analyzer analyzer, StringBuilder sb, Jar jar, + Container container, boolean store) throws Exception { + switch (container.getType()) { + case LIBRARY : + flatten(analyzer, sb, jar, container.getMembers(), store); + return; + + case PROJECT : + flatten(analyzer, sb, jar, container.getProject(), container + .getAttributes(), store); + break; + + case EXTERNAL : + flatten(analyzer, sb, jar, container.getFile(), container + .getAttributes(), store); + break; + + case REPO : + flatten(analyzer, sb, jar, container.getFile(), container + .getAttributes(), store); + break; + } + } + + private void flatten(Analyzer analyzer, StringBuilder sb, Jar jar, + Project project, Map<String, String> map, boolean store) throws Exception { + File[] subs = project.getBuildFiles(); + analyzer.getInfo(project); + if (subs == null) { + analyzer.error("Project cannot build %s ", project); + } + else + for (File sub : subs) + flatten(analyzer, sb, jar, sub, map, store); + } + + private void flatten(Analyzer analyzer, StringBuilder sb, Jar jar, + File sub, Map<String, String> map, boolean store) throws Exception { + Jar s = new Jar(sub); + try { + Manifest m = s.getManifest(); + String bsn = m.getMainAttributes().getValue( + Constants.BUNDLE_SYMBOLICNAME); + int n = bsn.indexOf(';'); + if (n > 0) + bsn = bsn.substring(0, n); + + String version = m.getMainAttributes().getValue( + Constants.BUNDLE_VERSION); + if (version == null) + version = "0"; + Version v = new Version(version); + + String path = "jar/" + bsn + "-" + v.getMajor() + "." + + v.getMinor() + "." + v.getMicro() + ".jar"; + + if ( store ) + jar.putResource(path, new FileResource(sub)); + + if (sb != null) { + sb.append("\\\n "); + sb.append(path); + sb.append(";version=file"); + } + for (Map.Entry<String, String> entry : map.entrySet()) { + if (sb != null && !entry.getKey().equals("version")) { + sb.append(";"); + sb.append(entry.getKey()); + sb.append("=\""); + sb.append(entry.getValue()); + sb.append("\""); + } + } + if (sb != null) + sb.append(", "); + } + finally { + s.close(); + } + } + +} Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/org.osgi.test.cases.startlevel/bnd.bnd (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/overlay/org.osgi.test.cases.startlevel/bnd.bnd) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/org.osgi.test.cases.startlevel/bnd.bnd (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/org.osgi.test.cases.startlevel/bnd.bnd 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,35 @@ +Bundle-Description: Tests the Start Level service control bundle +Bundle-Version : 4.2.0.${project.build} + +Private-Package = org.osgi.test.support.*, \ + ${p}.junit.* + +Export-Package = \ + + +Include-Resource = \ + tb1.jar, \ + tb2.jar, \ + tb3.jar, \ + tb4.jar, \ + tb5.jar + +Test-Cases = ${testcases} +-signaturetest = org.osgi.service.startlevel + +-buildpath = \ + org.osgi.test.support; version=project , \ + org.osgi.service.startlevel; version=project , \ + osgi.core; version=4.2 , \ + ee.minimum; version=1.2 , \ + ${junit} + +-runbundles = \ + + +-runproperties = report=true, \ + osgi.compatibility.bootdelegation=false, \ + osgi.resolverMode=strict + +# TDI: Reduce start level test timeouts to 20sec +-runvm = osgi.tc.startlevel.sleeptime=200, osgi.tc.startlevel.timeout=100 \ No newline at end of file Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/osgi.ri/osgi.core.impls.bnd (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/overlay/osgi.ri/osgi.core.impls.bnd) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/osgi.ri/osgi.core.impls.bnd (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/overlay/osgi.ri/osgi.core.impls.bnd 2010-03-29 10:00:49 UTC (rev 103102) @@ -0,0 +1,14 @@ +Bundle-Description : \ + OSGi Service Platform Release ${version;=;${core.release.version}} Version ${version;==;${core.release.version}}, \ + Core Reference Implementation. + +Bundle-Version : ${core.release.version} + +Include-Resource : \ + \ + ${repo;${osgi.vendor.framework}}, \ + ${repo;osgi.core;${version;===;${core.release.version}}}, \ + \ + NOTICE=legal/NOTICE.txt, \ + {about.html=legal/about.html} + Copied: projects/jboss-osgi/trunk/reactor/osgitck-setup/readme.txt (from rev 103085, projects/jboss-osgi/trunk/reactor/osgitck/readme.txt) =================================================================== --- projects/jboss-osgi/trunk/reactor/osgitck-setup/readme.txt (rev 0) +++ projects/jboss-osgi/trunk/reactor/osgitck-setup/readme.txt 2010-03-29 10:00:49 UTC (rev 103102) @@ -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"