[jboss-cvs] JBossAS SVN: r88250 - in projects/jboss-osgi/trunk: bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 6 03:00:30 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-05-06 03:00:29 -0400 (Wed, 06 May 2009)
New Revision: 88250
Modified:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java
projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java
projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestSetup.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MBeanServiceRemoteTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/deployer/jbosgi36/OSGI36TestCase.java
Log:
Upgrade to Felix-1.6.1
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java 2009-05-06 06:57:49 UTC (rev 88249)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java 2009-05-06 07:00:29 UTC (rev 88250)
@@ -103,7 +103,7 @@
public void testBeansDeployment() throws Exception
{
-// MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer());
-// mcService.deploy(getTestArchiveURL("mcservice-bundleB.jar"));
+ MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer());
+ mcService.deploy(getTestArchiveURL("mcservice-bundleB.jar"));
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java 2009-05-06 06:57:49 UTC (rev 88249)
+++ projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java 2009-05-06 07:00:29 UTC (rev 88250)
@@ -84,7 +84,7 @@
serviceURL = new JMXServiceURL("service:jmx:rmi://" + host + "/jndi/rmi://" + host + ":" + rmiPort + jmxConnectorServerPath);
jmxConnectorServer = JMXConnectorServerFactory.newJMXConnectorServer(serviceURL, null, mbeanServer);
- log.log(LogService.LOG_DEBUG, "JMX Connector created: " + serviceURL);
+ log.log(LogService.LOG_DEBUG, "JMXConnectorServer created: " + serviceURL);
}
catch (RuntimeException rte)
{
@@ -92,7 +92,7 @@
}
catch (Exception ex)
{
- log.log(LogService.LOG_ERROR, "Cannot create JMXConnector", ex);
+ log.log(LogService.LOG_ERROR, "Cannot create JMXConnectorServer", ex);
}
}
@@ -104,18 +104,18 @@
public void start()
{
if (jmxConnectorServer == null)
- throw new IllegalStateException("JMXConnector not available");
+ throw new IllegalStateException("JMXConnectorServer not available");
ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
try
{
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
jmxConnectorServer.start();
- log.log(LogService.LOG_INFO, "JMXConnector started: " + serviceURL);
+ log.log(LogService.LOG_INFO, "JMXConnectorServer started: " + serviceURL);
}
catch (IOException ex)
{
- log.log(LogService.LOG_ERROR, "Cannot start JMXConnector", ex);
+ log.log(LogService.LOG_ERROR, "Cannot start JMXConnectorServer", ex);
}
finally
{
@@ -130,11 +130,11 @@
{
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
jmxConnectorServer.stop();
- log.log(LogService.LOG_DEBUG, "JMXConnector stopped");
+ log.log(LogService.LOG_DEBUG, "JMXConnectorServer stopped");
}
catch (IOException ex)
{
- log.log(LogService.LOG_WARNING, "Cannot stop JMXConnector", ex);
+ log.log(LogService.LOG_WARNING, "Cannot stop JMXConnectorServer", ex);
}
finally
{
Modified: projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml 2009-05-06 06:57:49 UTC (rev 88249)
+++ projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml 2009-05-06 07:00:29 UTC (rev 88250)
@@ -149,6 +149,7 @@
jboss-kernel;inline=false,
</Embed-Dependency>
<_exportcontents>
+ .,
org.jboss.dependency*,
org.jboss.deployers*,
</_exportcontents>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-05-06 06:57:49 UTC (rev 88249)
+++ projects/jboss-osgi/trunk/pom.xml 2009-05-06 07:00:29 UTC (rev 88250)
@@ -39,7 +39,7 @@
<version.aqute.bnd>0.0.323</version.aqute.bnd>
<version.equinox>3.4.2</version.equinox>
<version.felix.configadmin>1.0.10</version.felix.configadmin>
- <version.felix.framework>1.6.0</version.felix.framework>
+ <version.felix.framework>1.6.1</version.felix.framework>
<version.felix.http.jetty>1.0.0</version.felix.http.jetty>
<version.felix.javax.servlet>1.0.0</version.felix.javax.servlet>
<version.felix.log>1.0.0</version.felix.log>
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java 2009-05-06 06:57:49 UTC (rev 88249)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java 2009-05-06 07:00:29 UTC (rev 88250)
@@ -105,9 +105,9 @@
return getDelegate().getRemoteFramework();
}
- protected MBeanServerConnection getServer()
+ protected MBeanServerConnection getMBeanServer()
{
- return getDelegate().getServer();
+ return getDelegate().getMBeanServer();
}
protected String getServerHost()
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java 2009-05-06 06:57:49 UTC (rev 88249)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java 2009-05-06 07:00:29 UTC (rev 88250)
@@ -140,7 +140,7 @@
try
{
ObjectName oname = new ObjectName("jboss.system:type=ServerConfig");
- jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion");
+ jbossVersion = (String)getMBeanServer().getAttribute(oname, "SpecificationVersion");
}
catch (Exception ex)
{
@@ -156,7 +156,7 @@
}
@SuppressWarnings("unchecked")
- public MBeanServerConnection getServer()
+ public MBeanServerConnection getMBeanServer()
{
if (server == null)
{
@@ -179,7 +179,7 @@
{
if (isRemoteIntegration())
{
- return new RemoteArchiveDeployer(getServer());
+ return new RemoteArchiveDeployer(getMBeanServer());
}
else
{
@@ -212,7 +212,7 @@
public RemoteFramework getRemoteFramework() throws Exception
{
if (managedFramework == null)
- managedFramework = MBeanProxy.get(ManagedFrameworkMBean.class, ManagedFrameworkMBean.MBEAN_MANAGED_FRAMEWORK, getServer());
+ managedFramework = MBeanProxy.get(ManagedFrameworkMBean.class, ManagedFrameworkMBean.MBEAN_MANAGED_FRAMEWORK, getMBeanServer());
return new RemoteFramework()
{
@@ -224,7 +224,7 @@
try
{
- return MBeanProxy.get(ManagedBundleMBean.class, bundleOName, getServer());
+ return MBeanProxy.get(ManagedBundleMBean.class, bundleOName, getMBeanServer());
}
catch (MBeanProxyException ex)
{
@@ -239,7 +239,7 @@
{
try
{
- RemoteBundle remBundle = MBeanProxy.get(ManagedBundleMBean.class, bundleOName, getServer());
+ RemoteBundle remBundle = MBeanProxy.get(ManagedBundleMBean.class, bundleOName, getMBeanServer());
remBundles.add(remBundle);
}
catch (MBeanProxyException ex)
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestSetup.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestSetup.java 2009-05-06 06:57:49 UTC (rev 88249)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestSetup.java 2009-05-06 07:00:29 UTC (rev 88250)
@@ -78,9 +78,9 @@
return getDelegate().isTargetJBoss50();
}
- public MBeanServerConnection getServer()
+ public MBeanServerConnection getMBeanServer()
{
- return getDelegate().getServer();
+ return getDelegate().getMBeanServer();
}
public String getServerHost()
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MBeanServiceRemoteTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MBeanServiceRemoteTestCase.java 2009-05-06 06:57:49 UTC (rev 88249)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MBeanServiceRemoteTestCase.java 2009-05-06 07:00:29 UTC (rev 88250)
@@ -46,7 +46,7 @@
public void testMBeanAccess() throws Exception
{
- FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, MBeanTestService.OBJECT_NAME, getServer());
+ FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, MBeanTestService.OBJECT_NAME, getMBeanServer());
assertEquals("hello", foo.echo("hello"));
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/deployer/jbosgi36/OSGI36TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/deployer/jbosgi36/OSGI36TestCase.java 2009-05-06 06:57:49 UTC (rev 88249)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/deployer/jbosgi36/OSGI36TestCase.java 2009-05-06 07:00:29 UTC (rev 88250)
@@ -82,7 +82,7 @@
private FooMBean getFooMBean() throws MBeanProxyException
{
- FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, FooMBean.OBJECT_NAME, getServer());
+ FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, FooMBean.OBJECT_NAME, getMBeanServer());
return foo;
}
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list