JBoss-OSGI SVN: r100943 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-14 05:08:10 -0500 (Sun, 14 Feb 2010)
New Revision: 100943
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
Log:
Fix equinox AS integration
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-14 09:16:56 UTC (rev 100942)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-14 10:08:10 UTC (rev 100943)
@@ -34,15 +34,15 @@
<!-- logging -->
org.apache.log4j;version=1.2,
- org.jboss.logging;version=2.1,
+ org.jboss.logging;version=2.1,
<!-- jboss -->
- org.jboss.net.protocol,
- 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.jboss.net.protocol,
+ 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,
<!-- jboss-osgi -->
org.jboss.osgi.deployment.common;version=1.0,
@@ -53,9 +53,10 @@
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.spi.util;version=1.0,
- org.osgi.framework;version=1.5
+ <!-- org.osgi -->
+ org.osgi.framework;version=1.5
</value>
</entry>
<!--
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-14 09:16:56 UTC (rev 100942)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-14 10:08:10 UTC (rev 100943)
@@ -31,18 +31,18 @@
javax.xml.bind.annotation;version=2.1,
org.apache.xerces.dom;version=2.9,
org.jnp.interfaces;version=5.0,
-
+
<!-- logging -->
org.apache.log4j;version=1.2,
- org.jboss.logging;version=2.1,
+ org.jboss.logging;version=2.1,
<!-- jboss -->
- org.jboss.net.protocol,
- 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.jboss.net.protocol,
+ 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,
<!-- jboss-osgi -->
org.jboss.osgi.deployment.common;version=1.0,
@@ -53,9 +53,10 @@
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.spi.util;version=1.0,
- org.osgi.framework;version=1.5
+ <!-- org.osgi -->
+ org.osgi.framework;version=1.5
</value>
</entry>
<!--
15 years, 10 months
JBoss-OSGI SVN: r100942 - projects/jboss-osgi/projects/runtime/framework/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-14 04:16:56 -0500 (Sun, 14 Feb 2010)
New Revision: 100942
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
Log:
Fix framework all build
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-13 16:48:59 UTC (rev 100941)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-14 09:16:56 UTC (rev 100942)
@@ -190,6 +190,13 @@
<version>${version.osgi}</version>
</dependency>
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Test bundles dependencies -->
<dependency>
<groupId>org.apache.felix</groupId>
@@ -311,11 +318,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
15 years, 10 months
JBoss-OSGI SVN: r100941 - projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-13 11:48:59 -0500 (Sat, 13 Feb 2010)
New Revision: 100941
Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java
Log:
Remove lifecycle interceptor related service registration
Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java 2010-02-13 16:25:37 UTC (rev 100940)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java 2010-02-13 16:48:59 UTC (rev 100941)
@@ -29,9 +29,7 @@
import org.jboss.osgi.deployment.deployer.DeployerService;
import org.jboss.osgi.deployment.deployer.DeploymentRegistryService;
-import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorService;
import org.jboss.osgi.deployment.internal.DeploymentRegistryServiceImpl;
-import org.jboss.osgi.deployment.internal.LifecycleInterceptorServiceImpl;
import org.jboss.osgi.deployment.internal.SystemDeployerService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -63,10 +61,6 @@
final SystemDeployerService deployerService = new SystemDeployerService(context);
context.registerService(DeployerService.class.getName(), deployerService, props);
- // Register the lifecycle interceptor related services
- LifecycleInterceptorService service = new LifecycleInterceptorServiceImpl(context);
- context.registerService(LifecycleInterceptorService.class.getName(), service, null);
-
// Track other DeployerService implementations and register as MBean
ServiceTracker serviceTracker = new ServiceTracker(context, DeployerService.class.getName(), null)
{
15 years, 10 months
JBoss-OSGI SVN: r100940 - in projects/jboss-osgi/trunk/distribution: installer/src/main/resources/installer and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-13 11:25:37 -0500 (Sat, 13 Feb 2010)
New Revision: 100940
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/distribution/pom.xml
Log:
Dont install aries blueprint. It's now embedded in jboss blueprint
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-13 16:16:28 UTC (rev 100939)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-13 16:25:37 UTC (rev 100940)
@@ -150,7 +150,6 @@
<include name="jboss-osgi-runtime-equinox-sources.jar" />
<include name="jboss-osgi-runtime-felix-sources.jar" />
<include name="jboss-osgi-runtime-jbossas-sources.jar" />
- <include name="jboss-osgi-serviceloader-sources.jar" />
<include name="jboss-osgi-spi-sources.jar" />
<include name="jboss-osgi-webapp-sources.jar" />
<include name="jboss-osgi-webconsole-sources.jar" />
@@ -247,9 +246,7 @@
<include name="jboss-osgi-jaxb.jar" />
<include name="jboss-osgi-jta.jar" />
<include name="jboss-osgi-reflect.jar" />
- <include name="jboss-osgi-serviceloader.jar" />
<include name="jboss-osgi-xml-binding.jar" />
- <include name="org.apache.aries.blueprint.jar" />
<include name="org.apache.aries.util.jar" />
</fileset>
@@ -412,9 +409,7 @@
<include name="jboss-osgi-jndi.jar" />
<include name="jboss-osgi-webconsole.jar" />
<include name="jboss-osgi-reflect.jar" />
- <!-- include name="jboss-osgi-serviceloader.jar" / -->
<include name="jboss-osgi-xml-binding.jar" />
- <include name="org.apache.aries.blueprint.jar" />
<include name="org.apache.aries.util.jar" />
<include name="org.apache.felix.log.jar" />
<include name="pax-web-jetty-bundle.jar" />
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-02-13 16:16:28 UTC (rev 100939)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-02-13 16:25:37 UTC (rev 100940)
@@ -22,6 +22,7 @@
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.deployment.internal;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, \
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-02-13 16:16:28 UTC (rev 100939)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-02-13 16:25:37 UTC (rev 100940)
@@ -22,6 +22,7 @@
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.deployment.internal;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, \
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-13 16:16:28 UTC (rev 100939)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-13 16:25:37 UTC (rev 100940)
@@ -346,10 +346,6 @@
<!-- Aries Dependencies -->
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
</dependency>
15 years, 10 months
JBoss-OSGI SVN: r100939 - in projects/jboss-osgi/projects/bundles/blueprint/trunk: src/main/java/org/jboss/osgi/blueprint/internal and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-13 11:16:28 -0500 (Sat, 13 Feb 2010)
New Revision: 100939
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
Log:
Embed Blueprint API
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-13 15:50:12 UTC (rev 100938)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-13 16:16:28 UTC (rev 100939)
@@ -22,7 +22,7 @@
<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>
- <name>JBossOSGi Reactor - Blueprint</name>
+ <name>JBossOSGi Bundles - Blueprint</name>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-blueprint</artifactId>
@@ -155,7 +155,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.jboss.osgi.blueprint.internal.BlueprintActivator</Bundle-Activator>
<Export-Package>
- org.jboss.osgi.blueprint;version=${version}
+ org.jboss.osgi.blueprint;version=${version},
</Export-Package>
<Import-Package>
javax.xml.parsers,
@@ -166,7 +166,7 @@
org.jboss.logging;version="[2.1,3.0)",
- org.jboss.osgi.deployment.interceptor;version="[1.0,2.0)",
+ org.jboss.osgi.deployment.interceptor;version="[1.0,2.0)";resolution:=optional,
org.jboss.osgi.spi*;version="[1.0,2.0)",
org.osgi.framework,
@@ -181,9 +181,14 @@
!net.sf.cglib*,
!org.objectweb*,
</Import-Package>
+ <Embed-Transitive>true</Embed-Transitive>
<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>
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 15:50:12 UTC (rev 100938)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java 2010-02-13 16:16:28 UTC (rev 100939)
@@ -26,7 +26,6 @@
import org.apache.aries.blueprint.container.BlueprintExtender;
import org.jboss.logging.Logger;
import org.jboss.osgi.blueprint.BlueprintService;
-import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorService;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -51,7 +50,7 @@
BlueprintService service = new BlueprintService(){};
context.registerService(BlueprintService.class.getName(), service, null);
- ServiceReference sref = context.getServiceReference(LifecycleInterceptorService.class.getName());
+ ServiceReference sref = context.getServiceReference("org.jboss.osgi.deployment.interceptor.LifecycleInterceptorService");
if (sref != null)
{
log.debug("Start: " + BlueprintInterceptor.class.getName());
15 years, 10 months
JBoss-OSGI SVN: r100936 - projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-13 10:35:40 -0500 (Sat, 13 Feb 2010)
New Revision: 100936
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/log4j.xml
Log:
Disable trace logging
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 15:24:01 UTC (rev 100935)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/log4j.xml 2010-02-13 15:35:40 UTC (rev 100936)
@@ -32,6 +32,7 @@
<!-- Limit categories -->
<!-- ================ -->
+ <!--
<category name="org.jboss.classloading">
<priority value="TRACE" />
</category>
@@ -40,12 +41,11 @@
<priority value="TRACE" />
</category>
- <category name="org.jboss.osgi">
+ <category name="org.jboss.deployers">
<priority value="TRACE" />
</category>
- <!-- Show jboss deployer traces
- <category name="org.jboss.deployers">
+ <category name="org.jboss.osgi">
<priority value="TRACE" />
</category>
-->
15 years, 10 months
JBoss-OSGI SVN: r100935 - in projects/jboss-osgi/projects/bundles/blueprint/trunk: src/main/java/org/jboss/osgi/blueprint/internal and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-13 10:24:01 -0500 (Sat, 13 Feb 2010)
New Revision: 100935
Added:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintEventDispatcher.java
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintInterceptor.java
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
Log:
[JBOSGI-290] Use LifecycleInterceptor with Aries Blueprint
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-13 14:30:36 UTC (rev 100934)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-13 15:24:01 UTC (rev 100935)
@@ -166,6 +166,7 @@
org.jboss.logging;version="[2.1,3.0)",
+ org.jboss.osgi.deployment.interceptor;version="[1.0,2.0)",
org.jboss.osgi.spi*;version="[1.0,2.0)",
org.osgi.framework,
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 14:30:36 UTC (rev 100934)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java 2010-02-13 15:24:01 UTC (rev 100935)
@@ -26,8 +26,10 @@
import org.apache.aries.blueprint.container.BlueprintExtender;
import org.jboss.logging.Logger;
import org.jboss.osgi.blueprint.BlueprintService;
+import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorService;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
/**
* The Blueprint activator registeres the {@link BlueprintService}
@@ -40,7 +42,8 @@
// Provide logging
private static final Logger log = Logger.getLogger(BlueprintActivator.class);
- BundleActivator ariesActivator;
+ private BundleActivator ariesActivator;
+ private BlueprintInterceptor jbossInterceptor;
public void start(BundleContext context) throws Exception
{
@@ -48,10 +51,19 @@
BlueprintService service = new BlueprintService(){};
context.registerService(BlueprintService.class.getName(), service, null);
- log.debug("Start: " + BlueprintExtender.class.getName());
-
- ariesActivator = new BlueprintExtender();
- ariesActivator.start(context);
+ ServiceReference sref = context.getServiceReference(LifecycleInterceptorService.class.getName());
+ if (sref != null)
+ {
+ log.debug("Start: " + BlueprintInterceptor.class.getName());
+ jbossInterceptor = new BlueprintInterceptor();
+ jbossInterceptor.start(context);
+ }
+ else
+ {
+ log.debug("Start: " + BlueprintExtender.class.getName());
+ ariesActivator = new BlueprintExtender();
+ ariesActivator.start(context);
+ }
}
public void stop(BundleContext context) throws Exception
@@ -61,5 +73,10 @@
log.debug("Stop: " + ariesActivator.getClass().getName());
ariesActivator.stop(context);
}
+ else if (jbossInterceptor != null)
+ {
+ log.debug("Stop: " + jbossInterceptor.getClass().getName());
+ jbossInterceptor.stop(context);
+ }
}
}
\ No newline at end of file
Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintEventDispatcher.java
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintEventDispatcher.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintEventDispatcher.java 2010-02-13 15:24:01 UTC (rev 100935)
@@ -0,0 +1,307 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.blueprint.internal;
+
+//$Id$
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.SynchronousBundleListener;
+import org.osgi.service.blueprint.container.BlueprintEvent;
+import org.osgi.service.blueprint.container.BlueprintListener;
+import org.osgi.service.blueprint.container.EventConstants;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventAdmin;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.aries.blueprint.utils.JavaUtils;
+
+/**
+ * The delivery of {@link BlueprintEvent}s is complicated. The blueprint extender and its containers use this class to
+ * deliver {@link BlueprintEvent}s.
+ *
+ * This is a copy of the Aries BlueprintEventDispatcher which is package protexted
+ *
+ * @version $Rev$Date: 2010-01-06 07:05:04 +0100 (Wed, 06 Jan 2010)
+ */
+class BlueprintEventDispatcher implements BlueprintListener, SynchronousBundleListener {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(BlueprintEventDispatcher.class);
+
+ private final Set<BlueprintListener> listeners = new CopyOnWriteArraySet<BlueprintListener>();
+ private final Map<Bundle, BlueprintEvent> states = new ConcurrentHashMap<Bundle, BlueprintEvent>();
+ private final ExecutorService executor = Executors.newSingleThreadExecutor();
+ private final ExecutorService sharedExecutor;
+ private final EventAdminListener eventAdminListener;
+ private final ServiceTracker containerListenerTracker;
+
+ BlueprintEventDispatcher(final BundleContext bundleContext, ExecutorService sharedExecutor) {
+
+ assert bundleContext != null;
+ assert sharedExecutor != null;
+
+ this.sharedExecutor = sharedExecutor;
+
+ bundleContext.addBundleListener(this);
+
+ EventAdminListener listener = null;
+ try {
+ getClass().getClassLoader().loadClass("org.osgi.service.event.EventAdmin");
+ listener = new EventAdminListener(bundleContext);
+ } catch (Throwable t) {
+ // Ignore, if the EventAdmin package is not available, just don't use it
+ LOGGER.debug("EventAdmin package is not available, just don't use it");
+ }
+ this.eventAdminListener = listener;
+
+ this.containerListenerTracker = new ServiceTracker(bundleContext, BlueprintListener.class.getName(), new ServiceTrackerCustomizer() {
+ public Object addingService(ServiceReference reference) {
+ BlueprintListener listener = (BlueprintListener) bundleContext.getService(reference);
+
+ synchronized (listeners) {
+ sendInitialEvents(listener);
+ listeners.add(listener);
+ }
+
+ return listener;
+ }
+
+ public void modifiedService(ServiceReference reference, Object service) {
+ }
+
+ public void removedService(ServiceReference reference, Object service) {
+ listeners.remove(service);
+ bundleContext.ungetService(reference);
+ }
+ });
+ this.containerListenerTracker.open();
+ }
+
+ private void sendInitialEvents(BlueprintListener listener) {
+ for (Map.Entry<Bundle, BlueprintEvent> entry : states.entrySet()) {
+ try {
+ callListener(listener, new BlueprintEvent(entry.getValue(), true));
+ } catch (RejectedExecutionException ree) {
+ LOGGER.warn("Executor shut down", ree);
+ break;
+ }
+ }
+ }
+
+ public void blueprintEvent(final BlueprintEvent event) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Sending blueprint container event {} for bundle {}", toString(event), event.getBundle().getSymbolicName());
+ }
+
+ synchronized (listeners) {
+ callListeners(event);
+ states.put(event.getBundle(), event);
+ }
+
+ if (eventAdminListener != null) {
+ try {
+ sharedExecutor.submit(new Runnable() {
+ public void run() {
+ eventAdminListener.blueprintEvent(event);
+ }
+ });
+ } catch (RejectedExecutionException ree) {
+ LOGGER.warn("Executor shut down", ree);
+ }
+ }
+ }
+
+ @SuppressWarnings({"ThrowableResultOfMethodCallIgnored"})
+ private static String toString(BlueprintEvent event) {
+ return "BlueprintEvent[type=" + getEventType(event.getType())
+ + (event.getDependencies() != null ? ", dependencies=" + Arrays.asList(event.getDependencies()) : "")
+ + (event.getCause() != null ? ", exception=" + event.getCause().getMessage() : "")
+ + "]";
+ }
+
+ private static String getEventType(int type) {
+ switch (type) {
+ case BlueprintEvent.CREATING:
+ return "CREATING";
+ case BlueprintEvent.CREATED:
+ return "CREATED";
+ case BlueprintEvent.DESTROYING:
+ return "DESTROYING";
+ case BlueprintEvent.DESTROYED:
+ return "DESTROYED";
+ case BlueprintEvent.FAILURE:
+ return "FAILURE";
+ case BlueprintEvent.GRACE_PERIOD:
+ return "GRACE_PERIOD";
+ case BlueprintEvent.WAITING:
+ return "WAITING";
+ default:
+ return "UNKNOWN";
+ }
+ }
+
+ private void callListeners(BlueprintEvent event) {
+ for (final BlueprintListener listener : listeners) {
+ try {
+ callListener(listener, event);
+ } catch (RejectedExecutionException ree) {
+ LOGGER.warn("Executor shut down", ree);
+ break;
+ }
+ }
+ }
+
+ private void callListener(final BlueprintListener listener, final BlueprintEvent event) throws RejectedExecutionException {
+ try {
+ executor.invokeAny(Collections.<Callable<Void>>singleton(new Callable<Void>() {
+ public Void call() throws Exception {
+ listener.blueprintEvent(event);
+ return null;
+ }
+ }), 60L, TimeUnit.SECONDS);
+ } catch (InterruptedException ie) {
+ LOGGER.warn("Thread interrupted", ie);
+ Thread.currentThread().interrupt();
+ } catch (TimeoutException te) {
+ LOGGER.warn("Listener timed out, will be ignored", te);
+ listeners.remove(listener);
+ } catch (ExecutionException ee) {
+ LOGGER.warn("Listener caused an exception, will be ignored", ee);
+ listeners.remove(listener);
+ }
+ }
+
+ void destroy() {
+ executor.shutdown();
+ // wait for the queued tasks to execute
+ try {
+ executor.awaitTermination(60, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ // ignore
+ }
+ containerListenerTracker.close();
+ // clean up the EventAdmin tracker if we're using that
+ if (eventAdminListener != null) {
+ eventAdminListener.destroy();
+ }
+ }
+
+ public void bundleChanged(BundleEvent event) {
+ if (BundleEvent.STOPPING == event.getType()) {
+ states.remove(event.getBundle());
+ }
+ }
+
+ private static class EventAdminListener implements BlueprintListener {
+
+ private final ServiceTracker tracker;
+
+ EventAdminListener(BundleContext context) {
+ tracker = new ServiceTracker(context, EventAdmin.class.getName(), null);
+ tracker.open();
+ }
+
+ @SuppressWarnings({"ThrowableResultOfMethodCallIgnored"})
+ public void blueprintEvent(BlueprintEvent event) {
+ EventAdmin eventAdmin = (EventAdmin) tracker.getService();
+ if (eventAdmin == null) {
+ return;
+ }
+
+ Dictionary<String, Object> props = new Hashtable<String, Object>();
+ props.put(EventConstants.TYPE, event.getType());
+ props.put(EventConstants.EVENT, event);
+ props.put(EventConstants.TIMESTAMP, event.getTimestamp());
+ props.put(EventConstants.BUNDLE, event.getBundle());
+ props.put(EventConstants.BUNDLE_SYMBOLICNAME, event.getBundle().getSymbolicName());
+ props.put(EventConstants.BUNDLE_ID, event.getBundle().getBundleId());
+ props.put(EventConstants.BUNDLE_VERSION, JavaUtils.getBundleVersion(event.getBundle()));
+ props.put(EventConstants.EXTENDER_BUNDLE, event.getExtenderBundle());
+ props.put(EventConstants.EXTENDER_BUNDLE_ID, event.getExtenderBundle().getBundleId());
+ props.put(EventConstants.EXTENDER_BUNDLE_SYMBOLICNAME, event.getExtenderBundle().getSymbolicName());
+ props.put(EventConstants.EXTENDER_BUNDLE_VERSION, JavaUtils.getBundleVersion(event.getExtenderBundle()));
+
+ if (event.getCause() != null) {
+ props.put(EventConstants.CAUSE, event.getCause());
+ }
+ if (event.getDependencies() != null) {
+ props.put(EventConstants.DEPENDENCIES, event.getDependencies());
+ }
+ String topic;
+ switch (event.getType()) {
+ case BlueprintEvent.CREATING:
+ topic = EventConstants.TOPIC_CREATING;
+ break;
+ case BlueprintEvent.CREATED:
+ topic = EventConstants.TOPIC_CREATED;
+ break;
+ case BlueprintEvent.DESTROYING:
+ topic = EventConstants.TOPIC_DESTROYING;
+ break;
+ case BlueprintEvent.DESTROYED:
+ topic = EventConstants.TOPIC_DESTROYED;
+ break;
+ case BlueprintEvent.FAILURE:
+ topic = EventConstants.TOPIC_FAILURE;
+ break;
+ case BlueprintEvent.GRACE_PERIOD:
+ topic = EventConstants.TOPIC_GRACE_PERIOD;
+ break;
+ case BlueprintEvent.WAITING:
+ topic = EventConstants.TOPIC_WAITING;
+ break;
+ default:
+ throw new IllegalStateException("Unknown blueprint event type: " + event.getType());
+ }
+ eventAdmin.postEvent(new Event(topic, props));
+ }
+
+ /**
+ * Perform cleanup at Blueprint extender shutdown.
+ */
+ public void destroy() {
+ tracker.close();
+ }
+
+ }
+}
Property changes on: projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintEventDispatcher.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintInterceptor.java
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintInterceptor.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintInterceptor.java 2010-02-13 15:24:01 UTC (rev 100935)
@@ -0,0 +1,137 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.blueprint.internal;
+
+//$Id$
+
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
+import org.apache.aries.blueprint.BlueprintConstants;
+import org.apache.aries.blueprint.container.BlueprintContainerImpl;
+import org.apache.aries.blueprint.container.NamespaceHandlerRegistry;
+import org.apache.aries.blueprint.namespace.NamespaceHandlerRegistryImpl;
+import org.jboss.osgi.deployment.interceptor.AbstractLifecycleInterceptor;
+import org.jboss.osgi.deployment.interceptor.InvocationContext;
+import org.jboss.osgi.deployment.interceptor.LifecycleInterceptor;
+import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorException;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The Blueprint interceptor
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 20-Oct-2009
+ */
+public class BlueprintInterceptor extends AbstractLifecycleInterceptor implements LifecycleInterceptor
+{
+ // Provide logging
+ private Logger log = LoggerFactory.getLogger(BlueprintInterceptor.class);
+
+ private Map<Bundle, BlueprintContainerImpl> containers;
+ private BlueprintEventDispatcher eventDispatcher;
+ private NamespaceHandlerRegistry handlers;
+ private ScheduledExecutorService executors;
+
+ public void start(BundleContext context)
+ {
+ containers = new HashMap<Bundle, BlueprintContainerImpl>();
+ handlers = new NamespaceHandlerRegistryImpl(context);
+ executors = Executors.newScheduledThreadPool(3);
+ eventDispatcher = new BlueprintEventDispatcher(context, executors);
+
+ context.registerService(LifecycleInterceptor.class.getName(), this, null);
+ }
+
+ public void stop(BundleContext context)
+ {
+ for (Bundle bundle : containers.keySet())
+ {
+ BlueprintContainerImpl blueprintContainer = containers.remove(bundle);
+ blueprintContainer.destroy();
+ }
+ }
+
+ public void invoke(int state, InvocationContext context) throws LifecycleInterceptorException
+ {
+ Bundle bundle = context.getBundle();
+ if (state == Bundle.STARTING)
+ {
+ // If a Bundle-Blueprint manifest header is defined, then this header contains a list of paths.
+ // If this header is not defined, then resources ending in .xml in the bundle’s
+ // OSGI-INF/blueprint directory must be used. These are the resources that
+ // would be found by calling the Bundle findEntries("OSGI-INF/blueprint", "*.xml", false) method.
+
+ List<Object> pathList = new ArrayList<Object>();
+
+ String descriptorPaths = (String)bundle.getHeaders().get(BlueprintConstants.BUNDLE_BLUEPRINT_HEADER);
+ if (descriptorPaths != null)
+ {
+ StringTokenizer tokenizer = new StringTokenizer(descriptorPaths, ",");
+ while (tokenizer.hasMoreTokens())
+ {
+ String path = tokenizer.nextToken();
+ pathList.add(path.trim());
+ }
+ }
+ else
+ {
+ Enumeration<?> foundEntries = bundle.findEntries("OSGI-INF/blueprint", "*.xml", false);
+ if (foundEntries != null)
+ {
+ while (foundEntries.hasMoreElements())
+ {
+ String path = foundEntries.nextElement().toString();
+ int index = path.indexOf("OSGI-INF/blueprint");
+ pathList.add(path.substring(index));
+ }
+ }
+ }
+
+ if (pathList.isEmpty() == false)
+ {
+ log.debug("Create blueprint container");
+ BlueprintContainerImpl blueprintContainer = new BlueprintContainerImpl(bundle.getBundleContext(), context.getBundle(), eventDispatcher, handlers, executors, pathList);
+ containers.put(bundle, blueprintContainer);
+ blueprintContainer.schedule();
+ }
+ }
+ else if (state == Bundle.STOPPING)
+ {
+ BlueprintContainerImpl blueprintContainer = containers.remove(bundle);
+ if (blueprintContainer != null)
+ {
+ log.debug("Stop blueprint container");
+ blueprintContainer.destroy();
+ }
+ }
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintInterceptor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 10 months
JBoss-OSGI SVN: r100934 - in projects/jboss-osgi: trunk/testsuite and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-13 09:30:36 -0500 (Sat, 13 Feb 2010)
New Revision: 100934
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Use jboss-logging-log4j in scope test
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-13 14:29:10 UTC (rev 100933)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-13 14:30:36 UTC (rev 100934)
@@ -178,13 +178,6 @@
<version>${version.jboss.osgi.deployment}</version>
</dependency>
- <!-- Provided Dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
@@ -197,24 +190,6 @@
<version>${version.osgi}</version>
</dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>${version.jboss.test}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- Test bundles dependencies -->
<dependency>
<groupId>org.apache.felix</groupId>
@@ -318,6 +293,30 @@
<version>${version.ops4j.pax.web}</version>
<scope>test</scope>
</dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${version.jboss.test}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-13 14:29:10 UTC (rev 100933)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-13 14:30:36 UTC (rev 100934)
@@ -219,6 +219,11 @@
</exclusions>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Build -->
@@ -305,10 +310,6 @@
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-framework</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </dependency>
</dependencies>
</profile>
<profile>
@@ -323,10 +324,6 @@
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-framework</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </dependency>
</dependencies>
</profile>
15 years, 10 months
JBoss-OSGI SVN: r100933 - in projects/jboss-osgi/projects/bundles/blueprint/trunk: src/main/java/org/jboss/osgi/blueprint/internal and 5 other directories.
by jboss-osgi-commits＠lists.jboss.org
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" />
15 years, 10 months
JBoss-OSGI SVN: r100932 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/runtime/conf and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-13 08:23:52 -0500 (Sat, 13 Feb 2010)
New Revision: 100932
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
Log:
Remove org.jboss.osgi.testing from system cp
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-13 13:11:01 UTC (rev 100931)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-13 13:23:52 UTC (rev 100932)
@@ -53,8 +53,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
org.osgi.framework;version=1.5
</value>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-13 13:11:01 UTC (rev 100931)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-13 13:23:52 UTC (rev 100932)
@@ -53,8 +53,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
org.osgi.framework;version=1.5
</value>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-13 13:11:01 UTC (rev 100931)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-13 13:23:52 UTC (rev 100932)
@@ -43,8 +43,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>
<!-- Husky socket connector properties -->
<entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-02-13 13:11:01 UTC (rev 100931)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-02-13 13:23:52 UTC (rev 100932)
@@ -28,7 +28,6 @@
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.virtual;version=2.1, \
org.jboss.virtual.plugins.registry;version=2.1, \
org.jboss.virtual.plugins.context.jar;version=2.1, \
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-02-13 13:11:01 UTC (rev 100931)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-02-13 13:23:52 UTC (rev 100932)
@@ -28,7 +28,6 @@
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.virtual;version=2.1, \
org.jboss.virtual.plugins.registry;version=2.1, \
org.jboss.virtual.plugins.context.jar;version=2.1, \
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-13 13:11:01 UTC (rev 100931)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-13 13:23:52 UTC (rev 100932)
@@ -40,8 +40,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>
<!-- Hot Deployment -->
<entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</value></entry>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13 13:11:01 UTC (rev 100931)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13 13:23:52 UTC (rev 100932)
@@ -37,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;version=1.0
+ org.jboss.osgi.spi.util;version=1.0
</value></entry>
</map>
</property>
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13 13:11:01 UTC (rev 100931)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13 13:23:52 UTC (rev 100932)
@@ -37,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;version=1.0
+ org.jboss.osgi.spi.util;version=1.0
</value></entry>
</map>
</property>
15 years, 10 months