JBoss-OSGI SVN: r97634 - in projects/jboss-osgi: trunk and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-09 14:23:21 -0500 (Wed, 09 Dec 2009)
New Revision: 97634
Added:
projects/jboss-osgi/trunk/osgitck/
Removed:
projects/jboss-osgi/projects/osgitck/r4v42/
Log:
Move osgitck to jboss-osgi
Copied: projects/jboss-osgi/trunk/osgitck (from rev 97633, projects/jboss-osgi/projects/osgitck/r4v42)
16 years
JBoss-OSGI SVN: r97622 - projects/jboss-osgi/projects/osgitck/r4v42.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-09 11:38:52 -0500 (Wed, 09 Dec 2009)
New Revision: 97622
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
projects/jboss-osgi/projects/osgitck/r4v42/build.xml
Log:
Echo the settings
Modified: projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-12-09 16:08:17 UTC (rev 97621)
+++ projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-12-09 16:38:52 UTC (rev 97622)
@@ -4,7 +4,7 @@
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
# The JBoss OSGi framework version
-jboss.osgi.framework.version=1.0.0.Alpha2
+jboss.osgi.framework.version=1.0.0-SNAPSHOT
# The aQute Bnd version
aQute.bnd.version=0.0.366-SNAPSHOT
Modified: projects/jboss-osgi/projects/osgitck/r4v42/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-12-09 16:08:17 UTC (rev 97621)
+++ projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-12-09 16:38:52 UTC (rev 97622)
@@ -52,6 +52,10 @@
<property name="osgitck.dir" value="${target.dir}/osgitck-r4v42" />
<available property="osgitck.dir.available" file="${osgitck.dir}" />
<property name="jboss.framework.repo.dir" value="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework" />
+
+ <echo message="osgitck.export=${osgitck.export}"/>
+ <echo message="aQute.bnd.jar=${aQute.bnd.jar}"/>
+ <echo message="jboss.osgi.framework=${jboss.osgi.framework.jar}"/>
</target>
16 years
JBoss-OSGI SVN: r97620 - projects/jboss-osgi/projects/osgitck/r4v42.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-09 10:45:06 -0500 (Wed, 09 Dec 2009)
New Revision: 97620
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
projects/jboss-osgi/projects/osgitck/r4v42/build.xml
Log:
Use ${env.USER}
Modified: projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-12-09 15:22:19 UTC (rev 97619)
+++ projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-12-09 15:45:06 UTC (rev 97620)
@@ -27,9 +27,9 @@
# Hudson QA Environment
hudson.username=changeme
-hudson.password=changeme
-hudson.root=/home/hudson/workspace/osgitck
+# Hudson workspace root
+# hudson.root=/home/username/workspace/osgitck
hudson.host=localhost
hudson.admin.port=8150
Modified: projects/jboss-osgi/projects/osgitck/r4v42/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-12-09 15:22:19 UTC (rev 97619)
+++ projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-12-09 15:45:06 UTC (rev 97620)
@@ -29,9 +29,10 @@
<!-- Setup property defaults -->
<property environment="env"/>
- <property name="username" value="${env.USERNAME}" />
+ <property name="username" value="${env.USER}" />
<property name="osgitck.export" value="/home/${username}/svn/osgitck/r4v42" />
<property name="maven.local.repository" value="/home/${username}/.m2/repository" />
+ <property name="hudson.root" value="/home/${username}/workspace/osgitck" />
<!-- Check if the osgitck export is available -->
<available property="osgitck.export.available" file="${osgitck.export}" />
16 years
JBoss-OSGI SVN: r97619 - in projects/jboss-osgi/projects/osgitck/r4v42: hudson/hudson-home and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-09 10:22:19 -0500 (Wed, 09 Dec 2009)
New Revision: 97619
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/config.xml
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
Log:
Use clean publish osgi.core.tests
Modified: projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-12-09 15:21:53 UTC (rev 97618)
+++ projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-12-09 15:22:19 UTC (rev 97619)
@@ -3,18 +3,18 @@
#
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
-# The location of the OSGi TCK
-# osgitck.export=/home/hudson/svn/osgitck/r4v42
+# The JBoss OSGi framework version
+jboss.osgi.framework.version=1.0.0.Alpha2
-# The location of the local maven repository
-# maven.local.repository=/home/hudson/.m2/repository
-
# The aQute Bnd version
aQute.bnd.version=0.0.366-SNAPSHOT
-# The JBoss OSGi framework version
-jboss.osgi.framework.version=1.0.0.Alpha2
+# The location of the OSGi TCK
+# osgitck.export=/home/username/svn/osgitck/r4v42
+# The location of the local maven repository
+# maven.local.repository=/home/username/.m2/repository
+
# Hudson Setup ----------------------------------------------------------------
# JDK settings
Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/config.xml 2009-12-09 15:21:53 UTC (rev 97618)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/config.xml 2009-12-09 15:22:19 UTC (rev 97619)
@@ -1,7 +1,29 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson>
<numExecutors>2</numExecutors>
+ <mode>NORMAL</mode>
<useSecurity>true</useSecurity>
+ <authorizationStrategy class="hudson.security.GlobalMatrixAuthorizationStrategy">
+ <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.Hudson.Administer:@hudson.username@</permission>
+ <permission>hudson.model.View.Delete:@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.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>
+ </authorizationStrategy>
+ <securityRealm class="hudson.security.HudsonPrivateSecurityRealm">
+ <disableSignup>false</disableSignup>
+ </securityRealm>
<systemMessage>
<![CDATA[
<h2>OSGi QA Environment</h2>
Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-12-09 15:21:53 UTC (rev 97618)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-12-09 15:22:19 UTC (rev 97619)
@@ -33,7 +33,7 @@
# Run the core tests
cd $TCKHOMEDIR/osgi.ct
-ant osgi.core.tests
+ant clean publish osgi.core.tests
</command>
</hudson.tasks.Shell>
</builders>
16 years
JBoss-OSGI SVN: r97615 - projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service.
by jboss-osgi-commits＠lists.jboss.org
Author: alesj
Date: 2009-12-09 10:00:28 -0500 (Wed, 09 Dec 2009)
New Revision: 97615
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceUnitTestCase.java
Log:
Use const #2.
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceUnitTestCase.java 2009-12-09 14:57:26 UTC (rev 97614)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceUnitTestCase.java 2009-12-09 15:00:28 UTC (rev 97615)
@@ -157,7 +157,7 @@
bundleContext.addFrameworkListener(this);
- ServiceRegistration registration = bundleContext.registerService(BundleContext.class.getName(), new BrokenServiceFactory(bundleContext, true), null);
+ ServiceRegistration registration = bundleContext.registerService(OBJCLASS, new BrokenServiceFactory(bundleContext, true), null);
ServiceReference reference = registration.getReference();
Object actual = bundleContext.getService(reference);
assertNull("" + actual, actual);
@@ -181,7 +181,7 @@
bundleContext.addFrameworkListener(this);
- ServiceRegistration registration = bundleContext.registerService(BundleContext.class.getName(), new BrokenServiceFactory(bundleContext, false), null);
+ ServiceRegistration registration = bundleContext.registerService(OBJCLASS, new BrokenServiceFactory(bundleContext, false), null);
ServiceReference reference = registration.getReference();
Object actual = bundleContext.getService(reference);
assertEquals(bundleContext, actual);
@@ -206,7 +206,7 @@
BundleContext bundleContext = bundle.getBundleContext();
assertNotNull(bundleContext);
- ServiceRegistration registration = bundleContext.registerService(BundleContext.class.getName(), bundleContext, null);
+ ServiceRegistration registration = bundleContext.registerService(OBJCLASS, bundleContext, null);
ServiceReference reference = registration.getReference();
Object actual = bundleContext.getService(reference);
assertEquals(bundleContext, actual);
16 years
JBoss-OSGI SVN: r97614 - projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service.
by jboss-osgi-commits＠lists.jboss.org
Author: alesj
Date: 2009-12-09 09:57:26 -0500 (Wed, 09 Dec 2009)
New Revision: 97614
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceUnitTestCase.java
Log:
Use const.
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceUnitTestCase.java 2009-12-09 14:41:20 UTC (rev 97613)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceUnitTestCase.java 2009-12-09 14:57:26 UTC (rev 97614)
@@ -54,8 +54,6 @@
public void testGetUnServiceErrors() throws Exception
{
- String OBJCLASS = BundleContext.class.getName();
-
Bundle bundle = addBundle("/bundles/simple/", "simple-bundle1");
try
{
@@ -93,8 +91,6 @@
public void testGetService() throws Exception
{
- String OBJCLASS = BundleContext.class.getName();
-
Bundle bundle = addBundle("/bundles/simple/", "simple-bundle1");
try
{
@@ -120,8 +116,6 @@
public void testGetServiceAfterStop() throws Exception
{
- String OBJCLASS = BundleContext.class.getName();
-
Bundle bundle = addBundle("/bundles/simple/", "simple-bundle1");
try
{
16 years
JBoss-OSGI SVN: r97611 - projects/jboss-osgi/projects/osgitck/r4v42.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-09 09:12:35 -0500 (Wed, 09 Dec 2009)
New Revision: 97611
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
projects/jboss-osgi/projects/osgitck/r4v42/build.xml
Log:
Setup property defaults
Modified: projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-12-09 13:58:04 UTC (rev 97610)
+++ projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-12-09 14:12:35 UTC (rev 97611)
@@ -4,10 +4,10 @@
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
# The location of the OSGi TCK
-osgitck.export=/home/hudson/svn/osgitck/r4v42
+# osgitck.export=/home/hudson/svn/osgitck/r4v42
# The location of the local maven repository
-maven.local.repository=/home/hudson/.m2/repository
+# maven.local.repository=/home/hudson/.m2/repository
# The aQute Bnd version
aQute.bnd.version=0.0.366-SNAPSHOT
Modified: projects/jboss-osgi/projects/osgitck/r4v42/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-12-09 13:58:04 UTC (rev 97610)
+++ projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-12-09 14:12:35 UTC (rev 97611)
@@ -27,6 +27,12 @@
<property file="${basedir}/ant.properties" />
+ <!-- Setup property defaults -->
+ <property environment="env"/>
+ <property name="username" value="${env.USERNAME}" />
+ <property name="osgitck.export" value="/home/${username}/svn/osgitck/r4v42" />
+ <property name="maven.local.repository" value="/home/${username}/.m2/repository" />
+
<!-- Check if the osgitck export is available -->
<available property="osgitck.export.available" file="${osgitck.export}" />
<fail message="Cannot find: ${osgitck.export}" unless="osgitck.export.available" />
16 years
JBoss-OSGI SVN: r97610 - in projects/jboss-osgi/projects/osgitck/r4v42: hudson and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-09 08:58:04 -0500 (Wed, 09 Dec 2009)
New Revision: 97610
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
projects/jboss-osgi/projects/osgitck/r4v42/hudson/build.xml
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/jboss.osgi.framework/config.xml
Log:
Update hudson setup
Modified: projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-12-09 13:37:45 UTC (rev 97609)
+++ projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-12-09 13:58:04 UTC (rev 97610)
@@ -4,22 +4,22 @@
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
# The location of the OSGi TCK
-osgitck.export=/home/hudson/svn/osgitck/r4v42-core-cmpn-final
+osgitck.export=/home/hudson/svn/osgitck/r4v42
-# The location od the local maven repository
+# The location of the local maven repository
maven.local.repository=/home/hudson/.m2/repository
# The aQute Bnd version
aQute.bnd.version=0.0.366-SNAPSHOT
# The JBoss OSGi framework version
-jboss.osgi.framework.version=1.0.0-SNAPSHOT
+jboss.osgi.framework.version=1.0.0.Alpha2
# Hudson Setup ----------------------------------------------------------------
# JDK settings
-java.home.jdk15=/usr/java/jdk1.5.0_19
-java.home.jdk16=/usr/java/jdk1.6.0_14
+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
@@ -29,12 +29,11 @@
hudson.username=changeme
hudson.password=changeme
-hudson.root=/home/hudson/workspace/hudson/osgitck
+hudson.root=/home/hudson/workspace/osgitck
hudson.host=localhost
hudson.admin.port=8150
hudson.http.port=8180
-# Hudson (1.290)
apache-tomcat=5.5.27
-sun-hudson=2402/128862
+sun-hudson=1.336
Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/build.xml 2009-12-09 13:37:45 UTC (rev 97609)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/build.xml 2009-12-09 13:58:04 UTC (rev 97610)
@@ -82,7 +82,7 @@
<get src="http://www.apache.org/dist/tomcat/tomcat-5/v${apache-tomcat}/bin/apache-t..." dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/>
</target>
<target name="get-hudson" depends="init-thirdparty" unless="sun.hudson.available">
- <get src="https://hudson.dev.java.net/files/documents/${sun-hudson}/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/>
+ <get src="http://hudson-ci.org/download/war/${sun-hudson}/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/>
</target>
<!--
Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/jboss.osgi.framework/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/jboss.osgi.framework/config.xml 2009-12-09 13:37:45 UTC (rev 97609)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/jboss.osgi.framework/config.xml 2009-12-09 13:58:04 UTC (rev 97610)
@@ -11,7 +11,7 @@
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...</remote>
+ <remote>https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...</remote>
<local>jboss-osgi-framework</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
16 years
JBoss-OSGI SVN: r97607 - in projects/jboss-osgi/projects: parent/tags and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-09 08:24:21 -0500 (Wed, 09 Dec 2009)
New Revision: 97607
Added:
projects/jboss-osgi/projects/bundles/apache-xerces/tags/jboss-osgi-apache-xerces-2.9.1.SP3/
Removed:
projects/jboss-osgi/projects/parent/tags/jboss-osgi-apache-xerces-2.9.1.SP3/
Log:
Move jboss-osgi-apache-xerces-2.9.1.SP3 to bundles/apache-xerces/tags
Copied: projects/jboss-osgi/projects/bundles/apache-xerces/tags/jboss-osgi-apache-xerces-2.9.1.SP3 (from rev 97606, projects/jboss-osgi/projects/parent/tags/jboss-osgi-apache-xerces-2.9.1.SP3)
16 years