8:29 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2010-02-13 09:29:10 -0500 (Sat, 13 Feb 2010)
New Revision: 100933
Removed:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/resources/schema/
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/java/org/jboss/test/osgi/blueprint/parser/
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/jboss-osgi-framework.properties
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/log4j.xml
Log:
Use embedded aries BP core
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-13 13:23:52 UTC
(rev 100932)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-13 14:29:10 UTC
(rev 100933)
@@ -11,6 +11,14 @@
<!-- $Id$ -->
+ <!--
+ Set these VM properties in your IDE debugger
+
+ -Dlog4j.output.dir=${workspace_loc:jboss-osgi-blueprint/target}
+ -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.AbstractInvoker
+ -Dtest.archive.directory=${workspace_loc:jboss-osgi-blueprint/target}/test-libs
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -38,10 +46,10 @@
<!-- Properties -->
<properties>
-
<version.apache.aries.blueprint>1.0.0.20100120</version.apache.aries.blueprint>
- <version.apache.aries.util>1.0.0.20100120</version.apache.aries.util>
+
<version.apache.aries.blueprint>1.0.0-incubating-SNAPSHOT</version.apache.aries.blueprint>
+
<version.apache.aries.util>1.0.0-incubating-SNAPSHOT</version.apache.aries.util>
<version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
-
<version.jboss.osgi.framework>1.0.0.Alpha3</version.jboss.osgi.framework>
+
<version.jboss.osgi.framework>1.0.0.Alpha4-SNAPSHOT</version.jboss.osgi.framework>
<version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
<version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
@@ -67,12 +75,6 @@
<!-- Provided Dependencies -->
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>${version.apache.aries.blueprint}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
<version>${version.apache.aries.blueprint}</version>
<scope>provided</scope>
@@ -135,6 +137,11 @@
</dependency>
<!-- Test Dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Build -->
@@ -148,19 +155,23 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.jboss.osgi.blueprint.internal.BlueprintActivator</Bundle-Activator>
<Export-Package>
- org.jboss.osgi.blueprint;version=${version},
- org.osgi.service.blueprint*;version="1.0"
+ org.jboss.osgi.blueprint;version=${version}
</Export-Package>
<Import-Package>
javax.xml.parsers,
javax.xml.transform*,
javax.xml.validation,
- org.apache.aries.util.tracker;version="[1.0,1.1)",
- org.jboss.osgi.spi*;version="[1.0,1.1)",
+ org.apache.aries.util.tracker;version="[1.0,2.0)",
+
+ org.jboss.logging;version="[2.1,3.0)",
+
+ org.jboss.osgi.spi*;version="[1.0,2.0)",
+
org.osgi.framework,
- org.osgi.service.event,
- org.osgi.util.tracker,
+ org.osgi.service.blueprint*;version="[1.0,2.0)",
+ org.osgi.service.event;version="[1.2,2.0)",
+ org.osgi.util.tracker;version="[1.4,2.0)",
org.slf4j,
org.w3c.dom,
@@ -170,39 +181,12 @@
!org.objectweb*,
</Import-Package>
<Embed-Dependency>
- org.apache.aries.blueprint.api;inline=false,
org.apache.aries.blueprint.core;inline=false,
</Embed-Dependency>
- <_exportcontents>
- org.osgi.service.blueprint*;version=1.0
- </_exportcontents>
</instructions>
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <!-- For some reason the distribution javadoc module needs this
-->
- <file>target/${artifactId}-${version}-sources.jar</file>
- <classifier>sources</classifier>
- <type>jar</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java
===================================================================
---
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java 2010-02-13
13:23:52 UTC (rev 100932)
+++
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java 2010-02-13
14:29:10 UTC (rev 100933)
@@ -24,6 +24,7 @@
//$Id$
import org.apache.aries.blueprint.container.BlueprintExtender;
+import org.jboss.logging.Logger;
import org.jboss.osgi.blueprint.BlueprintService;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -36,15 +37,19 @@
*/
public class BlueprintActivator implements BundleActivator
{
+ // Provide logging
+ private static final Logger log = Logger.getLogger(BlueprintActivator.class);
+
BundleActivator ariesActivator;
-
public void start(BundleContext context) throws Exception
{
// Register the marker service
BlueprintService service = new BlueprintService(){};
context.registerService(BlueprintService.class.getName(), service, null);
+ log.debug("Start: " + BlueprintExtender.class.getName());
+
ariesActivator = new BlueprintExtender();
ariesActivator.start(context);
}
@@ -52,6 +57,9 @@
public void stop(BundleContext context) throws Exception
{
if (ariesActivator != null)
+ {
+ log.debug("Stop: " + ariesActivator.getClass().getName());
ariesActivator.stop(context);
+ }
}
}
\ No newline at end of file
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
---
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13
13:23:52 UTC (rev 100932)
+++
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13
14:29:10 UTC (rev 100933)
@@ -19,23 +19,17 @@
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
- <!-- [JBOSGI-145] JAXB classes are loaded from the system classpath -->
- com.sun.xml.internal.bind.v2,
-
- <!-- loging -->
+ <!-- logging -->
org.apache.log4j;version=1.2,
- org.slf4j;version=1.5,
+ org.jboss.logging;version=2.1,
<!-- jboss -->
- org.jboss.beans.metadata.plugins;version=2.0,
- org.jboss.beans.metadata.plugins.builder;version=2.0,
- org.jboss.beans.metadata.spi;version=2.0,
- org.jboss.beans.metadata.spi.builder;version=2.0,
- org.jboss.dependency.spi;version=2.0,
- org.jboss.kernel.spi.dependency;version=2.0,
- org.jboss.logging;version=2.0,
- org.jboss.reflect.spi;version=2.0,
- org.jboss.util;version=2.2,
+ org.jboss.beans.metadata.plugins;version=2.2,
+ org.jboss.beans.metadata.plugins.builder;version=2.2,
+ org.jboss.beans.metadata.spi;version=2.2,
+ org.jboss.beans.metadata.spi.builder;version=2.2,
+ org.jboss.dependency.spi;version=2.2,
+ org.jboss.kernel.spi.dependency;version=2.2,
<!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
@@ -43,8 +37,7 @@
org.jboss.osgi.spi.framework;version=1.0,
org.jboss.osgi.spi.management;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
- org.jboss.osgi.spi.util;version=1.0,
- org.jboss.osgi.testing,
+ org.jboss.osgi.spi.util;version=1.0
</value></entry>
</map>
</property>
@@ -73,17 +66,25 @@
</list>
</property>
</bean>
+ <!--
+ <bean name="OSGiBundleResolver"
class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
+ </bean>
+ -->
<bean name="OSGiControllerContextPlugin"
class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl">
<constructor>
<parameter><inject bean="OSGiBundleManager"
/></parameter>
- <parameter><inject bean="DeploymentRegistry"
/></parameter>
+ <parameter><inject bean="OSGiDeploymentRegistry"
/></parameter>
</constructor>
</bean>
<bean name="OSGiFrameworkEventsPlugin"
class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
</bean>
<bean name="OSGiServiceManager"
class="org.jboss.osgi.framework.bundle.ServiceManagerPluginImpl">
- <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
+ <constructor>
+ <parameter><inject bean="OSGiBundleManager"
/></parameter>
+ <parameter><inject bean="OSGiDeploymentRegistry"
/></parameter>
+ </constructor>
</bean>
<bean name="OSGiStoragePlugin"
class="org.jboss.osgi.framework.plugins.internal.BundleStoragePluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
@@ -119,6 +120,18 @@
<!--
********************************
* *
+ * OSGi Interceptors *
+ * *
+ ********************************
+
+ <bean name="WebXMLVerifier"
class="org.jboss.osgi.framework.service.internal.WebXMLVerifierInterceptor">
+ <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
+ </bean>
+ -->
+
+ <!--
+ ********************************
+ * *
* OSGi Deployment *
* *
********************************
@@ -131,7 +144,7 @@
</bean>
<!-- The deployment registry -->
- <bean name="DeploymentRegistry"
class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
+ <bean name="OSGiDeploymentRegistry"
class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
<!-- The holder for deployers that determine structure -->
<bean name="StructuralDeployers"
class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
@@ -166,7 +179,7 @@
<constructor>
<parameter class="org.jboss.dependency.spi.Controller"><inject
bean="jboss.kernel:service=KernelController" /></parameter>
</constructor>
- <property name="deploymentRegistry"><inject
bean="DeploymentRegistry"/></property>
+ <property name="deploymentRegistry"><inject
bean="OSGiDeploymentRegistry"/></property>
</bean>
<!-- OSGI Deployment -->
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
===================================================================
---
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2010-02-13
13:23:52 UTC (rev 100932)
+++
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2010-02-13
14:29:10 UTC (rev 100933)
@@ -1,3 +1 @@
org.jboss.osgi.framework.launch.OSGiFrameworkBootstrapProvider # The MC Framework
bootstrap provider
-org.jboss.osgi.equinox.EquinoxBootstrapProvider # The Equinox bootstrap
provider
-org.jboss.osgi.felix.FelixBootstrapProvider # The Felix bootstrap
provider
\ No newline at end of file
Deleted:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/jboss-osgi-framework.properties
===================================================================
---
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/jboss-osgi-framework.properties 2010-02-13
13:23:52 UTC (rev 100932)
+++
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/jboss-osgi-framework.properties 2010-02-13
14:29:10 UTC (rev 100933)
@@ -1,42 +0,0 @@
-#
-# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
-#
-# $Id$
-#
-
-# Properties to configure the Framework
-org.osgi.framework.storage=${test.archive.directory}/../osgi-store
-org.osgi.framework.storage.clean=onFirstInit
-
-# Framework bootdelegation
-# org.osgi.framework.bootdelegation=org.osgi.service.log
-
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.apache.log4j;version=1.2, \
- org.jboss.logging, \
- org.jboss.osgi.deployment.common;version=1.0, \
- org.jboss.osgi.deployment.deployer;version=1.0, \
- org.jboss.osgi.deployment.interceptor;version=1.0, \
- org.jboss.osgi.spi;version=1.0, \
- org.jboss.osgi.spi.capability;version=1.0, \
- org.jboss.osgi.spi.framework;version=1.0, \
- org.jboss.osgi.spi.management;version=1.0, \
- org.jboss.osgi.spi.service;version=1.0, \
- org.jboss.osgi.spi.util;version=1.0, \
- org.jboss.osgi.testing;version=1.0, \
- org.jboss.virtual;version=2.1, \
- org.jboss.virtual.plugins.registry;version=2.1, \
- org.jboss.virtual.plugins.context.jar;version=2.1, \
- org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
- org.jboss.virtual.protocol;version=2.1, \
- org.osgi.framework;version=1.4
-
-# Bundles that need to be installed with the Framework automatically
-org.jboss.osgi.spi.framework.autoInstall=\
- file://${test.archive.directory}/bundles/org.osgi.compendium.jar
-
-# Bundles that need to be started automatically
-org.jboss.osgi.spi.framework.autoStart=\
- file://${test.archive.directory}/bundles/jboss-osgi-common.jar
-
\ No newline at end of file
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/log4j.xml
===================================================================
---
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/log4j.xml 2010-02-13
13:23:52 UTC (rev 100932)
+++
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/log4j.xml 2010-02-13
14:29:10 UTC (rev 100933)
@@ -32,6 +32,18 @@
<!-- Limit categories -->
<!-- ================ -->
+ <category name="org.jboss.classloading">
+ <priority value="TRACE" />
+ </category>
+
+ <category name="org.jboss.classloader">
+ <priority value="TRACE" />
+ </category>
+
+ <category name="org.jboss.osgi">
+ <priority value="TRACE" />
+ </category>
+
<!-- Show jboss deployer traces
<category name="org.jboss.deployers">
<priority value="TRACE" />