[jboss-osgi-commits] JBoss-OSGI SVN: r88005 - in projects/jboss-osgi/trunk/bundle: deployment and 1 other directories.
Author: thomas.diesler(a)jboss.com
Date: 2009-04-29 11:18:08 -0400 (Wed, 29 Apr 2009)
New Revision: 88005
Modified:
projects/jboss-osgi/trunk/bundle/deployment/.classpath
projects/jboss-osgi/trunk/bundle/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeployersActivator.java
projects/jboss-osgi/trunk/bundle/pom.xml
Log:
WIP
Modified: projects/jboss-osgi/trunk/bundle/deployment/.classpath
===================================================================
--- projects/jboss-osgi/trunk/bundle/deployment/.classpath 2009-04-29 15:13:38 UTC (rev
88004)
+++ projects/jboss-osgi/trunk/bundle/deployment/.classpath 2009-04-29 15:18:08 UTC (rev
88005)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes"
path="src/main/java"/>
+ <classpathentry excluding="**" kind="src"
output="target/classes" path="src/main/resources"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
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
15:13:38 UTC (rev 88004)
+++
projects/jboss-osgi/trunk/bundle/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeployersActivator.java 2009-04-29
15:18:08 UTC (rev 88005)
@@ -23,9 +23,9 @@
//$Id$
+import java.io.File;
import java.net.URL;
-import org.jboss.deployers.spi.DeploymentException;
import org.jboss.osgi.microcontainer.MicrocontainerService;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -43,7 +43,7 @@
public void start(BundleContext context)
{
- deployersURL =
context.getBundle().getResource("META-INF/jboss-osgi-deployers.xml");
+ //deployersURL =
context.getBundle().getResource("META-INF/jboss-osgi-deployers.xml");
MicrocontainerService service = getMicrocontainerService(context);
if (service == null)
@@ -51,9 +51,10 @@
try
{
+ deployersURL = new
File("src/main/resources/META-INF/jboss-osgi-deployers.xml").toURL();
service.deploy(deployersURL);
}
- catch (DeploymentException ex)
+ catch (Exception ex)
{
throw new IllegalStateException("Cannot deploy: " + deployersURL,
ex);
}
Modified: projects/jboss-osgi/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-29 15:13:38 UTC (rev 88004)
+++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-29 15:18:08 UTC (rev 88005)
@@ -11,7 +11,7 @@
<version>1.0.0.Beta2</version>
</parent>
- <!-- Modules -->
+ <!-- Modules -->
<modules>
<module>blueprint</module>
<module>common</module>
@@ -22,5 +22,13 @@
<module>remotelog</module>
<module>webconsole</module>
</modules>
-
+
+ <!--
+ <modules>
+ <module>blueprint</module>
+ <module>deployment</module>
+ <module>microcontainer</module>
+ </modules>
+ -->
+
</project>