2:18 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-04-29 03:17:59 -0400 (Wed, 29 Apr 2009)
New Revision: 87983
Modified:
projects/jboss-osgi/trunk/bundle/blueprint/pom.xml
projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/deployment/DeploymentServiceTestCase.java
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties
projects/jboss-osgi/trunk/bundle/deployment/pom.xml
projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml
projects/jboss-osgi/trunk/bundle/pom.xml
Log:
DeploymentService start - ok
Modified: projects/jboss-osgi/trunk/bundle/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-29 06:20:29 UTC (rev
87982)
+++ projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-29 07:17:59 UTC (rev
87983)
@@ -39,19 +39,23 @@
<!-- Bundle Dependencies -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version}</version>
+ <artifactId>apache-xerces-bundle</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-logging</artifactId>
+ <artifactId>jboss-common-core-bundle</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-microcontainer</artifactId>
+ <artifactId>jboss-osgi-deployment</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
@@ -63,12 +67,14 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>apache-xerces-bundle</artifactId>
+ <artifactId>jboss-osgi-logging</artifactId>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-common-core-bundle</artifactId>
+ <artifactId>jboss-osgi-microcontainer</artifactId>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml 2009-04-29
06:20:29 UTC (rev 87982)
+++ projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml 2009-04-29
07:17:59 UTC (rev 87983)
@@ -19,6 +19,7 @@
<include>*:org.apache.felix.log:jar</include>
<include>*:org.osgi.compendium:jar</include>
<include>*:jboss-osgi-common:jar</include>
+ <include>*:jboss-osgi-deployment:jar</include>
<include>*:jboss-osgi-logging:jar</include>
<include>*:jboss-osgi-microcontainer:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
Modified:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/deployment/DeploymentServiceTestCase.java
===================================================================
---
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/deployment/DeploymentServiceTestCase.java 2009-04-29
06:20:29 UTC (rev 87982)
+++
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/deployment/DeploymentServiceTestCase.java 2009-04-29
07:17:59 UTC (rev 87983)
@@ -43,8 +43,8 @@
{
BundleContext sysContext = framework.getSystemBundleContext();
- //Bundle bundle = installBundle(sysContext,
"bundles/jboss-osgi-deployment.jar", true);
- //assertEquals("Test bundle ACTIVE", Bundle.ACTIVE,
bundle.getState());
+ Bundle bundle = installBundle(sysContext,
"bundles/jboss-osgi-deployment.jar", true);
+ assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
}
finally
Modified:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties
===================================================================
---
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-04-29
06:20:29 UTC (rev 87982)
+++
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-04-29
07:17:59 UTC (rev 87983)
@@ -17,14 +17,14 @@
javax.naming.spi, \
javax.net, \
javax.net.ssl, \
+ javax.xml.bind, \
javax.xml.bind.annotation, \
javax.xml.bind.annotation.adapters, \
javax.xml.namespace, \
- javax.xml.parsers, \
- javax.xml.transform, \
- javax.xml.transform.sax, \
org.jboss.logging, \
- org.osgi.framework; version=1.4
+ org.jboss.osgi.spi.management, \
+ org.osgi.framework; version=1.4, \
+ org.osgi.service.packageadmin; version=1.2
# Bundles that need to be installed with the Framework automatically
framework.autoInstall=\
Modified: projects/jboss-osgi/trunk/bundle/deployment/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/deployment/pom.xml 2009-04-29 06:20:29 UTC (rev
87982)
+++ projects/jboss-osgi/trunk/bundle/deployment/pom.xml 2009-04-29 07:17:59 UTC (rev
87983)
@@ -25,14 +25,13 @@
<artifactId>jboss-osgi-spi</artifactId>
<version>${version}</version>
</dependency>
-
- <!-- Provided DEpendencies -->
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-microcontainer</artifactId>
<version>${version}</version>
- <scope>provided</scope>
</dependency>
+
+ <!-- Provided Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -74,21 +73,22 @@
org.jboss.osgi.deployment.internal
</Private-Package>
<Import-Package>
+ <!-- system -->
javax.management,
- org.jboss.dependency.plugins,
- org.jboss.dependency.spi,
+
+ <!-- import -->
+ org.jboss.dependency.*,
org.jboss.deployers.*,
org.jboss.logging,
org.jboss.osgi.common.log,
org.jboss.osgi.spi.management,
- org.jboss.virtual,
+ org.jboss.virtual,
+
+ <!-- osgi -->
org.osgi.framework,
org.osgi.service.log,
org.osgi.service.packageadmin
</Import-Package>
- <Embed-Transitive>true</Embed-Transitive>
- <Embed-Dependency>
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml 2009-04-29 06:20:29 UTC (rev
87982)
+++ projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml 2009-04-29 07:17:59 UTC (rev
87983)
@@ -89,10 +89,9 @@
<!-- system -->
javax.management,
javax.naming*,
- javax.xml.bind.*,
- javax.xml.namespace,
- javax.xml.parsers,
- org.w3c.dom,
+ javax.xml.*,
+ org.w3c.dom,
+ org.xml.sax,
<!-- osgi -->
org.osgi.framework,
@@ -104,6 +103,7 @@
org.jboss.beans.*,
org.jboss.classadapter.spi,
org.jboss.config.*,
+ org.jboss.deployers.*,
org.jboss.joinpoint.*,
org.jboss.logging,
org.jboss.osgi.common.log,
@@ -115,18 +115,36 @@
<!-- optional -->
<!-- exclude -->
- !org.apache.commons.httpclient,
- !org.apache.webdav.lib,
- !org.jboss.test.*
+ !org.jboss.test.*,
+ !junit*,
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
<Embed-Dependency>
+ jboss-classloader;inline=false,
+ jboss-classloading;inline=false,
+ jboss-classloading-spi;inline=false,
+ jboss-classloading-vfs;inline=false,
jboss-dependency;inline=false,
+ jboss-deployers-client-spi;inline=false,
+ jboss-deployers-client;inline=false,
+ jboss-deployers-core-spi;inline=false,
+ jboss-deployers-core;inline=false,
+ jboss-deployers-impl;inline=false,
+ jboss-deployers-spi;inline=false,
+ jboss-deployers-structure-spi;inline=false,
+ jboss-deployers-vfs-spi;inline=false,
+ jboss-deployers-vfs;inline=false,
jboss-managed;inline=false,
jboss-metatype;inline=false,
jboss-mdr;inline=false,
jboss-kernel;inline=false,
+ jboss-vfs;inline=false,
</Embed-Dependency>
+ <_exportcontents>
+ org.jboss.virtual,
+ org.jboss.dependency.*,
+ org.jboss.deployers.*,
+ </_exportcontents>
</instructions>
</configuration>
</plugin>
Modified: projects/jboss-osgi/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-29 06:20:29 UTC (rev 87982)
+++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-29 07:17:59 UTC (rev 87983)
@@ -15,12 +15,12 @@
<modules>
<module>blueprint</module>
<module>common</module>
- <!-- module>deployment</module -->
+ <module>deployment</module>
<module>jmx</module>
<module>logging</module>
<module>microcontainer</module>
<module>remotelog</module>
<module>webconsole</module>
</modules>
-
+
</project>