JBoss-OSGI SVN: r93505 - in projects/jboss-osgi/trunk/hudson: hudson-home and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-14 15:52:38 -0400 (Mon, 14 Sep 2009)
New Revision: 93505
Modified:
projects/jboss-osgi/trunk/hudson/ant.properties.example
projects/jboss-osgi/trunk/hudson/hudson-home/hudson.tasks.Maven.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-embedded/config.xml
Log:
Use explicit maven version
Modified: projects/jboss-osgi/trunk/hudson/ant.properties.example
===================================================================
--- projects/jboss-osgi/trunk/hudson/ant.properties.example 2009-09-14 19:51:13 UTC (rev 93504)
+++ projects/jboss-osgi/trunk/hudson/ant.properties.example 2009-09-14 19:52:38 UTC (rev 93505)
@@ -15,6 +15,7 @@
hudson.username=changeme
hudson.password=changeme
+hudson.maven.name=apache-maven-2.2.1
hudson.maven.path=/usr/java/apache-maven-2.2.1
hudson.root=/home/hudson/workspace/hudson/jboss-osgi
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/hudson.tasks.Maven.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/hudson.tasks.Maven.xml 2009-09-14 19:51:13 UTC (rev 93504)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/hudson.tasks.Maven.xml 2009-09-14 19:52:38 UTC (rev 93505)
@@ -2,7 +2,7 @@
<hudson.tasks.Maven_-DescriptorImpl>
<installations>
<hudson.tasks.Maven_-MavenInstallation>
- <name>apache-maven</name>
+ <name>@hudson.maven.name@</name>
<mavenHome>@hudson.maven.path@</mavenHome>
</hudson.tasks.Maven_-MavenInstallation>
</installations>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml 2009-09-14 19:51:13 UTC (rev 93504)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml 2009-09-14 19:52:38 UTC (rev 93505)
@@ -11,7 +11,7 @@
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
- <name>FRAMEWORK</name>
+ <name>framework</name>
<optional>false</optional>
<defaultValue>jbossmc</defaultValue>
</hudson.model.StringParameterDefinition>
@@ -38,7 +38,7 @@
<builders>
<hudson.tasks.Maven>
<targets>-U -fae clean install</targets>
- <mavenName>apache-maven</mavenName>
+ <mavenName>@hudson.maven.name@</mavenName>
</hudson.tasks.Maven>
</builders>
<publishers class="vector">
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-embedded/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-embedded/config.xml 2009-09-14 19:51:13 UTC (rev 93504)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-embedded/config.xml 2009-09-14 19:52:38 UTC (rev 93505)
@@ -52,7 +52,7 @@
<builders>
<hudson.tasks.Maven>
<targets>-U -fae clean install</targets>
- <mavenName>apache-maven</mavenName>
+ <mavenName>@hudson.maven.name@</mavenName>
</hudson.tasks.Maven>
</builders>
<publishers class="vector">
16 years, 10 months
JBoss-OSGI SVN: r93500 - projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-14 15:33:57 -0400 (Mon, 14 Sep 2009)
New Revision: 93500
Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
Log:
Give HttpService 5000ms for startup
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-09-14 19:03:18 UTC (rev 93499)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-09-14 19:33:57 UTC (rev 93500)
@@ -56,8 +56,8 @@
runtime = new OSGiTestHelper().getDefaultRuntime();
runtime.addCapability(new HttpCapability());
- // Allow 2000ms for the HttpService to become available
- long timeout = 10;
+ // Allow 5000ms for the HttpService to become available
+ long timeout = 25;
OSGiServiceReference sref = runtime.getServiceReference(HttpService.class.getName());
while (sref == null && (timeout--) > 0)
{
16 years, 10 months
JBoss-OSGI SVN: r93498 - in projects/jboss-osgi/trunk/hudson/hudson-home/jobs: jbossosgi-jdk15 and 5 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-14 15:00:15 -0400 (Mon, 14 Sep 2009)
New Revision: 93498
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-embedded/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml
Log:
Remove hudson email on failure
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml 2009-09-14 18:53:43 UTC (rev 93497)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml 2009-09-14 19:00:15 UTC (rev 93498)
@@ -13,7 +13,7 @@
<hudson.model.StringParameterDefinition>
<name>FRAMEWORK</name>
<optional>false</optional>
- <defaultValue>felix</defaultValue>
+ <defaultValue>jbossmc</defaultValue>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
@@ -37,7 +37,7 @@
<jdk>jdk1.6</jdk>
<builders>
<hudson.tasks.Maven>
- <targets>-U -fae -e clean install</targets>
+ <targets>-U -fae clean install</targets>
<mavenName>apache-maven</mavenName>
</hudson.tasks.Maven>
</builders>
@@ -45,11 +45,6 @@
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>true</sendToIndividuals>
- </hudson.tasks.Mailer>
</publishers>
<buildWrappers/>
</project>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml 2009-09-14 18:53:43 UTC (rev 93497)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml 2009-09-14 19:00:15 UTC (rev 93498)
@@ -62,11 +62,6 @@
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>true</sendToIndividuals>
- </hudson.tasks.Mailer>
</publishers>
<buildWrappers/>
</project>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml 2009-09-14 18:53:43 UTC (rev 93497)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml 2009-09-14 19:00:15 UTC (rev 93498)
@@ -62,11 +62,6 @@
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>true</sendToIndividuals>
- </hudson.tasks.Mailer>
</publishers>
<buildWrappers/>
</project>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-embedded/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-embedded/config.xml 2009-09-14 18:53:43 UTC (rev 93497)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-embedded/config.xml 2009-09-14 19:00:15 UTC (rev 93498)
@@ -59,11 +59,6 @@
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>true</sendToIndividuals>
- </hudson.tasks.Mailer>
</publishers>
<buildWrappers/>
</matrix-project>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml 2009-09-14 18:53:43 UTC (rev 93497)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml 2009-09-14 19:00:15 UTC (rev 93498)
@@ -80,11 +80,6 @@
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>true</sendToIndividuals>
- </hudson.tasks.Mailer>
</publishers>
<buildWrappers/>
</matrix-project>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml 2009-09-14 18:53:43 UTC (rev 93497)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml 2009-09-14 19:00:15 UTC (rev 93498)
@@ -80,11 +80,6 @@
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>true</sendToIndividuals>
- </hudson.tasks.Mailer>
</publishers>
<buildWrappers/>
</matrix-project>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml 2009-09-14 18:53:43 UTC (rev 93497)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml 2009-09-14 19:00:15 UTC (rev 93498)
@@ -77,11 +77,6 @@
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>true</sendToIndividuals>
- </hudson.tasks.Mailer>
</publishers>
<buildWrappers/>
</matrix-project>
16 years, 10 months
JBoss-OSGI SVN: r93495 - in projects/jboss-osgi/trunk/hudson: hudson-home/jobs and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-14 14:40:10 -0400 (Mon, 14 Sep 2009)
New Revision: 93495
Added:
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml
Removed:
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossas/
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-runtime/
Modified:
projects/jboss-osgi/trunk/hudson/build.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml
Log:
Update hudson matrix
Modified: projects/jboss-osgi/trunk/hudson/build.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/build.xml 2009-09-14 18:32:01 UTC (rev 93494)
+++ projects/jboss-osgi/trunk/hudson/build.xml 2009-09-14 18:40:10 UTC (rev 93495)
@@ -28,8 +28,9 @@
<copyjob index="3" prefix="${hudson.job.prefix}" job="jbossosgi-jdk15"/>
<copyjob index="4" prefix="${hudson.job.prefix}" job="jbossosgi-jdk16"/>
<copyjob index="5" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-embedded"/>
- <copyjob index="6" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-jbossas"/>
- <copyjob index="7" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-runtime"/>
+ <copyjob index="6" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-equinox"/>
+ <copyjob index="7" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-felix"/>
+ <copyjob index="8" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-jbossmc"/>
</sequential>
</macrodef>
Added: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml (rev 0)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml 2009-09-14 18:40:10 UTC (rev 93495)
@@ -0,0 +1,90 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<matrix-project>
+ <actions class="java.util.concurrent.CopyOnWriteArrayList"/>
+ <description>Build and test the JBossOSGi @version.id@ Matrix with Equinox</description>
+ <logRotator>
+ <daysToKeep>60</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties>
+ <hudson.security.AuthorizationMatrixProperty/>
+ </properties>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>@hudson.osgi.url@</remote>
+ <local>jboss-osgi</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>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <triggers class="vector">
+ <hudson.triggers.TimerTrigger>
+ <spec>0 19 * * *</spec>
+ </hudson.triggers.TimerTrigger>
+ </triggers>
+ <axes>
+ <axis>
+ <name>framework</name>
+ <values>
+ <string>equinox</string>
+ </values>
+ </axis>
+ <axis>
+ <name>container</name>
+ <values>
+ <string>runtime</string>
+ <string>jboss501</string>
+ <string>jboss510</string>
+ <string>jboss520</string>
+ <string>jboss600</string>
+ </values>
+ </axis>
+ <axis>
+ <name>jdk</name>
+ <values>
+ <string>jdk1.5</string>
+ <string>jdk1.6</string>
+ </values>
+ </axis>
+ </axes>
+ <builders>
+ <hudson.tasks.Shell>
+ <command>
+OSGIDIR=$WORKSPACE/jboss-osgi
+HUDSONDIR=$OSGIDIR/hudson
+
+export FRAMEWORK=$framework
+export CONTAINER=$container
+
+export JBOSS_BINDADDR=(a)jboss.bind.address@
+
+# copy the maven profile
+cp @hudson.maven.profile@ $OSGIDIR/profiles.xml
+
+#
+# call command.sh
+#
+/bin/sh $HUDSONDIR/hudson-home/command.sh
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers/>
+</matrix-project>
Property changes on: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix (from rev 93456, projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossas)
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossas/config.xml 2009-09-14 08:32:54 UTC (rev 93456)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml 2009-09-14 18:40:10 UTC (rev 93495)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<matrix-project>
<actions class="java.util.concurrent.CopyOnWriteArrayList"/>
- <description>Build and test the JBossOSGi @version.id@ Matrix</description>
+ <description>Build and test the JBossOSGi @version.id@ Matrix with Apache Felix</description>
<logRotator>
<daysToKeep>60</daysToKeep>
<numToKeep>-1</numToKeep>
@@ -27,7 +27,7 @@
<disabled>false</disabled>
<triggers class="vector">
<hudson.triggers.TimerTrigger>
- <spec>0 22 * * *</spec>
+ <spec>0 20 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
<axes>
@@ -35,13 +35,12 @@
<name>framework</name>
<values>
<string>felix</string>
- <string>equinox</string>
- <string>jbossmc</string>
</values>
</axis>
<axis>
<name>container</name>
<values>
+ <string>runtime</string>
<string>jboss501</string>
<string>jboss510</string>
<string>jboss520</string>
Added: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml (rev 0)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml 2009-09-14 18:40:10 UTC (rev 93495)
@@ -0,0 +1,87 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<matrix-project>
+ <actions class="java.util.concurrent.CopyOnWriteArrayList"/>
+ <description>Build and test the JBossOSGi @version.id@ Matrix with JBossMC Framework</description>
+ <logRotator>
+ <daysToKeep>60</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties>
+ <hudson.security.AuthorizationMatrixProperty/>
+ </properties>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>@hudson.osgi.url@</remote>
+ <local>jboss-osgi</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>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <triggers class="vector">
+ <hudson.triggers.TimerTrigger>
+ <spec>0 21 * * *</spec>
+ </hudson.triggers.TimerTrigger>
+ </triggers>
+ <axes>
+ <axis>
+ <name>framework</name>
+ <values>
+ <string>jbossmc</string>
+ </values>
+ </axis>
+ <axis>
+ <name>container</name>
+ <values>
+ <string>runtime</string>
+ <string>jboss520</string>
+ </values>
+ </axis>
+ <axis>
+ <name>jdk</name>
+ <values>
+ <string>jdk1.5</string>
+ <string>jdk1.6</string>
+ </values>
+ </axis>
+ </axes>
+ <builders>
+ <hudson.tasks.Shell>
+ <command>
+OSGIDIR=$WORKSPACE/jboss-osgi
+HUDSONDIR=$OSGIDIR/hudson
+
+export FRAMEWORK=$framework
+export CONTAINER=$container
+
+export JBOSS_BINDADDR=(a)jboss.bind.address@
+
+# copy the maven profile
+cp @hudson.maven.profile@ $OSGIDIR/profiles.xml
+
+#
+# call command.sh
+#
+/bin/sh $HUDSONDIR/hudson-home/command.sh
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers/>
+</matrix-project>
Property changes on: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 10 months
JBoss-OSGI SVN: r93492 - projects/jboss-osgi/projects/bundles/xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-14 14:11:37 -0400 (Mon, 14 Sep 2009)
New Revision: 93492
Modified:
projects/jboss-osgi/projects/bundles/xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java
Log:
minor
Modified: projects/jboss-osgi/projects/bundles/xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java 2009-09-14 17:54:19 UTC (rev 93491)
+++ projects/jboss-osgi/projects/bundles/xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java 2009-09-14 18:11:37 UTC (rev 93492)
@@ -50,7 +50,6 @@
{
log = new LogServiceTracker(context);
-
ServiceTracker saxTracker = new ServiceTracker(context, SAXParserFactory.class.getName(), null)
{
@Override
16 years, 10 months
JBoss-OSGI SVN: r93484 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-14 12:14:10 -0400 (Mon, 14 Sep 2009)
New Revision: 93484
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
Log:
Install xercesImpl in runtime for jbossmc
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-14 14:57:49 UTC (rev 93483)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-14 16:14:10 UTC (rev 93484)
@@ -295,6 +295,7 @@
<include name="jboss-osgi-runtime-microcontainer.jar" />
<include name="jboss-reflect.jar" />
<include name="jbossxb.jar" />
+ <include name="xercesImpl.jar" />
</fileset>
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/lib" override="true">
<include name="org.osgi.core.jar" />
16 years, 10 months
JBoss-OSGI SVN: r93483 - in projects/jboss-osgi/trunk/distribution/installer/src/main/resources: jbossas and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-14 10:57:49 -0400 (Mon, 14 Sep 2009)
New Revision: 93483
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
Log:
Fix felix/equinox AS integration config
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-14 14:54:14 UTC (rev 93482)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-14 14:57:49 UTC (rev 93483)
@@ -333,10 +333,7 @@
<include name="jboss-osgi-apache-xerces.jar" />
<include name="jboss-osgi-blueprint.jar" />
<include name="jboss-osgi-common.jar" />
- <include name="jboss-osgi-common-core.jar" />
<include name="jboss-osgi-jaxb.jar" />
- <include name="jboss-osgi-jmx.jar" />
- <include name="jboss-osgi-jndi.jar" />
<include name="jboss-osgi-webconsole.jar" />
<include name="jboss-osgi-xml-binding.jar" />
<include name="org.apache.felix.http.jetty.jar" />
@@ -399,6 +396,9 @@
</fileset>
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
<include name="org.osgi.compendium.jar" />
+ <include name="jboss-osgi-common-core.jar" />
+ <include name="jboss-osgi-jmx.jar" />
+ <include name="jboss-osgi-jndi.jar" />
</fileset>
</pack>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2009-09-14 14:54:14 UTC (rev 93482)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2009-09-14 14:57:49 UTC (rev 93483)
@@ -15,7 +15,7 @@
-->
<!-- The OSGiFramework -->
- <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration">
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.EquinoxIntegration">
<property name="properties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
@@ -66,8 +66,10 @@
<!-- The Framework Management -->
<bean name="jboss.osgi:service=ManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <constructor>
+ <parameter><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></parameter>
+ <parameter><inject bean="JMXKernel" property="mbeanServer"/></parameter>
+ </constructor>
</bean>
<!--
@@ -80,7 +82,7 @@
<!-- Microcontainer Service -->
<bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.microcontainer.integration.MicrocontainerServiceBean">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
+ <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
</bean>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-09-14 14:54:14 UTC (rev 93482)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-09-14 14:57:49 UTC (rev 93483)
@@ -15,7 +15,7 @@
-->
<!-- The OSGiFramework -->
- <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration">
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.FelixIntegration">
<property name="properties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/osgi-store</value></entry>
@@ -89,8 +89,10 @@
<!-- The Framework Management -->
<bean name="jboss.osgi:service=ManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <constructor>
+ <parameter><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></parameter>
+ <parameter><inject bean="JMXKernel" property="mbeanServer"/></parameter>
+ </constructor>
</bean>
<!--
@@ -103,7 +105,7 @@
<!-- Microcontainer Service -->
<bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.microcontainer.integration.MicrocontainerServiceBean">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
+ <property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
</bean>
16 years, 10 months
JBoss-OSGI SVN: r93482 - projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-14 10:54:14 -0400 (Mon, 14 Sep 2009)
New Revision: 93482
Modified:
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
Log:
Use setBundleContext()
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-09-14 14:52:02 UTC (rev 93481)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-09-14 14:54:14 UTC (rev 93482)
@@ -50,13 +50,13 @@
{
private static Logger log = Logger.getLogger(MicrocontainerServiceBean.class);
- private BundleContext context;
+ private BundleContext bundleContext;
private MBeanServer mbeanServer;
private Kernel kernel;
- public void setSystemContext(BundleContext context)
+ public void setBundleContext(BundleContext bundleContext)
{
- this.context = context;
+ this.bundleContext = bundleContext;
}
public void setMbeanServer(MBeanServer mbeanServer)
@@ -92,34 +92,34 @@
KernelController controller = kernel.getController();
// Register the MBeanServer
- context.registerService(MBeanServer.class.getName(), mbeanServer, null);
+ bundleContext.registerService(MBeanServer.class.getName(), mbeanServer, null);
log.debug("MBeanServer registered");
// Register the InitialContext
InitialContext initialContext = getInitialContext();
- context.registerService(InitialContext.class.getName(), initialContext, null);
+ bundleContext.registerService(InitialContext.class.getName(), initialContext, null);
log.debug("InitialContext registered");
// Register the XMLBindingService
XMLBindingService xbService = new XMLBindingService(){};
- context.registerService(XMLBindingService.class.getName(), xbService, null);
+ bundleContext.registerService(XMLBindingService.class.getName(), xbService, null);
log.debug("XMLBindingService registered");
// Preregister some MC beans
- installBean(controller, BEAN_SYSTEM_BUNDLE_CONTEXT, context);
+ installBean(controller, BEAN_SYSTEM_BUNDLE_CONTEXT, bundleContext);
installBean(controller, BEAN_KERNEL, kernel);
installBean(controller, BEAN_KERNEL_CONTROLLER, controller);
installBean(controller, BEAN_MBEAN_SERVER, mbeanServer);
// Register the MicrocontainerService
log.debug("Register MicrocontainerService");
- context.registerService(MicrocontainerService.class.getName(), this, null);
+ bundleContext.registerService(MicrocontainerService.class.getName(), this, null);
log.debug("MicrocontainerService registered");
// Register the DeployerService
Properties props = new Properties();
props.setProperty("provider", "microcontainer");
- context.registerService(DeployerService.class.getName(), this, props);
+ bundleContext.registerService(DeployerService.class.getName(), this, props);
log.debug("DeployerService registered");
// Register the MicrocontainerServiceMBean
16 years, 10 months
JBoss-OSGI SVN: r93481 - projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-14 10:52:02 -0400 (Mon, 14 Sep 2009)
New Revision: 93481
Added:
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java
Removed:
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerLocator.java
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java
Log:
Fix MBeanServer service registration
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java 2009-09-14 14:42:45 UTC (rev 93480)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java 2009-09-14 14:52:02 UTC (rev 93481)
@@ -69,12 +69,9 @@
{
log = new LogServiceTracker(context);
- MBeanServerLocator locator = new MBeanServerLocator(context);
- mbeanServer = locator.getMBeanServer();
-
// Register the MBeanServer
- context.registerService(MBeanServer.class.getName(), mbeanServer, null);
- log.log(LogService.LOG_DEBUG, "MBeanServer registered");
+ MBeanServerService service = new MBeanServerService(context);
+ mbeanServer = service.registerMBeanServer();
// Get the system BundleContext
BundleContext sysContext = context.getBundle(0).getBundleContext();
@@ -140,7 +137,7 @@
public Object addingService(ServiceReference reference)
{
InitialContext iniCtx = (InitialContext)super.addingService(reference);
-
+
JMXServiceURL serviceURL = JMXConnectorService.getServiceURL(jmxHost, Integer.parseInt(jmxRmiPort));
try
{
@@ -154,7 +151,7 @@
// Assume that the JMXConnector is already running if we cannot start it
log.log(LogService.LOG_DEBUG, "Assume JMXConnectorServer already running on: " + serviceURL);
}
-
+
try
{
// Check if the RMIAdaptor is alrady bound
Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerLocator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerLocator.java 2009-09-14 14:42:45 UTC (rev 93480)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerLocator.java 2009-09-14 14:52:02 UTC (rev 93481)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.jmx.internal;
-
-//$Id$
-
-import java.util.ArrayList;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-
-import org.jboss.osgi.common.log.LogServiceTracker;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogService;
-
-/**
- * A service that registers an MBeanServer
- *
- * @author thomas.diesler(a)jboss.com
- * @since 24-Apr-2009
- */
-public class MBeanServerLocator
-{
- private LogService log;
- private MBeanServer mbeanServer;
-
- @SuppressWarnings("unchecked")
- public MBeanServerLocator(BundleContext context)
- {
- log = new LogServiceTracker(context);
-
- // Check if there is an MBeanServer service already
- ServiceReference sref = context.getServiceReference(MBeanServer.class.getName());
- if (sref != null)
- {
- mbeanServer = (MBeanServer)context.getService(sref);
- log.log(LogService.LOG_DEBUG, "Found MBeanServer fom service: " + mbeanServer.getDefaultDomain());
- }
- else
- {
- ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null);
- if (serverArr.size() > 1)
- throw new IllegalStateException("Multiple MBeanServer instances not supported");
-
- if (serverArr.size() == 1)
- {
- mbeanServer = serverArr.get(0);
- log.log(LogService.LOG_DEBUG, "Found MBeanServer: " + mbeanServer.getDefaultDomain());
- }
-
- if (mbeanServer == null)
- {
- log.log(LogService.LOG_DEBUG, "No MBeanServer, create one ...");
- mbeanServer = MBeanServerFactory.createMBeanServer();
- }
- }
- }
-
- public MBeanServer getMBeanServer()
- {
- return mbeanServer;
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java (from rev 93480, projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerLocator.java)
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java 2009-09-14 14:52:02 UTC (rev 93481)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.jmx.internal;
+
+//$Id$
+
+import java.util.ArrayList;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+
+import org.jboss.osgi.common.log.LogServiceTracker;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
+
+/**
+ * A service that registers an MBeanServer
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 24-Apr-2009
+ */
+public class MBeanServerService
+{
+ private BundleContext context;
+ private LogService log;
+
+ public MBeanServerService(BundleContext context)
+ {
+ log = new LogServiceTracker(context);
+ this.context = context;
+ }
+
+ @SuppressWarnings("unchecked")
+ public MBeanServer registerMBeanServer()
+ {
+ MBeanServer mbeanServer = null;
+
+ // Check if there is an MBeanServer service already
+ ServiceReference sref = context.getServiceReference(MBeanServer.class.getName());
+ if (sref != null)
+ {
+ mbeanServer = (MBeanServer)context.getService(sref);
+ log.log(LogService.LOG_DEBUG, "Found MBeanServer fom service: " + mbeanServer.getDefaultDomain());
+ return mbeanServer;
+ }
+
+ ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null);
+ if (serverArr.size() > 1)
+ throw new IllegalStateException("Multiple MBeanServer instances not supported");
+
+ if (serverArr.size() == 1)
+ {
+ mbeanServer = serverArr.get(0);
+ log.log(LogService.LOG_DEBUG, "Found MBeanServer: " + mbeanServer.getDefaultDomain());
+ }
+
+ if (mbeanServer == null)
+ {
+ log.log(LogService.LOG_DEBUG, "No MBeanServer, create one ...");
+ mbeanServer = MBeanServerFactory.createMBeanServer();
+ }
+
+ // Register the MBeanServer
+ context.registerService(MBeanServer.class.getName(), mbeanServer, null);
+ log.log(LogService.LOG_DEBUG, "MBeanServer registered");
+
+ return mbeanServer;
+ }
+}
\ No newline at end of file
16 years, 10 months
JBoss-OSGI SVN: r93480 - projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-09-14 10:42:45 -0400 (Mon, 14 Sep 2009)
New Revision: 93480
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerLocator.java
Log:
Fix NPE when MBeanServer is already registered as service
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerLocator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerLocator.java 2009-09-14 14:34:45 UTC (rev 93479)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerLocator.java 2009-09-14 14:42:45 UTC (rev 93480)
@@ -39,20 +39,25 @@
* @author thomas.diesler(a)jboss.com
* @since 24-Apr-2009
*/
-public class MBeanServerLocator
+public class MBeanServerLocator
{
private LogService log;
private MBeanServer mbeanServer;
-
+
@SuppressWarnings("unchecked")
public MBeanServerLocator(BundleContext context)
{
log = new LogServiceTracker(context);
-
+
// Check if there is an MBeanServer service already
ServiceReference sref = context.getServiceReference(MBeanServer.class.getName());
- if (sref == null)
+ if (sref != null)
{
+ mbeanServer = (MBeanServer)context.getService(sref);
+ log.log(LogService.LOG_DEBUG, "Found MBeanServer fom service: " + mbeanServer.getDefaultDomain());
+ }
+ else
+ {
ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null);
if (serverArr.size() > 1)
throw new IllegalStateException("Multiple MBeanServer instances not supported");
16 years, 10 months