JBoss-OSGI SVN: r100077 - projects/jboss-osgi/projects/osgitck/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-01-28 14:55:57 -0500 (Thu, 28 Jan 2010)
New Revision: 100077
Modified:
projects/jboss-osgi/projects/osgitck/trunk/build.xml
Log:
Use build-clean
Modified: projects/jboss-osgi/projects/osgitck/trunk/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-01-28 19:50:01 UTC (rev 100076)
+++ projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-01-28 19:55:57 UTC (rev 100077)
@@ -72,7 +72,7 @@
<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}/osgi.ct" target="clean-build" />
+ <ant dir="${osgitck.dir}/osgi.ct" target="build-clean" />
</target>
<!-- Setup the TCK to use the JBoss OSGi Framework -->
@@ -87,7 +87,7 @@
<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}/osgi.ct" target="clean-build" />
+ <ant dir="${osgitck.dir}/osgi.ct" target="build-clean" />
</target>
<!-- ================================================================== -->
15 years, 10 months
JBoss-OSGI SVN: r100076 - in projects/jboss-osgi/projects/osgitck/trunk: hudson/hudson-home/jobs/osgi.core.tests and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-01-28 14:50:01 -0500 (Thu, 28 Jan 2010)
New Revision: 100076
Modified:
projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml
Log:
Use osgitck.core.svn.url
Modified: projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example 2010-01-28 19:28:02 UTC (rev 100075)
+++ projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example 2010-01-28 19:50:01 UTC (rev 100076)
@@ -20,6 +20,7 @@
# 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
Modified: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2010-01-28 19:28:02 UTC (rev 100075)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2010-01-28 19:50:01 UTC (rev 100076)
@@ -11,7 +11,7 @@
<local>osgitck-setup</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>@osgitck.svn.url@</remote>
+ <remote>@osgitck.core.svn.url@</remote>
<local>osgitck.dir</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
<hudson.scm.SubversionSCM_-ModuleLocation>
15 years, 10 months
JBoss-OSGI SVN: r100072 - in projects/jboss-osgi/projects/osgitck/trunk: hudson/hudson-home/jobs/osgi.blueprint.tests and 5 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-01-28 14:11:59 -0500 (Thu, 28 Jan 2010)
New Revision: 100072
Modified:
projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example
projects/jboss-osgi/projects/osgitck/trunk/build.xml
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml
Log:
Update hudson jobs
Modified: projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example 2010-01-28 18:56:59 UTC (rev 100071)
+++ projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example 2010-01-28 19:11:59 UTC (rev 100072)
@@ -18,6 +18,9 @@
# Hudson Setup ----------------------------------------------------------------
+# The Hudson OSGi TCK checkout URL
+osgitck.svn.url=https://www.osgi.org/members/svn/build/trunk
+
# JDK settings
java.home.jdk15=/usr/java/jdk1.5.0_22
java.home.jdk16=/usr/java/jdk1.6.0_17
Modified: projects/jboss-osgi/projects/osgitck/trunk/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-01-28 18:56:59 UTC (rev 100071)
+++ projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-01-28 19:11:59 UTC (rev 100072)
@@ -72,8 +72,7 @@
<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}/osgi.ct" target="clean" />
- <ant dir="${osgitck.dir}/osgi.ct" target="publish" />
+ <ant dir="${osgitck.dir}/osgi.ct" target="clean-build" />
</target>
<!-- Setup the TCK to use the JBoss OSGi Framework -->
@@ -88,8 +87,7 @@
<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}/osgi.ct" target="clean" />
- <ant dir="${osgitck.dir}/osgi.ct" target="publish" />
+ <ant dir="${osgitck.dir}/osgi.ct" target="clean-build" />
</target>
<!-- ================================================================== -->
@@ -112,11 +110,6 @@
<!-- TCK Tests -->
<!-- ================================================================== -->
- <target name="clean-build-tck" description="Full build of the RIs and TCK tests" depends="init">
- <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" />
- <ant dir="${osgitck.dir}/osgi.ct" target="clean-build" />
- </target>
-
<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" />
Modified: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml 2010-01-28 18:56:59 UTC (rev 100071)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml 2010-01-28 19:11:59 UTC (rev 100072)
@@ -10,6 +10,10 @@
<remote>@tcksetup.svn.url@</remote>
<local>osgitck-setup</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>@osgitck.svn.url@</remote>
+ <local>osgitck.dir</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2010-01-28 18:56:59 UTC (rev 100071)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2010-01-28 19:11:59 UTC (rev 100072)
@@ -11,6 +11,10 @@
<local>osgitck-setup</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
<hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>@osgitck.svn.url@</remote>
+ <local>osgitck.dir</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
<remote>@framework.svn.url@</remote>
<local>jboss-osgi-framework</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
Modified: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml 2010-01-28 18:56:59 UTC (rev 100071)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml 2010-01-28 19:11:59 UTC (rev 100072)
@@ -10,6 +10,10 @@
<remote>@tcksetup.svn.url@</remote>
<local>osgitck-setup</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>@osgitck.svn.url@</remote>
+ <local>osgitck.dir</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml 2010-01-28 18:56:59 UTC (rev 100071)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml 2010-01-28 19:11:59 UTC (rev 100072)
@@ -10,6 +10,10 @@
<remote>@tcksetup.svn.url@</remote>
<local>osgitck-setup</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>@osgitck.svn.url@</remote>
+ <local>osgitck.dir</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml 2010-01-28 18:56:59 UTC (rev 100071)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml 2010-01-28 19:11:59 UTC (rev 100072)
@@ -10,6 +10,10 @@
<remote>@tcksetup.svn.url@</remote>
<local>osgitck-setup</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>@osgitck.svn.url@</remote>
+ <local>osgitck.dir</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml 2010-01-28 18:56:59 UTC (rev 100071)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml 2010-01-28 19:11:59 UTC (rev 100072)
@@ -10,6 +10,10 @@
<remote>@tcksetup.svn.url@</remote>
<local>osgitck-setup</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>@osgitck.svn.url@</remote>
+ <local>osgitck.dir</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
15 years, 10 months
JBoss-OSGI SVN: r100071 - projects/jboss-osgi/projects/osgitck/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-01-28 13:56:59 -0500 (Thu, 28 Jan 2010)
New Revision: 100071
Modified:
projects/jboss-osgi/projects/osgitck/trunk/build.xml
Log:
Add clean-build-tck
Modified: projects/jboss-osgi/projects/osgitck/trunk/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-01-28 18:55:17 UTC (rev 100070)
+++ projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-01-28 18:56:59 UTC (rev 100071)
@@ -112,6 +112,11 @@
<!-- TCK Tests -->
<!-- ================================================================== -->
+ <target name="clean-build-tck" description="Full build of the RIs and TCK tests" depends="init">
+ <fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" />
+ <ant dir="${osgitck.dir}/osgi.ct" target="clean-build" />
+ </target>
+
<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" />
@@ -138,15 +143,15 @@
<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">
+ <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>
- <!-- target name="run-jta-tests" description="Run the TCK jta tests" depends="init">
+ <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.jta" target="test" />
- </target -->
+ <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" />
15 years, 10 months
JBoss-OSGI SVN: r100069 - projects/jboss-osgi/projects/osgitck/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-01-28 13:52:22 -0500 (Thu, 28 Jan 2010)
New Revision: 100069
Modified:
projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example
projects/jboss-osgi/projects/osgitck/trunk/build.xml
Log:
SVN checkout and use osgitck.dir
Modified: projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example 2010-01-28 18:49:24 UTC (rev 100068)
+++ projects/jboss-osgi/projects/osgitck/trunk/ant.properties.example 2010-01-28 18:52:22 UTC (rev 100069)
@@ -11,8 +11,7 @@
aQute.bnd.version=0.0.366-SNAPSHOT
# The location of the OSGi TCK
-# osgitck.export=/home/username/svn/osgitck/r4v42
-# osgitck.zip.file=/home/username/svn/osgitck/osgitck-r4v42.zip
+# osgitck.dir=/home/username/svn/osgi.org/build/trunk
# The location of the local maven repository
# maven.local.repository=/home/username/.m2/repository
Modified: projects/jboss-osgi/projects/osgitck/trunk/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-01-28 18:49:24 UTC (rev 100068)
+++ projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-01-28 18:52:22 UTC (rev 100069)
@@ -15,7 +15,6 @@
<property name="target.dir" value="${basedir}/target" />
<property name="reports.dir" value="${target.dir}/test-reports" />
- <property name="osgitck.dir" value="${target.dir}/osgitck-r4v42" />
<!-- ================================================================== -->
<!-- Initialization -->
@@ -32,8 +31,7 @@
<!-- Setup property defaults -->
<property environment="env" />
<property name="hudson.username" value="${env.USER}" />
- <property name="osgitck.export" value="/home/${hudson.username}/svn/osgitck/r4v42" />
- <property name="osgitck.tar.file" value="${osgitck.export}/../osgitck-r4v42.tar" />
+ <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" />
@@ -41,13 +39,12 @@
<echo message="hudson.username=${hudson.username}" />
<echo message="aQute.bnd.version=${aQute.bnd.version}" />
<echo message="framework.version=${framework.version}" />
- <echo message="osgitck.export=${osgitck.export}" />
- <echo message="osgitck.tar.file=${osgitck.tar.file}" />
+ <echo message="osgitck.dir=${osgitck.dir}" />
<echo>************************************************</echo>
<!-- Check if the osgitck export is available -->
- <available property="osgitck.export.available" file="${osgitck.export}" />
- <available property="osgitck.tar.available" file="${osgitck.tar.file}" />
+ <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" />
@@ -68,21 +65,8 @@
<!-- Setup -->
<!-- ================================================================== -->
- <!-- Tar the OSGi TCK-->
- <target name="tar-osgitck" depends="init" unless="osgitck.tar.available">
- <fail message="Cannot find osgitck export: ${osgitck.export}" unless="osgitck.export.available" />
- <tar basedir="${osgitck.export}" destfile="${osgitck.tar.file}" longfile="gnu" excludes="**/.svn" />
- </target>
-
- <!-- Untar the OSGi TCK-->
- <target name="untar-osgitck" depends="tar-osgitck" unless="osgitck.dir.available">
- <mkdir dir="${osgitck.dir}" />
- <untar src="${osgitck.tar.file}" dest="${osgitck.dir}" />
- <available property="osgitck.dir.available" file="${osgitck.dir}" />
- </target>
-
<!-- Setup the TCK to use the RI (equinox) -->
- <target name="setup.ri" description="Setup the TCK using the RI (Equinox)" depends="untar-osgitck">
+ <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" />
@@ -93,7 +77,7 @@
</target>
<!-- Setup the TCK to use the JBoss OSGi Framework -->
- <target name="setup.jboss" description="Setup the TCK using the JBoss OSGi Framework" depends="untar-osgitck">
+ <target name="setup.jboss" description="Setup the TCK using the JBoss OSGi Framework" depends="init">
<!-- Overlay the TCK setup -->
<copy todir="${osgitck.dir}" overwrite="true">
15 years, 10 months
JBoss-OSGI SVN: r100044 - in projects/jboss-osgi/projects/osgitck/trunk: hudson and 8 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-01-28 08:20:05 -0500 (Thu, 28 Jan 2010)
New Revision: 100044
Added:
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.blueprint.tests/
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jdbc.tests/
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jmx.tests/
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jndi.tests/
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.webapp.tests/
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml
Modified:
projects/jboss-osgi/projects/osgitck/trunk/build.xml
projects/jboss-osgi/projects/osgitck/trunk/hudson/build.xml
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/config.xml
projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml
projects/jboss-osgi/projects/osgitck/trunk/readme.txt
Log:
Add jmx, jndi, jdbc, blueprint, webapp
Modified: projects/jboss-osgi/projects/osgitck/trunk/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-01-28 13:18:58 UTC (rev 100043)
+++ projects/jboss-osgi/projects/osgitck/trunk/build.xml 2010-01-28 13:20:05 UTC (rev 100044)
@@ -93,7 +93,7 @@
</target>
<!-- Setup the TCK to use the JBoss OSGi Framework -->
- <target name="setup.jboss" description="Setup the TCK using the JBoss OSGi Framework" depends="untar-osgitck,update-framework">
+ <target name="setup.jboss" description="Setup the TCK using the JBoss OSGi Framework" depends="untar-osgitck">
<!-- Overlay the TCK setup -->
<copy todir="${osgitck.dir}" overwrite="true">
@@ -108,13 +108,6 @@
<ant dir="${osgitck.dir}/osgi.ct" target="publish" />
</target>
- <!-- Update the JBoss OSGi Framework -->
- <target name="update-framework" description="Update the JBoss OSGi Framework" depends="untar-osgitck">
- <!-- Copy the OSGi Framework -->
- <mkdir dir="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework" />
- <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 -->
<!-- ================================================================== -->
@@ -135,11 +128,47 @@
<!-- TCK Tests -->
<!-- ================================================================== -->
- <target name="run-tests" description="Run the TCK core tests" depends="init">
+ <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.jta" 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}" />
Modified: projects/jboss-osgi/projects/osgitck/trunk/hudson/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/build.xml 2010-01-28 13:18:58 UTC (rev 100043)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/build.xml 2010-01-28 13:20:05 UTC (rev 100044)
@@ -28,7 +28,7 @@
<include name="*/config.xml"/>
</fileset>
<filterset>
- <filter token="hudson.osgi.url" value="${hudson.osgi.url}"/>
+ <filter token="tcksetup.svn.url" value="${tcksetup.svn.url}"/>
<filtersfile file="${project.root.dir}/ant.properties"/>
</filterset>
</copy>
@@ -122,7 +122,7 @@
<arg line="--xml"/>
</exec>
<xmlproperty file="${hudson.target.dir}/svn-info.xml"/>
- <property name="hudson.osgi.url" value="${info.entry.url}"/>
+ <property name="tcksetup.svn.url" value="${info.entry.url}"/>
<!-- Configure Tomcat -->
<copy todir="${hudson.tomcat}" overwrite="true">
@@ -142,6 +142,7 @@
</fileset>
<filterset>
<filtersfile file="${project.root.dir}/ant.properties"/>
+ <filter token="hudson.username" value="${hudson.username}"/>
</filterset>
</copy>
Modified: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/config.xml 2010-01-28 13:18:58 UTC (rev 100043)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/config.xml 2010-01-28 13:20:05 UTC (rev 100044)
@@ -1,25 +1,26 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson>
+ <version>1.336</version>
<numExecutors>2</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.Workspace:@hudson.username@</permission>
- <permission>hudson.model.Run.Delete:@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.View.Delete:@hudson.username@</permission>
+ <permission>hudson.model.Item.Read:@hudson.username@</permission>
<permission>hudson.model.Computer.Configure:@hudson.username@</permission>
- <permission>hudson.model.Item.Delete:@hudson.username@</permission>
- <permission>hudson.model.Computer.Delete:@hudson.username@</permission>
+ <permission>hudson.model.Run.Delete:@hudson.username@</permission>
<permission>hudson.scm.SCM.Tag:@hudson.username@</permission>
- <permission>hudson.model.Item.Read:@hudson.username@</permission>
- <permission>hudson.model.Item.Create:@hudson.username@</permission>
- <permission>hudson.model.Item.Build:@hudson.username@</permission>
- <permission>hudson.model.Run.Update:@hudson.username@</permission>
- <permission>hudson.model.View.Create:@hudson.username@</permission>
- <permission>hudson.model.Item.Configure:@hudson.username@</permission>
- <permission>hudson.model.View.Configure:@hudson.username@</permission>
+ <permission>hudson.model.Item.Workspace:@hudson.username@</permission>
</authorizationStrategy>
<securityRealm class="hudson.security.HudsonPrivateSecurityRealm">
<disableSignup>false</disableSignup>
@@ -32,16 +33,19 @@
<jdks>
<jdk>
<name>jdk1.5</name>
- <javaHome>@java.home.jdk15@</javaHome>
+ <home>@java.home.jdk15@</home>
+ <properties/>
</jdk>
<jdk>
<name>jdk1.6</name>
- <javaHome>@java.home.jdk16@</javaHome>
+ <home>@java.home.jdk16@</home>
+ <properties/>
</jdk>
</jdks>
<clouds/>
<slaves/>
<quietPeriod>5</quietPeriod>
+ <scmCheckoutRetryCount>0</scmCheckoutRetryCount>
<views>
<hudson.model.AllView>
<owner class="hudson" reference="../../.."/>
Added: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml (rev 0)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml 2010-01-28 13:20:05 UTC (rev 100044)
@@ -0,0 +1,53 @@
+<?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>@tcksetup.svn.url@</remote>
+ <local>osgitck-setup</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-setup/target/osgitck-r4v42/*/generated/**/test-reports/TEST-*.xml</testResults>
+ <testDataPublishers/>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ </publishers>
+ <buildWrappers/>
+</project>
\ No newline at end of file
Modified: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2010-01-28 13:18:58 UTC (rev 100043)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2010-01-28 13:20:05 UTC (rev 100044)
@@ -7,7 +7,7 @@
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>@hudson.osgi.url@</remote>
+ <remote>@tcksetup.svn.url@</remote>
<local>osgitck-setup</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
<hudson.scm.SubversionSCM_-ModuleLocation>
@@ -16,21 +16,33 @@
</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>
- <assignedNode>master</assignedNode>
- <canRoam>false</canRoam>
+ <canRoam>true</canRoam>
<disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<jdk>jdk1.6</jdk>
- <triggers class="vector"/>
+ <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 & Install the Framework
+# Build and Install the Framework
cd $FRAMEWORKDIR
-mvn -U clean install
+mvn -U -fae clean install
# Setup the TCK
cd $TCKSETUPDIR
@@ -40,13 +52,14 @@
ant clean setup.ri
# Run the core tests
-ant run-tests
+ant run-core-tests
</command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>osgitck-setup/target/osgitck-r4v42/*/generated/**/test-reports/TEST-*.xml</testResults>
+ <testDataPublishers/>
</hudson.tasks.junit.JUnitResultArchiver>
</publishers>
<buildWrappers/>
Added: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml (rev 0)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jdbc.tests/config.xml 2010-01-28 13:20:05 UTC (rev 100044)
@@ -0,0 +1,53 @@
+<?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>@tcksetup.svn.url@</remote>
+ <local>osgitck-setup</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-setup/target/osgitck-r4v42/*/generated/**/test-reports/TEST-*.xml</testResults>
+ <testDataPublishers/>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ </publishers>
+ <buildWrappers/>
+</project>
\ No newline at end of file
Added: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml (rev 0)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jmx.tests/config.xml 2010-01-28 13:20:05 UTC (rev 100044)
@@ -0,0 +1,53 @@
+<?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>@tcksetup.svn.url@</remote>
+ <local>osgitck-setup</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-setup/target/osgitck-r4v42/*/generated/**/test-reports/TEST-*.xml</testResults>
+ <testDataPublishers/>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ </publishers>
+ <buildWrappers/>
+</project>
\ No newline at end of file
Added: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml (rev 0)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.jndi.tests/config.xml 2010-01-28 13:20:05 UTC (rev 100044)
@@ -0,0 +1,53 @@
+<?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>@tcksetup.svn.url@</remote>
+ <local>osgitck-setup</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 jndi tests
+ant run-jndi-tests
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers>
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>osgitck-setup/target/osgitck-r4v42/*/generated/**/test-reports/TEST-*.xml</testResults>
+ <testDataPublishers/>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ </publishers>
+ <buildWrappers/>
+</project>
\ No newline at end of file
Added: projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml (rev 0)
+++ projects/jboss-osgi/projects/osgitck/trunk/hudson/hudson-home/jobs/osgi.webapp.tests/config.xml 2010-01-28 13:20:05 UTC (rev 100044)
@@ -0,0 +1,53 @@
+<?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>@tcksetup.svn.url@</remote>
+ <local>osgitck-setup</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-setup/target/osgitck-r4v42/*/generated/**/test-reports/TEST-*.xml</testResults>
+ <testDataPublishers/>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ </publishers>
+ <buildWrappers/>
+</project>
\ No newline at end of file
Modified: projects/jboss-osgi/projects/osgitck/trunk/readme.txt
===================================================================
--- projects/jboss-osgi/projects/osgitck/trunk/readme.txt 2010-01-28 13:18:58 UTC (rev 100043)
+++ projects/jboss-osgi/projects/osgitck/trunk/readme.txt 2010-01-28 13:20:05 UTC (rev 100044)
@@ -1,4 +1,36 @@
+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-tests
+ ant test-reports
+
+Running the OSGi TCK against the JBoss OSGi Framework
+
+ ant clean setup.jboss
+ ant run-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
-----------------------
15 years, 11 months
JBoss-OSGI SVN: r100036 - projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-01-28 05:48:26 -0500 (Thu, 28 Jan 2010)
New Revision: 100036
Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java
Log:
Optionally install pax-web-extender-war.jar
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java 2010-01-28 10:35:40 UTC (rev 100035)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java 2010-01-28 10:48:26 UTC (rev 100036)
@@ -53,7 +53,10 @@
runtime = osgiTestHelper.getDefaultRuntime();
runtime.addCapability(new HttpServiceCapability());
- runtime.installBundle("bundles/pax-web-extender-war.jar").start();
+
+ if (runtime.getBundle("org.ops4j.pax.web.pax-web-extender-war", null) == null)
+ runtime.installBundle("bundles/pax-web-extender-war.jar").start();
+
runtime.installBundle("example-webapp.war").start();
}
15 years, 11 months
JBoss-OSGI SVN: r100001 - projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-01-27 11:30:56 -0500 (Wed, 27 Jan 2010)
New Revision: 100001
Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-api.bnd
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-client.bnd
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-impl.bnd
Log:
Use more sensible upper limit
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-api.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-api.bnd 2010-01-27 15:42:52 UTC (rev 100000)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-api.bnd 2010-01-27 16:30:56 UTC (rev 100001)
@@ -2,5 +2,5 @@
Bundle-SymbolicName: example-serviceloader-api
-Export-Package: org.jboss.test.osgi.example.serviceloader.service;version="1.0.0"
+Export-Package: org.jboss.test.osgi.example.serviceloader.service;version="1.0"
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-client.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-client.bnd 2010-01-27 15:42:52 UTC (rev 100000)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-client.bnd 2010-01-27 16:30:56 UTC (rev 100001)
@@ -2,6 +2,6 @@
Bundle-SymbolicName: example-serviceloader-client
Bundle-Activator: org.jboss.test.osgi.example.serviceloader.client.ServiceLoaderClientActivator
-Import-Package: org.osgi.framework, org.osgi.util.tracker, org.jboss.osgi.spi.util, org.jboss.test.osgi.example.serviceloader.service
+Import-Package: org.osgi.framework, org.osgi.util.tracker, org.jboss.osgi.spi.util, org.jboss.test.osgi.example.serviceloader.service;version="[1.0,2.0)"
Private-Package: org.jboss.test.osgi.example.serviceloader.client
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-impl.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-impl.bnd 2010-01-27 15:42:52 UTC (rev 100000)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-impl.bnd 2010-01-27 16:30:56 UTC (rev 100001)
@@ -2,7 +2,8 @@
Bundle-SymbolicName: example-serviceloader-impl
Bundle-Vendor: JBoss, a division of RedHat
-Import-Package: org.jboss.test.osgi.example.serviceloader.service;version="[1.0,2.0)"
+Bundle-Version: 1.0.0
+Import-Package: org.jboss.test.osgi.example.serviceloader.service;version="[1.0,1.1)"
Private-Package: org.jboss.test.osgi.example.serviceloader.service.internal
Include-Resource: META-INF/services/org.jboss.test.osgi.example.serviceloader.service.AccountService=../META-INF/services/org.jboss.test.osgi.example.serviceloader.service.AccountService
15 years, 11 months
JBoss-OSGI SVN: r99998 - projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-01-27 10:39:07 -0500 (Wed, 27 Jan 2010)
New Revision: 99998
Modified:
projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal/ServiceLoaderInterceptor.java
Log:
javadoc typo
Modified: projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal/ServiceLoaderInterceptor.java
===================================================================
--- projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal/ServiceLoaderInterceptor.java 2010-01-27 15:37:38 UTC (rev 99997)
+++ projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal/ServiceLoaderInterceptor.java 2010-01-27 15:39:07 UTC (rev 99998)
@@ -41,7 +41,7 @@
import org.slf4j.LoggerFactory;
/**
- * An interceptor that registeres service defained in META-INF/services.
+ * An interceptor that registeres service defined in META-INF/services.
*
* @author thomas.diesler(a)jboss.com
* @since 26-Jan-2010
15 years, 11 months
JBoss-OSGI SVN: r99997 - in projects/jboss-osgi: trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-01-27 10:37:38 -0500 (Wed, 27 Jan 2010)
New Revision: 99997
Modified:
projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal/ServiceLoaderInterceptor.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/client/ServiceLoaderClientActivator.java
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-impl.bnd
Log:
Improve serviceloader example
Modified: projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal/ServiceLoaderInterceptor.java
===================================================================
--- projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal/ServiceLoaderInterceptor.java 2010-01-27 13:47:50 UTC (rev 99996)
+++ projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal/ServiceLoaderInterceptor.java 2010-01-27 15:37:38 UTC (rev 99997)
@@ -34,11 +34,12 @@
import org.jboss.virtual.VirtualFile;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceFactory;
+import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import aQute.lib.osgi.Constants;
-
/**
* An interceptor that registeres service defained in META-INF/services.
*
@@ -102,12 +103,16 @@
continue;
}
- // Register the service instance
- Object serviceInstance = implClass.newInstance();
- BundleContext bundleContext = bundle.getBundleContext();
+ // Provide service properties
Hashtable<String, String> props = new Hashtable<String, String>();
props.put(Constants.VERSION_ATTRIBUTE, bundle.getVersion().toString());
- bundleContext.registerService(serviceName, serviceInstance, props);
+ String vendor = (String)bundle.getHeaders().get(Constants.BUNDLE_VENDOR);
+ props.put(Constants.SERVICE_VENDOR, (vendor != null ? vendor : "anonymous"));
+
+ // Register the service factory
+ MetaInfServiceFactory factory = new MetaInfServiceFactory(serviceClass);
+ BundleContext bundleContext = bundle.getBundleContext();
+ bundleContext.registerService(serviceName, factory, props);
}
implClassName = br.readLine();
@@ -123,4 +128,31 @@
log.error("Cannot process: " + entryPath, ex);
}
}
+
+ static class MetaInfServiceFactory implements ServiceFactory
+ {
+ private Class<?> serviceClass;
+
+ public MetaInfServiceFactory(Class<?> serviceClass)
+ {
+ this.serviceClass = serviceClass;
+ }
+
+ public Object getService(Bundle bundle, ServiceRegistration registration)
+ {
+ try
+ {
+ Object serviceInstance = serviceClass.newInstance();
+ return serviceInstance;
+ }
+ catch (Exception ex)
+ {
+ throw new IllegalStateException("Cannot instanciate service", ex);
+ }
+ }
+
+ public void ungetService(Bundle bundle, ServiceRegistration registration, Object service)
+ {
+ }
+ }
}
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java 2010-01-27 13:47:50 UTC (rev 99996)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java 2010-01-27 15:37:38 UTC (rev 99997)
@@ -87,8 +87,8 @@
OSGiBundle clientBundle = runtime.installBundle("example-serviceloader-client.jar");
clientBundle.start();
- OSGiServiceReference[] srefs = runtime.getServiceReferences(AccountService.class.getName(), "(version=1.0.0)");
- assertNotNull("AccountService available", srefs);
+ OSGiServiceReference[] srefs = runtime.getServiceReferences(AccountService.class.getName(), "(service.vendor=JBoss*)");
+ assertNotNull("AccountService not null", srefs);
assertEquals("One AccountService available", 1, srefs.length);
assertBundleState(Bundle.ACTIVE, implBundle.getState());
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/client/ServiceLoaderClientActivator.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/client/ServiceLoaderClientActivator.java 2010-01-27 13:47:50 UTC (rev 99996)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/client/ServiceLoaderClientActivator.java 2010-01-27 15:37:38 UTC (rev 99997)
@@ -69,7 +69,7 @@
ServiceReference[] srefs = null;
try
{
- String filter = "(version=1.0.0)";
+ String filter = "(service.vendor=JBoss*)";
srefs = context.getServiceReferences(AccountService.class.getName(), filter);
}
catch (InvalidSyntaxException ex)
@@ -85,7 +85,7 @@
Filter filter = null;
try
{
- String filterstr = "(&(" + Constants.OBJECTCLASS + "=" + AccountService.class.getName() + ")(version=1.0.0))";
+ String filterstr = "(&(" + Constants.OBJECTCLASS + "=" + AccountService.class.getName() + ")(service.vendor=JBoss*))";
filter = FrameworkUtil.createFilter(filterstr);
}
catch (InvalidSyntaxException ex)
@@ -101,6 +101,13 @@
service = (AccountService)super.addingService(reference);
return service;
}
+
+ @Override
+ public void removedService(ServiceReference reference, Object tracked)
+ {
+ super.removedService(reference, tracked);
+ service = null;
+ }
};
tracker.open();
}
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-impl.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-impl.bnd 2010-01-27 13:47:50 UTC (rev 99996)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/serviceloader/example-serviceloader-impl.bnd 2010-01-27 15:37:38 UTC (rev 99997)
@@ -1,7 +1,7 @@
# bnd build -classpath target/test-classes -output target/test-libs/example-serviceloader-impl.jar src/test/resources/example/serviceloader/example-serviceloader-impl.bnd
Bundle-SymbolicName: example-serviceloader-impl
-Bundle-Version: 1.0.0
+Bundle-Vendor: JBoss, a division of RedHat
Import-Package: org.jboss.test.osgi.example.serviceloader.service;version="[1.0,2.0)"
Private-Package: org.jboss.test.osgi.example.serviceloader.service.internal
Include-Resource: META-INF/services/org.jboss.test.osgi.example.serviceloader.service.AccountService=../META-INF/services/org.jboss.test.osgi.example.serviceloader.service.AccountService
15 years, 11 months