[jboss-osgi-commits] JBoss-OSGI SVN: r88014 - in projects/jboss-osgi/trunk/bundle: deployment and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-29 12:32:35 -0400 (Wed, 29 Apr 2009) New Revision: 88014 Modified: projects/jboss-osgi/trunk/bundle/deployment/pom.xml projects/jboss-osgi/trunk/bundle/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeployersActivator.java projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml projects/jboss-osgi/trunk/bundle/pom.xml Log: DeploymentException: No structural deployers Modified: projects/jboss-osgi/trunk/bundle/deployment/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/deployment/pom.xml 2009-04-29 16:31:09 UTC (rev 88013) +++ projects/jboss-osgi/trunk/bundle/deployment/pom.xml 2009-04-29 16:32:35 UTC (rev 88014) @@ -79,13 +79,15 @@ javax.management, <!-- import --> - org.jboss.dependency.*, - org.jboss.deployers.*, + org.jboss.dependency*, + org.jboss.deployers*, + org.jboss.deployers.plugins.attachments, org.jboss.logging, org.jboss.osgi.common.log, org.jboss.osgi.microcontainer, org.jboss.osgi.spi.management, - org.jboss.virtual, + org.jboss.virtual*, + org.jboss.virtual.plugins.registry, <!-- osgi --> org.osgi.framework, Modified: projects/jboss-osgi/trunk/bundle/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeployersActivator.java =================================================================== --- projects/jboss-osgi/trunk/bundle/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeployersActivator.java 2009-04-29 16:31:09 UTC (rev 88013) +++ projects/jboss-osgi/trunk/bundle/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeployersActivator.java 2009-04-29 16:32:35 UTC (rev 88014) @@ -49,15 +49,21 @@ if (service == null) throw new IllegalStateException("MicrocontainerService not available"); + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); try { - deployersURL = new File("src/main/resources/META-INF/jboss-osgi-deployers.xml").toURL(); + Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); + deployersURL = new File("../deployment/src/main/resources/META-INF/jboss-osgi-deployers.xml").toURL(); service.deploy(deployersURL); } catch (Exception ex) { throw new IllegalStateException("Cannot deploy: " + deployersURL, ex); } + finally + { + Thread.currentThread().setContextClassLoader(ctxLoader); + } } public void stop(BundleContext context) Modified: projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml 2009-04-29 16:31:09 UTC (rev 88013) +++ projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml 2009-04-29 16:32:35 UTC (rev 88014) @@ -142,9 +142,9 @@ jboss-vfs;inline=false, </Embed-Dependency> <_exportcontents> - org.jboss.virtual, - org.jboss.dependency.*, - org.jboss.deployers.*, + org.jboss.virtual*, + org.jboss.dependency*, + org.jboss.deployers*, </_exportcontents> </instructions> </configuration> Modified: projects/jboss-osgi/trunk/bundle/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-29 16:31:09 UTC (rev 88013) +++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-29 16:32:35 UTC (rev 88014) @@ -11,7 +11,7 @@ <version>1.0.0.Beta2</version> </parent> - <!-- Modules --> + <!-- Modules --> <modules> <module>blueprint</module> <module>common</module> @@ -23,7 +23,7 @@ <module>webconsole</module> </modules> - <!-- + <!-- <modules> <module>blueprint</module> <module>deployment</module>