[jboss-cvs] JBossAS SVN: r84825 - in projects/jboss-osgi/trunk: runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 26 16:27:48 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-02-26 16:27:48 -0500 (Thu, 26 Feb 2009)
New Revision: 84825
Modified:
projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleClassLoaderDependencyDeployer.java
projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiDeployer.java
projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/VDFBundleListener.java
projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerConfigurationProvider.java
projects/jboss-osgi/trunk/service/http/pom.xml
projects/jboss-osgi/trunk/service/http/src/main/java/org/jboss/osgi/service/http/GenericEndpointServlet.java
projects/jboss-osgi/trunk/service/http/src/main/java/org/jboss/osgi/service/http/ServletContextAttributeProvider.java
projects/jboss-osgi/trunk/testsuite/pom.xml
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTest.java
projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml
projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-bootstrap-beans.xml
Log:
Resurect clean test run
Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleClassLoaderDependencyDeployer.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleClassLoaderDependencyDeployer.java 2009-02-26 21:25:41 UTC (rev 84824)
+++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleClassLoaderDependencyDeployer.java 2009-02-26 21:27:48 UTC (rev 84825)
@@ -52,8 +52,8 @@
unit.addAttachment(ClassLoaderFactory.class, factory);
// create dependency items
- DependencyItem resolvedBundleDI = createResolvedBudleDependencyItem(bundle);
- unit.addIDependOn(resolvedBundleDI);
+ //DependencyItem resolvedBundleDI = createResolvedBudleDependencyItem(bundle);
+ //unit.addIDependOn(resolvedBundleDI);
}
/**
Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiDeployer.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiDeployer.java 2009-02-26 21:25:41 UTC (rev 84824)
+++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiDeployer.java 2009-02-26 21:27:48 UTC (rev 84825)
@@ -27,13 +27,13 @@
import java.util.List;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.osgi.deployer.helpers.BundleDeploymentListener;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleException;
+import org.osgi.framework.BundleListener;
/**
* This is the OSGi Deployer
@@ -47,23 +47,17 @@
private BundleContext bundleContext;
private List<URI> skipBundles;
- private BundleDeploymentListener listener;
-
- public OSGiDeployer(BundleDeploymentListener listener)
+ public OSGiDeployer()
{
super(OSGiMetaData.class);
- if (listener == null)
- throw new IllegalArgumentException("Null listener");
-
addOutput(Bundle.class);
- setStage(DeploymentStages.POST_PARSE);
- this.listener = listener;
+ //setStage(DeploymentStages.POST_PARSE);
}
public void setBundleContext(BundleContext bundleContext)
{
this.bundleContext = bundleContext;
- }
+ }
public void setSkipBundles(List<URI> skipBundles)
{
@@ -74,22 +68,18 @@
{
if (bundleContext == null)
throw new IllegalArgumentException("No system bundle context.");
-
- bundleContext.addBundleListener(listener);
+
+ bundleContext.addBundleListener(new DeployerBundleListener());
}
public void stop()
{
if (bundleContext == null)
return;
-
- bundleContext.removeBundleListener(listener);
}
public void deploy(DeploymentUnit unit, OSGiMetaData metadata) throws DeploymentException
{
- log.info("Install Bundle: " + metadata.getSymbolicName());
-
URI bundleUri = metadata.getBundleLocation();
if (bundleUri == null)
throw new IllegalStateException("Cannot obtain bundle location for: " + metadata);
@@ -100,7 +90,10 @@
{
Bundle bundle = bundleContext.installBundle(bundleUri.toString());
unit.addAttachment(Bundle.class, bundle);
- listener.addDeployment(unit);
+ log.info("Installed: " + bundle.getSymbolicName() + ",state=" + bundle.getState());
+
+ bundle.start();
+ log.info("Started: " + bundle.getSymbolicName() + ",state=" + bundle.getState());
}
}
catch (BundleException ex)
@@ -116,7 +109,6 @@
if (bundle != null)
{
log.info("Uninstall Bundle: " + bundle.getSymbolicName());
- listener.removeDeployment(unit);
try
{
bundle.uninstall();
@@ -127,4 +119,14 @@
}
}
}
+
+ class DeployerBundleListener implements BundleListener
+ {
+ public void bundleChanged(BundleEvent event)
+ {
+ //Bundle bundle = event.getBundle();
+ //int type = event.getType();
+ //System.out.println("bundleChanged: " + event + ",type=" + type + ",state=" + bundle.getState());
+ }
+ }
}
Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/VDFBundleListener.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/VDFBundleListener.java 2009-02-26 21:25:41 UTC (rev 84824)
+++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/VDFBundleListener.java 2009-02-26 21:27:48 UTC (rev 84825)
@@ -71,6 +71,7 @@
public void bundleChanged(BundleEvent event)
{
Bundle bundle = event.getBundle();
+ System.out.println("bundleChanged: " + event + ",state=" + bundle.getState());
long id = bundle.getBundleId();
String deploymentName = deployments.get(id);
if (deploymentName != null)
Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml 2009-02-26 21:25:41 UTC (rev 84824)
+++ projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml 2009-02-26 21:27:48 UTC (rev 84825)
@@ -17,11 +17,14 @@
javax.security.jacc,
javax.xml.parsers,
org.jboss.classloading.spi,
+ org.jboss.dependency.spi,
org.jboss.deployers.client.plugins.deployment,
org.jboss.deployers.client.spi,
org.jboss.deployers.spi.attachments,
org.jboss.deployers.spi.structure,
org.jboss.deployers.structure.spi,
+ org.jboss.kernel,
+ org.jboss.kernel.spi.dependency,
org.jboss.metadata.javaee.spec,
org.jboss.metadata.javaee.support,
org.jboss.metadata.web.jboss,
@@ -31,6 +34,7 @@
org.jboss.osgi.spi,
org.jboss.osgi.spi.framework,
org.jboss.osgi.spi.jmx,
+ org.jboss.system.server.jmx,
org.jboss.web,
org.jboss.virtual,
org.osgi.framework; version=1.4,
@@ -65,36 +69,18 @@
<!-- The OSGi Meta Data Deployer -->
<bean name="jboss.osgi:service=MetaDataDeployer" class="org.jboss.osgi.deployer.OSGiMetaDataDeployer" />
- <!-- VDFBundleListener -->
- <bean name="VDFBundleListener" class="org.jboss.osgi.deployer.helpers.VDFBundleListener">
- <constructor>
- <parameter><inject/></parameter>
- </constructor>
- </bean>
-
<!-- The OSGi Deployer -->
<bean name="jboss.osgi:service=Deployer" class="org.jboss.osgi.deployer.OSGiDeployer">
- <constructor>
- <parameter><inject bean="VDFBundleListener"/></parameter>
- </constructor>
<property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
<property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property>
</bean>
-<!--
- <bean name="OSGiCLMDDeployer" class="org.jboss.osgi.deployer.OSGiClassLoadingMetaDataDeployer">
- <constructor>
- <parameter>
- <classloading xmlns="urn:jboss:classloading:1.0" import-all="false"/>
- </parameter>
- </constructor>
- </bean>
--->
-
- <!-- The Bundle Deployer -->
+ <!-- The Bundle Deployer - ->
<bean name="jboss.osgi:service=BundleDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDependencyDeployer"/>
+ -->
- <!-- The Bundle start/stop Deployer -->
+ <!-- The Bundle start/stop Deployer - ->
<bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"/>
+ -->
</deployment>
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerConfigurationProvider.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerConfigurationProvider.java 2009-02-26 21:25:41 UTC (rev 84824)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerConfigurationProvider.java 2009-02-26 21:27:48 UTC (rev 84825)
@@ -66,14 +66,12 @@
public OSGiFramework getFramework(AttributeProvider attributeProvider, String beanName)
{
- OSGiFramework framework = attributeProvider.getAttribute(DEFAULT_FRAMEWORK_NAME, OSGiFramework.class);
-
+ OSGiFramework framework = attributeProvider.getAttribute(beanName, OSGiFramework.class);
if (framework == null)
{
configure(DEFAULT_FRAMEWORK_BEANS);
- framework = attributeProvider.getAttribute(DEFAULT_FRAMEWORK_NAME, OSGiFramework.class);
+ framework = attributeProvider.getAttribute(beanName, OSGiFramework.class);
}
-
return framework;
}
Modified: projects/jboss-osgi/trunk/service/http/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/http/pom.xml 2009-02-26 21:25:41 UTC (rev 84824)
+++ projects/jboss-osgi/trunk/service/http/pom.xml 2009-02-26 21:27:48 UTC (rev 84825)
@@ -84,17 +84,21 @@
javax.servlet.http,
javax.management,
javax.security.jacc,
- org.jboss.classloading.spi,
+ org.jboss.classloading.spi,
+ org.jboss.dependency.spi,
org.jboss.deployers.client.plugins.deployment,
org.jboss.deployers.client.spi,
org.jboss.deployers.spi.attachments,
org.jboss.deployers.spi.structure,
- org.jboss.deployers.structure.spi,
+ org.jboss.deployers.structure.spi,
+ org.jboss.kernel,
+ org.jboss.kernel.spi.dependency,
org.jboss.metadata.javaee.spec,
org.jboss.metadata.javaee.support,
org.jboss.metadata.web.jboss,
org.jboss.metadata.web.spec,
org.jboss.mx.util,
+ org.jboss.system.server.jmx,
org.jboss.osgi.service,
org.jboss.osgi.spi,
org.jboss.osgi.spi.framework,
Modified: projects/jboss-osgi/trunk/service/http/src/main/java/org/jboss/osgi/service/http/GenericEndpointServlet.java
===================================================================
--- projects/jboss-osgi/trunk/service/http/src/main/java/org/jboss/osgi/service/http/GenericEndpointServlet.java 2009-02-26 21:25:41 UTC (rev 84824)
+++ projects/jboss-osgi/trunk/service/http/src/main/java/org/jboss/osgi/service/http/GenericEndpointServlet.java 2009-02-26 21:27:48 UTC (rev 84825)
@@ -36,13 +36,9 @@
import org.jboss.mx.util.MBeanProxy;
import org.jboss.mx.util.MBeanProxyCreationException;
-import org.jboss.osgi.service.MicrocontainerService;
-import org.jboss.osgi.spi.framework.OSGiConfiguration;
-import org.jboss.osgi.spi.framework.OSGiFramework;
import org.jboss.osgi.spi.jmx.ObjectNameFactory;
+import org.jboss.system.server.jmx.JMXKernel;
import org.jboss.virtual.VFSUtils;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
/**
* A generic servlet that handles http service requests
@@ -53,79 +49,76 @@
@SuppressWarnings("serial")
public class GenericEndpointServlet extends HttpServlet
{
- private ObjectName httpContextName;
- private ObjectName httpServletName;
- private ManagedHttpContextMBean httpContext;
- private ManagedServletMBean httpServlet;
- private String resourceLocation;
+ private ObjectName httpContextName;
+ private ObjectName httpServletName;
+ private ManagedHttpContextMBean httpContext;
+ private ManagedServletMBean httpServlet;
+ private String resourceLocation;
- @Override
- public void init(ServletConfig config) throws ServletException
- {
- super.init(config);
+ @Override
+ public void init(ServletConfig config) throws ServletException
+ {
+ super.init(config);
- // Get the MBeanServer
- OSGiFramework framework = OSGiConfiguration.getFramework(new ServletContextAttributeProvider(config.getServletContext()));
- BundleContext context = framework.getSystemBundleContext();
- ServiceReference sref = context.getServiceReference(MicrocontainerService.class.getName());
- MicrocontainerService service = (MicrocontainerService)context.getService(sref);
- MBeanServer server = service.getMbeanServer();
+ // Get the MBeanServer
+ ServletContextAttributeProvider attProvider = new ServletContextAttributeProvider(config.getServletContext());
+ MBeanServer server = attProvider.getAttribute("JMXKernel", JMXKernel.class).getMbeanServer();
- try
- {
- // Get the HttpContext, which must alway be there
- httpContextName = ObjectNameFactory.create(getInitParameter(HttpEndpointDeployer.INIT_PARAM_HTTP_CONTEXT_NAME));
- httpContext = (ManagedHttpContextMBean)MBeanProxy.get(ManagedHttpContextMBean.class, httpContextName, server);
-
- // Get the HttpSerlet, which must be there for a registered servlet
- String servletName = getInitParameter(HttpEndpointDeployer.INIT_PARAM_SERVLET_NAME);
- if (servletName != null)
+ try
{
- httpServletName = ObjectNameFactory.create(servletName);
- httpServlet = (ManagedServletMBean)MBeanProxy.get(ManagedServletMBean.class, httpServletName, server);
- httpServlet.init(config);
- }
-
- // Get the resource location, which must be there for a registered resources
- resourceLocation = getInitParameter(HttpEndpointDeployer.INIT_PARAM_RESOURCE_LOCATION);
- }
- catch (MBeanProxyCreationException ex)
- {
- throw new ServletException("Cannot obtain MBeanProxy", ex);
- }
- }
+ // Get the HttpContext, which must alway be there
+ httpContextName = ObjectNameFactory.create(getInitParameter(HttpEndpointDeployer.INIT_PARAM_HTTP_CONTEXT_NAME));
+ httpContext = (ManagedHttpContextMBean)MBeanProxy.get(ManagedHttpContextMBean.class, httpContextName, server);
- @Override
- protected void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
- {
- // Handle a service request to a registered servlet
- if (httpServlet != null)
- {
- httpServlet.service(req, res);
- }
-
- // Handle a service request to a registered resource
- else
- {
- String resourcePath = resourceLocation + req.getPathInfo();
+ // Get the HttpSerlet, which must be there for a registered servlet
+ String servletName = getInitParameter(HttpEndpointDeployer.INIT_PARAM_SERVLET_NAME);
+ if (servletName != null)
+ {
+ httpServletName = ObjectNameFactory.create(servletName);
+ httpServlet = (ManagedServletMBean)MBeanProxy.get(ManagedServletMBean.class, httpServletName, server);
+ httpServlet.init(config);
+ }
- URL resourceUrl = httpContext.getResource(resourcePath);
- if (resourceUrl != null)
+ // Get the resource location, which must be there for a registered resources
+ resourceLocation = getInitParameter(HttpEndpointDeployer.INIT_PARAM_RESOURCE_LOCATION);
+ }
+ catch (MBeanProxyCreationException ex)
{
- String mimeType = httpContext.getMimeType(resourcePath);
- if (mimeType != null)
- res.setContentType(mimeType);
+ throw new ServletException("Cannot obtain MBeanProxy", ex);
+ }
+ }
- ServletOutputStream outStream = res.getOutputStream();
- InputStream inStream = resourceUrl.openStream();
- VFSUtils.copyStream(inStream, outStream);
- outStream.close();
- inStream.close();
+ @Override
+ protected void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ // Handle a service request to a registered servlet
+ if (httpServlet != null)
+ {
+ httpServlet.service(req, res);
}
+
+ // Handle a service request to a registered resource
else
{
- res.sendError(HttpServletResponse.SC_NOT_FOUND, resourcePath);
+ String resourcePath = resourceLocation + req.getPathInfo();
+
+ URL resourceUrl = httpContext.getResource(resourcePath);
+ if (resourceUrl != null)
+ {
+ String mimeType = httpContext.getMimeType(resourcePath);
+ if (mimeType != null)
+ res.setContentType(mimeType);
+
+ ServletOutputStream outStream = res.getOutputStream();
+ InputStream inStream = resourceUrl.openStream();
+ VFSUtils.copyStream(inStream, outStream);
+ outStream.close();
+ inStream.close();
+ }
+ else
+ {
+ res.sendError(HttpServletResponse.SC_NOT_FOUND, resourcePath);
+ }
}
- }
- }
+ }
}
Modified: projects/jboss-osgi/trunk/service/http/src/main/java/org/jboss/osgi/service/http/ServletContextAttributeProvider.java
===================================================================
--- projects/jboss-osgi/trunk/service/http/src/main/java/org/jboss/osgi/service/http/ServletContextAttributeProvider.java 2009-02-26 21:25:41 UTC (rev 84824)
+++ projects/jboss-osgi/trunk/service/http/src/main/java/org/jboss/osgi/service/http/ServletContextAttributeProvider.java 2009-02-26 21:27:48 UTC (rev 84825)
@@ -23,6 +23,10 @@
import javax.servlet.ServletContext;
+import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
import org.jboss.osgi.spi.framework.AbstractAttributeProvider;
/**
@@ -42,6 +46,12 @@
public Object getAttribute(String name)
{
- return context.getAttribute(name);
+ Kernel kernel = (Kernel)context.getAttribute(KernelConstants.KERNEL_NAME);
+ if (KernelConstants.KERNEL_NAME.equals(name))
+ return kernel;
+
+ Controller controller = kernel.getController();
+ ControllerContext context = controller.getInstalledContext(name);
+ return (context != null ? context.getTarget() : null);
}
}
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-02-26 21:25:41 UTC (rev 84824)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-02-26 21:27:48 UTC (rev 84825)
@@ -110,7 +110,11 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
+ <!-- Exclude tests that require remote access -->
<exclude>org/jboss/test/osgi/service/http/junit/*Test.java</exclude>
+ <exclude>org/jboss/test/osgi/service/microcontainer/junit/*Test.java</exclude>
+ <!-- [JBOSGI-36] Bundle classes leak into system classloader -->
+ <exclude>org/jboss/test/osgi/jbosgi36/junit/*Test.java</exclude>
</excludes>
</configuration>
</plugin>
@@ -143,6 +147,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.security.args}</argLine>
+ <excludes>
+ <!-- [JBOSGI-36] Bundle classes leak into system classloader -->
+ <exclude>org/jboss/test/osgi/jbosgi36/junit/*Test.java</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java 2009-02-26 21:25:41 UTC (rev 84824)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java 2009-02-26 21:27:48 UTC (rev 84825)
@@ -44,18 +44,19 @@
*/
public class JBOSGI36Test extends IntegrationTestCase
{
- private static OSGiConfigurationProvider configProvider;
+ static IntegrationTestSetup setup;
public static Test suite()
{
- IntegrationTestSetup setup = new IntegrationTestSetup(JBOSGI36Test.class, "jbosgi36-bundle.jar, jbosgi36-mbean.jar")
+ setup = new IntegrationTestSetup(JBOSGI36Test.class, "jbosgi36-bundle.jar, jbosgi36-mbean.jar")
{
@Override
public OSGiConfigurationProvider createConfigurationProvider()
{
- // Bootstrap the embedded framework
+ OSGiConfigurationProvider configProvider = null;
if (isRemoteIntegration() == false)
{
+ // Bootstrap the embedded framework
configProvider = OSGiConfiguration.getConfigurationProvider();
configProvider.getFramework();
}
@@ -74,8 +75,8 @@
{
try
{
- getFooMBean().accessSomeService();
- fail("ClassNotFoundException expected");
+ String loaderName = getFooMBean().accessSomeService();
+ fail("Unexpected classloader: " + loaderName);
}
catch (ClassNotFoundException ex)
{
@@ -87,8 +88,8 @@
{
try
{
- getFooMBean().accessSomeInternal();
- fail("ClassNotFoundException expected");
+ String loaderName = getFooMBean().accessSomeInternal();
+ fail("Unexpected classloader: " + loaderName);
}
catch (ClassNotFoundException ex)
{
@@ -99,8 +100,9 @@
private FooMBean getFooMBean() throws MBeanProxyException
{
FooMBean foo;
- if (configProvider != null)
+ if (isRemoteIntegration() == false)
{
+ OSGiConfigurationProvider configProvider = setup.getConfigurationProvider();
AttributeProvider attProvider = (AttributeProvider)configProvider;
foo = attProvider.getAttribute("Foo", FooMBean.class);
}
Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTest.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTest.java 2009-02-26 21:25:41 UTC (rev 84824)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTest.java 2009-02-26 21:27:48 UTC (rev 84825)
@@ -39,20 +39,14 @@
*/
public class MicrocontainerServiceTest extends IntegrationTestCase
{
- static IntegrationTestSetup setup;
-
public static Test suite()
{
- setup = new IntegrationTestSetup(MicrocontainerServiceTest.class, "microcontainer-service.jar");
- return setup;
+ return new IntegrationTestSetup(MicrocontainerServiceTest.class, "microcontainer-service.jar");
}
public void testMBeanAccess() throws Exception
{
- if (setup.isRemoteIntegration())
- {
- FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, MBeanTestService.OBJECT_NAME, getServer());
- assertEquals("hello", foo.echo("hello"));
- }
+ FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, MBeanTestService.OBJECT_NAME, getServer());
+ assertEquals("hello", foo.echo("hello"));
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml 2009-02-26 21:25:41 UTC (rev 84824)
+++ projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml 2009-02-26 21:27:48 UTC (rev 84825)
@@ -14,9 +14,6 @@
<!-- The OSGi Deployer -->
<bean name="jboss.osgi:service=Deployer" class="org.jboss.osgi.deployer.OSGiDeployer">
- <constructor>
- <parameter><inject bean="VDFBundleListener"/></parameter>
- </constructor>
<property name="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
<property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property>
</bean>
Modified: projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-bootstrap-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-bootstrap-beans.xml 2009-02-26 21:25:41 UTC (rev 84824)
+++ projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-bootstrap-beans.xml 2009-02-26 21:27:48 UTC (rev 84825)
@@ -111,12 +111,13 @@
<!-- The OSGi Meta Data Deployer -->
<bean name="jboss.osgi:service=MetaDataDeployer" class="org.jboss.osgi.deployer.OSGiMetaDataDeployer" />
- <!-- VDFBundleListener -->
+ <!-- VDFBundleListener
<bean name="VDFBundleListener" class="org.jboss.osgi.deployer.helpers.VDFBundleListener">
<constructor>
<parameter><inject/></parameter>
</constructor>
</bean>
+ -->
<!--
<bean name="OSGiCLMDDeployer" class="org.jboss.osgi.deployer.OSGiClassLoadingMetaDataDeployer">
@@ -131,7 +132,8 @@
<!-- The Bundle Deployer -->
<bean name="jboss.osgi:service=BundleDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDependencyDeployer"/>
- <!-- The Bundle start/stop Deployer -->
+ <!-- The Bundle start/stop Deployer - ->
<bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"/>
+ -->
</deployment>
More information about the jboss-cvs-commits
mailing list