[jboss-cvs] JBossAS SVN: r84816 - in projects/jboss-osgi/trunk: runtime and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 26 13:33:05 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-02-26 13:33:05 -0500 (Thu, 26 Feb 2009)
New Revision: 84816
Modified:
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/runtime/.project
projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/BundleClassLoader.java
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestCase.java
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestSetup.java
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestCase.java
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestSetup.java
projects/jboss-osgi/trunk/service/.project
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:
wip
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-02-26 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/pom.xml 2009-02-26 18:33:05 UTC (rev 84816)
@@ -69,12 +69,28 @@
<artifactId>jboss-osgi-repository-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${version.jboss.microcontainer}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${version.log4j}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>${version.jboss.common.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${version.jboss.aop}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-client</artifactId>
<version>${version.jboss.deployers}</version>
@@ -100,11 +116,6 @@
<version>${version.jboss.deployers}</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${version.jboss.common.core}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jacc-api</artifactId>
<version>${version.jboss.jacc}</version>
@@ -141,21 +152,16 @@
<version>${version.jboss.metadata}</version>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>${version.jboss.aop}</version>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${version.jboss.microcontainer}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>${version.jboss.microcontainer}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${version.log4j}</version>
- </dependency>
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi_R4_core</artifactId>
<version>${version.osgi.r4.core}</version>
Modified: projects/jboss-osgi/trunk/runtime/.project
===================================================================
--- projects/jboss-osgi/trunk/runtime/.project 2009-02-26 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/runtime/.project 2009-02-26 18:33:05 UTC (rev 84816)
@@ -6,12 +6,18 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/BundleClassLoader.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/BundleClassLoader.java 2009-02-26 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/helpers/BundleClassLoader.java 2009-02-26 18:33:05 UTC (rev 84816)
@@ -59,6 +59,7 @@
this.bundle = bundle;
}
+ @SuppressWarnings("unchecked")
protected Class findClass(String name) throws ClassNotFoundException
{
return bundle.loadClass(name);
@@ -80,6 +81,7 @@
return findResource(name);
}
+ @SuppressWarnings("unchecked")
public Class loadClass(String name) throws ClassNotFoundException
{
return findClass(name);
@@ -104,7 +106,7 @@
public String toString()
{
- Dictionary dictionary = bundle.getHeaders();
+ Dictionary<?, ?> dictionary = bundle.getHeaders();
String bname = dictionary.get(Constants.BUNDLE_NAME) + "(" + dictionary.get(Constants.BUNDLE_SYMBOLICNAME) + ")";
return "BundleClassLoader for [" + bname + "]";
}
Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestCase.java 2009-02-26 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestCase.java 2009-02-26 18:33:05 UTC (rev 84816)
@@ -28,7 +28,6 @@
import javax.management.MBeanServerConnection;
import org.jboss.logging.Logger;
-import org.jboss.osgi.spi.framework.OSGiConfiguration;
import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
/**
@@ -54,13 +53,8 @@
return delegate;
}
- // Overwrite to provide an OSGiConfigurationProvider
public OSGiConfigurationProvider getConfigurationProvider()
{
- if (configProvider == null)
- {
- configProvider = OSGiConfiguration.getConfigurationProvider();
- }
return configProvider;
}
@@ -71,7 +65,7 @@
public boolean isRemoteIntegration()
{
- return getDelegate().isRemoteIntegration();
+ return IntegrationTestHelper.isRemoteIntegration();
}
public boolean isTargetJBoss50()
Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java 2009-02-26 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java 2009-02-26 18:33:05 UTC (rev 84816)
@@ -136,7 +136,7 @@
}
}
- public boolean isRemoteIntegration()
+ public static boolean isRemoteIntegration()
{
return System.getProperty("jboss.bind.address") != null;
}
Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestSetup.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestSetup.java 2009-02-26 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestSetup.java 2009-02-26 18:33:05 UTC (rev 84816)
@@ -31,9 +31,6 @@
import javax.management.MBeanServerConnection;
-import org.jboss.osgi.spi.framework.OSGiConfiguration;
-import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
-
/**
* A test setup that deploys/undeploys archives
*
@@ -45,7 +42,6 @@
private IntegrationTestHelper delegate;
private String[] archives = new String[0];
private ClassLoader originalClassLoader;
- private OSGiConfigurationProvider configProvider;
public IntegrationTestSetup(Class<?> testClass, String archiveList)
{
@@ -62,21 +58,6 @@
return delegate;
}
- // Overwrite to provide an OSGiConfigurationProvider
- public OSGiConfigurationProvider getConfigurationProvider()
- {
- if (configProvider == null)
- {
- configProvider = OSGiConfiguration.getConfigurationProvider();
- }
- return configProvider;
- }
-
- public void setConfigurationProvider(OSGiConfigurationProvider configProvider)
- {
- this.configProvider = configProvider;
- }
-
public File getArchiveFile(String archive)
{
return getDelegate().getTestArchiveFile(archive);
@@ -89,7 +70,7 @@
public boolean isRemoteIntegration()
{
- return getDelegate().isRemoteIntegration();
+ return IntegrationTestHelper.isRemoteIntegration();
}
public boolean isTargetJBoss50()
Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestCase.java 2009-02-26 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestCase.java 2009-02-26 18:33:05 UTC (rev 84816)
@@ -26,6 +26,9 @@
import java.net.URL;
import org.jboss.logging.Logger;
+import org.jboss.osgi.spi.framework.OSGiConfiguration;
+import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
+import org.jboss.virtual.VFS;
import junit.framework.TestCase;
@@ -37,54 +40,80 @@
*/
public class OSGiTestCase extends TestCase
{
- // Provide logging
- final Logger log = Logger.getLogger(OSGiTestCase.class);
+ // Provide logging
+ final Logger log = Logger.getLogger(OSGiTestCase.class);
- private OSGiTestHelper delegate = new OSGiTestHelper();
+ private OSGiTestHelper delegate = new OSGiTestHelper();
+ private OSGiConfigurationProvider configProvider;
- @Override
- protected void setUp() throws Exception
- {
- log.debug("### START " + getLongName());
- super.setUp();
- }
+ public OSGiTestCase()
+ {
+ // Prevent unknown protocol: vfsfile
+ VFS.init();
+ }
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- log.debug("### END " + getLongName());
- }
+ public OSGiConfigurationProvider createConfigurationProvider()
+ {
+ return OSGiConfiguration.getConfigurationProvider();
+ }
- protected String getShortName()
- {
- String shortName = getClass().getName();
- shortName = shortName.substring(shortName.lastIndexOf(".") + 1);
- return shortName;
- }
+ public OSGiConfigurationProvider getConfigurationProvider()
+ {
+ if (configProvider == null)
+ {
+ configProvider = createConfigurationProvider();
+ }
+ return configProvider;
+ }
- protected String getLongName()
- {
- return getClass().getName() + "." + getName();
- }
+ public void setConfigurationProvider(OSGiConfigurationProvider configProvider)
+ {
+ this.configProvider = configProvider;
+ }
- protected URL getResourceURL(String resource)
- {
- return delegate.getResourceURL(resource);
- }
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.debug("### START " + getLongName());
+ super.setUp();
+ }
- protected File getResourceFile(String resource)
- {
- return delegate.getResourceFile(resource);
- }
+ @Override
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ log.debug("### END " + getLongName());
+ }
- public File getTestArchiveFile(String archive)
- {
- return delegate.getTestArchiveFile(archive);
- }
+ protected String getShortName()
+ {
+ String shortName = getClass().getName();
+ shortName = shortName.substring(shortName.lastIndexOf(".") + 1);
+ return shortName;
+ }
- public URL getTestArchiveURL(String archive) throws MalformedURLException
- {
- return delegate.getTestArchiveFile(archive).toURI().toURL();
- }
+ protected String getLongName()
+ {
+ return getClass().getName() + "." + getName();
+ }
+
+ protected URL getResourceURL(String resource)
+ {
+ return delegate.getResourceURL(resource);
+ }
+
+ protected File getResourceFile(String resource)
+ {
+ return delegate.getResourceFile(resource);
+ }
+
+ public File getTestArchiveFile(String archive)
+ {
+ return delegate.getTestArchiveFile(archive);
+ }
+
+ public URL getTestArchiveURL(String archive) throws MalformedURLException
+ {
+ return delegate.getTestArchiveFile(archive).toURI().toURL();
+ }
}
Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestSetup.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestSetup.java 2009-02-26 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestSetup.java 2009-02-26 18:33:05 UTC (rev 84816)
@@ -26,6 +26,9 @@
import java.net.URL;
import org.jboss.logging.Logger;
+import org.jboss.osgi.spi.framework.OSGiConfiguration;
+import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
+import org.jboss.virtual.VFS;
import junit.extensions.TestSetup;
import junit.framework.TestSuite;
@@ -42,12 +45,34 @@
final Logger log = Logger.getLogger(OSGiTestSetup.class);
private OSGiTestHelper delegate = new OSGiTestHelper();
+ private OSGiConfigurationProvider configProvider;
public OSGiTestSetup(Class<?> testCase)
{
super(new TestSuite(testCase));
+ // Prevent unknown protocol: vfsfile
+ VFS.init();
}
+ public OSGiConfigurationProvider createConfigurationProvider()
+ {
+ return OSGiConfiguration.getConfigurationProvider();
+ }
+
+ public OSGiConfigurationProvider getConfigurationProvider()
+ {
+ if (configProvider == null)
+ {
+ configProvider = createConfigurationProvider();
+ }
+ return configProvider;
+ }
+
+ public void setConfigurationProvider(OSGiConfigurationProvider configProvider)
+ {
+ this.configProvider = configProvider;
+ }
+
@Override
protected void setUp() throws Exception
{
Modified: projects/jboss-osgi/trunk/service/.project
===================================================================
--- projects/jboss-osgi/trunk/service/.project 2009-02-26 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/service/.project 2009-02-26 18:33:05 UTC (rev 84816)
@@ -6,12 +6,18 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-02-26 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-02-26 18:33:05 UTC (rev 84816)
@@ -19,7 +19,7 @@
<properties>
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
</properties>
-
+
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -28,14 +28,24 @@
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-deployer</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ </dependency>
+ <dependency>
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
</dependency>
-
+
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -47,12 +57,6 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
</dependencies>
<!-- Build -->
@@ -83,16 +87,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <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/JBOSGI36Test.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -100,10 +94,11 @@
<profiles>
<!--
- Name: no-jboss-bind-address
- Descr: Skip tests if no jboss.bind.address is given
+ Name: embedded-framework
+ Descr: Setup for embedded integration testing
+ -->
<profile>
- <id>no-jboss-bind-address</id>
+ <id>embedded-framework</id>
<activation>
<property>
<name>!jboss.bind.address</name>
@@ -114,14 +109,46 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skipTests>true</skipTests>
+ <excludes>
+ <exclude>org/jboss/test/osgi/service/http/junit/*Test.java</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
+
+ <!--
+ Name: remote-framework
+ Descr: Setup for remote integration testing
-->
-
+ <profile>
+ <id>remote-framework</id>
+ <activation>
+ <property>
+ <name>jboss.bind.address</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <scope>test</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.security.args}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
-
+
</project>
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 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/jbosgi36/junit/JBOSGI36Test.java 2009-02-26 18:33:05 UTC (rev 84816)
@@ -26,6 +26,7 @@
import junit.framework.Test;
import org.jboss.osgi.spi.framework.AttributeProvider;
+import org.jboss.osgi.spi.framework.OSGiConfiguration;
import org.jboss.osgi.spi.framework.OSGiConfigurationProvider;
import org.jboss.osgi.spi.jmx.MBeanProxy;
import org.jboss.osgi.spi.jmx.MBeanProxyException;
@@ -49,10 +50,15 @@
{
IntegrationTestSetup setup = new IntegrationTestSetup(JBOSGI36Test.class, "jbosgi36-bundle.jar, jbosgi36-mbean.jar")
{
- public OSGiConfigurationProvider getConfigurationProvider()
+ @Override
+ public OSGiConfigurationProvider createConfigurationProvider()
{
- configProvider = super.getConfigurationProvider();
- configProvider.getFramework();
+ // Bootstrap the embedded framework
+ if (isRemoteIntegration() == false)
+ {
+ configProvider = OSGiConfiguration.getConfigurationProvider();
+ configProvider.getFramework();
+ }
return configProvider;
}
};
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 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/junit/MicrocontainerServiceTest.java 2009-02-26 18:33:05 UTC (rev 84816)
@@ -39,14 +39,20 @@
*/
public class MicrocontainerServiceTest extends IntegrationTestCase
{
- public static Test suite()
- {
- return new IntegrationTestSetup(MicrocontainerServiceTest.class, "microcontainer-service.jar");
- }
+ static IntegrationTestSetup setup;
- public void testMBeanAccess() throws Exception
- {
- FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, MBeanTestService.OBJECT_NAME, getServer());
- assertEquals("hello", foo.echo("hello"));
- }
+ public static Test suite()
+ {
+ setup = new IntegrationTestSetup(MicrocontainerServiceTest.class, "microcontainer-service.jar");
+ return setup;
+ }
+
+ public void testMBeanAccess() throws Exception
+ {
+ if (setup.isRemoteIntegration())
+ {
+ 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 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml 2009-02-26 18:33:05 UTC (rev 84816)
@@ -12,4 +12,13 @@
</property>
</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>
+
</deployment>
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 17:49:47 UTC (rev 84815)
+++ projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-bootstrap-beans.xml 2009-02-26 18:33:05 UTC (rev 84816)
@@ -108,4 +108,30 @@
<property name="system"><inject bean="ClassLoaderSystem"/></property>
</bean>
+ <!-- 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>
+
+ <!--
+ <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 -->
+ <bean name="jboss.osgi:service=BundleDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDependencyDeployer"/>
+
+ <!-- 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