Author: gnodet
Date: Tue Sep 1 06:44:18 2009
New Revision: 809851
URL: http://svn.apache.org/viewvc?rev=809851&view=rev
Log:
Switch a few more things to blueprint
Added:
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/OSGI-INF/
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/OSGI-INF/blueprint/
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml
- copied, changed from r807663,
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml
servicemix/sandbox/karaf/nmr/nmr/management/src/main/resources/OSGI-INF/
servicemix/sandbox/karaf/nmr/nmr/management/src/main/resources/OSGI-INF/blueprint/
servicemix/sandbox/karaf/nmr/nmr/management/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-management.xml
- copied, changed from r807663,
servicemix/sandbox/karaf/nmr/nmr/management/src/main/resources/META-INF/spring/servicemix-nmr-management.xml
Removed:
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/META-INF/
servicemix/sandbox/karaf/nmr/nmr/management/src/main/resources/META-INF/
Modified:
servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/config.properties
servicemix/sandbox/karaf/nmr/jbi/deployer/pom.xml
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ManagementAgent.java
servicemix/sandbox/karaf/nmr/jbi/itests/pom.xml
servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/java/org/apache/servicemix/jbi/osgi/NMRWrapper.java
servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml
servicemix/sandbox/karaf/nmr/nmr/core/src/test/java/org/apache/servicemix/nmr/core/FrameworkUtil.java
servicemix/sandbox/karaf/nmr/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementEndpointRegistry.java
servicemix/sandbox/karaf/nmr/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/OsgiServiceRegistryTracker.java
servicemix/sandbox/karaf/nmr/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
servicemix/sandbox/karaf/nmr/pom.xml
servicemix/sandbox/karaf/nmr/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/FrameworkUtil.java
Modified:
servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/config.properties
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/config.properties?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/config.properties
(original)
+++
servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/config.properties
Tue Sep 1 06:44:18 2009
@@ -22,8 +22,8 @@
#
karaf.framework=felix
-karaf.framework.equinox=system/org/eclipse/osgi/3.5.0.v20090520/osgi-3.5.0.v20090520.jar
-karaf.framework.felix=system/org/apache/felix/org.apache.felix.framework/1.9.0-SNAPSHOT/org.apache.felix.framework-1.9.0-SNAPSHOT.jar
+karaf.framework.equinox=system/org/eclipse/osgi/${equinox.version}/osgi-${equinox.version}.jar
+karaf.framework.felix=system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
#
# Framework config properties.
@@ -58,10 +58,9 @@
#
# FileMonitor properties
#
-org.apache.felix.karaf.filemonitor.configDir = ${karaf.base}/etc
-org.apache.felix.karaf.filemonitor.monitorDir = ${karaf.base}/deploy
-org.apache.felix.karaf.filemonitor.generatedJarDir =
${karaf.base}/data/generated-bundles
-org.apache.felix.karaf.filemonitor.scanInterval = 500
+felix.fileinstall.dir = ${karaf.base}/etc
+felix.fileinstall.filter = .*\\.cfg
+felix.fileinstall.poll = 1000
#
Modified: servicemix/sandbox/karaf/nmr/jbi/deployer/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/deployer/pom.xml?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/jbi/deployer/pom.xml (original)
+++ servicemix/sandbox/karaf/nmr/jbi/deployer/pom.xml Tue Sep 1 06:44:18 2009
@@ -41,9 +41,8 @@
<artifactId>org.apache.servicemix.jbi.runtime</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.deployer</groupId>
-
<artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
Modified:
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java
(original)
+++
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/handler/JBIDeploymentListener.java
Tue Sep 1 06:44:18 2009
@@ -25,14 +25,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.jbi.deployer.descriptor.DescriptorFactory;
-import org.apache.felix.karaf.deployer.filemonitor.DeploymentListener;
+import org.apache.felix.fileinstall.listener.ArtifactTransformer;
/**
* A JBI DeploymentListener which transforms plain JBI artifacts to OSGi
bundles.
* The deployer will recognize zip and jar files containing a JBI descriptor
and
* without any OSGi manifest entries.
*/
-public class JBIDeploymentListener implements DeploymentListener {
+public class JBIDeploymentListener implements ArtifactTransformer {
private static final Log Logger =
LogFactory.getLog(JBIDeploymentListener.class);
@@ -79,7 +79,7 @@
* @return the location of the transformed OSGi bundle, or
<code>null</code>
* if the transformation could not take place.
*/
- public File handle(File artifact, File tmpDir) {
+ public File transform(File artifact, File tmpDir) {
try {
String bundleName = artifact.getName().substring(0,
artifact.getName().length() - 4) + ".jar";
File destFile = new File(tmpDir, bundleName);
Modified:
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java
(original)
+++
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java
Tue Sep 1 06:44:18 2009
@@ -36,7 +36,7 @@
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.StringUtils;
-public class AdminCommandsImpl implements AdminCommandsService,
InitializingBean, DisposableBean {
+public class AdminCommandsImpl implements AdminCommandsService {
private Deployer deployer;
private InstallationService installationService;
@@ -444,7 +444,7 @@
return buffer.toString();
}
- public void afterPropertiesSet() throws Exception {
+ public void init() throws Exception {
deployer.getManagementAgent().register(new StandardMBean(this,
AdminCommandsService.class),
deployer.getNamingStrategy().getObjectName(this));
}
Modified:
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
(original)
+++
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
Tue Sep 1 06:44:18 2009
@@ -68,14 +68,11 @@
import org.osgi.service.prefs.PreferencesService;
import org.osgi.util.tracker.ServiceTracker;
import org.springframework.osgi.util.OsgiStringUtils;
-import org.springframework.osgi.context.BundleContextAware;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.DisposableBean;
/**
* Deployer for JBI artifacts
*/
-public class Deployer implements BundleContextAware, InitializingBean,
DisposableBean, SynchronousBundleListener, LifeCycleListener {
+public class Deployer implements SynchronousBundleListener, LifeCycleListener {
public static final String NAME = "NAME";
public static final String TYPE = "TYPE";
@@ -229,7 +226,7 @@
return shutdownTimeout;
}
- public void afterPropertiesSet() throws Exception {
+ public void init() throws Exception {
// Track bundles
bundleContext.addBundleListener(this);
for (Bundle bundle : bundleContext.getBundles()) {
Modified:
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java
(original)
+++
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/DeploymentService.java
Tue Sep 1 06:44:18 2009
@@ -37,7 +37,7 @@
import org.osgi.framework.BundleContext;
import org.springframework.osgi.context.BundleContextAware;
-public class DeploymentService implements DeploymentServiceMBean,
BundleContextAware {
+public class DeploymentService implements DeploymentServiceMBean {
private static final Log LOG = LogFactory.getLog(DeploymentService.class);
Modified:
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ManagementAgent.java
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ManagementAgent.java?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ManagementAgent.java
(original)
+++
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ManagementAgent.java
Tue Sep 1 06:44:18 2009
@@ -37,7 +37,7 @@
/**
*/
-public class ManagementAgent implements DisposableBean {
+public class ManagementAgent {
private static final transient Log LOG =
LogFactory.getLog(ManagementAgent.class);
Copied:
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml
(from r807663,
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml)
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml?p2=servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml&p1=servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml&r1=807663&r2=809851&rev=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml
(original)
+++
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml
Tue Sep 1 06:44:18 2009
@@ -17,26 +17,12 @@
limitations under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:ctx="http://www.springframework.org/schema/context";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:osgi="http://www.springframework.org/schema/osgi";
- xmlns:osgix="http://www.springframework.org/schema/osgi-compendium";
- xmlns:util="http://www.springframework.org/schema/util";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util.xsd
- http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi.xsd
- http://www.springframework.org/schema/osgi-compendium
-
http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd";>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
+ xmlns:cm="http://www.osgi.org/xmlns/blueprint-cm/v1.0.0";
+
xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0";>
<!-- JBI Deployer -->
- <bean id="deployer"
class="org.apache.servicemix.jbi.deployer.impl.Deployer">
+ <bean id="deployer"
class="org.apache.servicemix.jbi.deployer.impl.Deployer" init-method="init"
destroy-method="destroy">
<property name="autoStart" value="true" />
<property name="endpointListener" ref="endpointListener" />
<property name="environment" ref="environment" />
@@ -44,6 +30,7 @@
<property name="managementAgent" ref="managementAgent" />
<property name="preferencesService" ref="preferencesService" />
<property name="shutdownTimeout" value="${shutdownTimeout}" />
+ <property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
<!-- Endpoint listener -->
@@ -55,27 +42,27 @@
<!-- JBI Handler -->
<bean id="jbiHandler"
class="org.apache.servicemix.jbi.deployer.handler.URLHandler" />
- <osgi:service ref="jbiHandler"
interface="org.osgi.service.url.URLStreamHandlerService">
- <osgi:service-properties>
+ <service ref="jbiHandler"
interface="org.osgi.service.url.URLStreamHandlerService">
+ <service-properties>
<entry key="url.handler.protocol" value="jbi"/>
- </osgi:service-properties>
- </osgi:service>
+ </service-properties>
+ </service>
- <osgi:service ref="listener"
interface="org.apache.felix.karaf.deployer.filemonitor.DeploymentListener" />
+ <service ref="listener"
interface="org.apache.felix.fileinstall.listener.ArtifactTransformer" />
- <osgi:service ref="endpointListener">
- <osgi:interfaces>
+ <service ref="endpointListener">
+ <interfaces>
<value>org.apache.servicemix.nmr.api.event.Listener</value>
<value>org.apache.servicemix.nmr.api.event.EndpointListener</value>
<value>org.apache.servicemix.nmr.api.event.ExchangeListener</value>
- </osgi:interfaces>
- </osgi:service>
+ </interfaces>
+ </service>
<!-- Utilities -->
<bean id="namingStrategy"
class="org.apache.servicemix.jbi.deployer.impl.DefaultNamingStrategy">
<property name="jmxDomainName" value="org.apache.servicemix" />
</bean>
- <bean id="managementAgent"
class="org.apache.servicemix.jbi.deployer.impl.ManagementAgent">
+ <bean id="managementAgent"
class="org.apache.servicemix.jbi.deployer.impl.ManagementAgent"
destroy-method="destroy">
<property name="mbeanServer" ref="mbeanServer" />
</bean>
@@ -83,7 +70,7 @@
<bean id="adminService"
class="org.apache.servicemix.jbi.deployer.impl.AdminService">
<property name="namingStrategy" ref="namingStrategy" />
</bean>
- <bean id="adminCommandsService"
class="org.apache.servicemix.jbi.deployer.impl.AdminCommandsImpl">
+ <bean id="adminCommandsService"
class="org.apache.servicemix.jbi.deployer.impl.AdminCommandsImpl"
init-method="init" destroy-method="destroy">
<property name="deployer" ref="deployer" />
<property name="deploymentService" ref="deploymentService" />
<property name="installationService" ref="installationService" />
@@ -93,11 +80,12 @@
</bean>
<bean id="deploymentService"
class="org.apache.servicemix.jbi.deployer.impl.DeploymentService">
<property name="deployer" ref="deployer" />
+ <property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
<!-- Expose management service in OSGi -->
- <osgi:service ref="adminCommandsService"
interface="org.apache.servicemix.jbi.deployer.AdminCommandsService" />
+ <service ref="adminCommandsService"
interface="org.apache.servicemix.jbi.deployer.AdminCommandsService" />
<!-- Environment -->
<bean id="environment"
class="org.apache.servicemix.jbi.runtime.impl.EnvironmentImpl">
@@ -107,30 +95,29 @@
</bean>
<!-- Reference to the Transaction Manager -->
- <osgi:list id="transactionManagers"
- interface="javax.transaction.TransactionManager"
- cardinality="0..N"
- greedy-proxying="true"
- context-class-loader="unmanaged" />
+ <reference-list id="transactionManagers"
+ interface="javax.transaction.TransactionManager"
+ availability="optional"
+ ext:proxy-method="greedy"/>
<!-- The InitialContext -->
<bean id="namingContext" class="javax.naming.InitialContext">
- <constructor-arg><null/></constructor-arg>
+ <argument><null/></argument>
</bean>
<!-- MBeanServer -->
- <osgi:reference id="mbeanServer"
- interface="javax.management.MBeanServer"
- cardinality="1..1" />
+ <reference id="mbeanServer"
+ interface="javax.management.MBeanServer"
+ availability="mandatory" />
<!-- Preferences Service -->
- <osgi:reference id="preferencesService"
- interface="org.osgi.service.prefs.PreferencesService" />
-
- <osgix:cm-properties id="cmProps"
persistent-id="org.apache.servicemix.jbi">
- <prop key="shutdownTimeout">0</prop>
- </osgix:cm-properties>
+ <reference id="preferencesService"
+ interface="org.osgi.service.prefs.PreferencesService" />
- <ctx:property-placeholder properties-ref="cmProps" />
+ <cm:property-placeholder persistent-id="org.apache.servicemix.jbi">
+ <cm:default-properties>
+ <cm:property name="shutdownTimeout" value="0"/>
+ </cm:default-properties>
+ </cm:property-placeholder>
-</beans>
+</blueprint>
Modified: servicemix/sandbox/karaf/nmr/jbi/itests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/itests/pom.xml?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/jbi/itests/pom.xml (original)
+++ servicemix/sandbox/karaf/nmr/jbi/itests/pom.xml Tue Sep 1 06:44:18 2009
@@ -49,9 +49,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.deployer</groupId>
-
<artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
- <version>${felix.karaf.version}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>${felix.fileinstall.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -163,6 +163,12 @@
<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified:
servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/java/org/apache/servicemix/jbi/osgi/NMRWrapper.java
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/java/org/apache/servicemix/jbi/osgi/NMRWrapper.java?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/java/org/apache/servicemix/jbi/osgi/NMRWrapper.java
(original)
+++
servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/java/org/apache/servicemix/jbi/osgi/NMRWrapper.java
Tue Sep 1 06:44:18 2009
@@ -32,7 +32,7 @@
* This way, the JBI layer is decoupled from OSGi, while still
* having the endpoints registered in the OSGi registry.
*/
-public class NMRWrapper implements NMR, BundleContextAware, InitializingBean {
+public class NMRWrapper implements NMR {
private NMR nmr;
private BundleContext bundleContext;
@@ -46,7 +46,7 @@
this.bundleContext = bundleContext;
}
- public void afterPropertiesSet() throws Exception {
+ public void init() throws Exception {
if (this.nmr == null) {
throw new IllegalArgumentException("nmr must be set");
}
Modified:
servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml
(original)
+++
servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml
Tue Sep 1 06:44:18 2009
@@ -48,14 +48,17 @@
<property name="namingContext" ref="namingContext" />
</bean>
- <bean id="nmrWrapper" class="org.apache.servicemix.jbi.osgi.NMRWrapper">
+ <bean id="nmrWrapper" class="org.apache.servicemix.jbi.osgi.NMRWrapper"
init-method="init">
<property name="nmr" ref="nmr" />
+ <property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
<!-- Service tracker for JBI components -->
- <bean class="org.apache.servicemix.nmr.osgi.OsgiServiceRegistryTracker">
+ <bean id="componentWrapperTracker"
class="org.apache.servicemix.nmr.osgi.OsgiServiceRegistryTracker"
+ init-method="init" destroy-method="destroy">
<property name="interface"
value="org.apache.servicemix.jbi.runtime.ComponentWrapper" />
<property name="registry" ref="componentRegistry" />
+ <property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
<!-- Reference to the ServiceMix NMR -->
Modified:
servicemix/sandbox/karaf/nmr/nmr/core/src/test/java/org/apache/servicemix/nmr/core/FrameworkUtil.java
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/nmr/core/src/test/java/org/apache/servicemix/nmr/core/FrameworkUtil.java?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/nmr/core/src/test/java/org/apache/servicemix/nmr/core/FrameworkUtil.java
(original)
+++
servicemix/sandbox/karaf/nmr/nmr/core/src/test/java/org/apache/servicemix/nmr/core/FrameworkUtil.java
Tue Sep 1 06:44:18 2009
@@ -16,7 +16,6 @@
*/
package org.apache.servicemix.nmr.core;
-import org.apache.felix.framework.FilterImpl;
import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
@@ -25,7 +24,7 @@
public class FrameworkUtil {
public static Filter createFilter(String f) throws InvalidSyntaxException {
- return new FilterImpl(f);
+ return org.osgi.framework.FrameworkUtil.createFilter(f);
}
}
Modified:
servicemix/sandbox/karaf/nmr/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementEndpointRegistry.java
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementEndpointRegistry.java?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementEndpointRegistry.java
(original)
+++
servicemix/sandbox/karaf/nmr/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementEndpointRegistry.java
Tue Sep 1 06:44:18 2009
@@ -71,6 +71,9 @@
}
public void unregister(InternalEndpoint endpoint, Map<String, ?>
properties) {
+ if (endpoint == null) {
+ return;
+ }
try {
LOG.info("Unregistering endpoint: " + endpoint + " with properties
" + properties);
ManagedEndpoint ep = endpoints.remove(endpoint.getId());
Copied:
servicemix/sandbox/karaf/nmr/nmr/management/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-management.xml
(from r807663,
servicemix/sandbox/karaf/nmr/nmr/management/src/main/resources/META-INF/spring/servicemix-nmr-management.xml)
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/nmr/management/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-management.xml?p2=servicemix/sandbox/karaf/nmr/nmr/management/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-management.xml&p1=servicemix/sandbox/karaf/nmr/nmr/management/src/main/resources/META-INF/spring/servicemix-nmr-management.xml&r1=807663&r2=809851&rev=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/nmr/management/src/main/resources/META-INF/spring/servicemix-nmr-management.xml
(original)
+++
servicemix/sandbox/karaf/nmr/nmr/management/src/main/resources/OSGI-INF/blueprint/servicemix-nmr-management.xml
Tue Sep 1 06:44:18 2009
@@ -17,22 +17,14 @@
limitations under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:osgi="http://www.springframework.org/schema/osgi";
- xmlns:util="http://www.springframework.org/schema/util";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util.xsd
- http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi.xsd";>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
+ xmlns:cm="http://www.osgi.org/xmlns/blueprint-cm/v1.0.0";
+
xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0";>
<!-- MBeanServer -->
- <osgi:reference id="mbeanServer"
- interface="javax.management.MBeanServer"
- cardinality="1..1" />
+ <reference id="mbeanServer"
+ interface="javax.management.MBeanServer"
+ availability="mandatory"/>
<!-- Endpoint registry -->
<bean id="endpointRegistry"
class="org.apache.servicemix.nmr.management.ManagementEndpointRegistry">
@@ -49,18 +41,18 @@
</bean>
<!-- List of endpoints -->
- <osgi:list id="endpoints"
-
interface="org.apache.servicemix.nmr.api.internal.InternalEndpoint"
- cardinality="0..N">
- <osgi:listener ref="endpointRegistry" bind-method="register"
unbind-method="unregister" />
- </osgi:list>
+ <reference-list id="endpoints"
+
interface="org.apache.servicemix.nmr.api.internal.InternalEndpoint"
+ availability="optional">
+ <reference-listener ref="endpointRegistry" bind-method="register"
unbind-method="unregister" />
+ </reference-list>
<!-- Exchange listener -->
- <osgi:service ref="endpointRegistry">
- <osgi:interfaces>
+ <service ref="endpointRegistry">
+ <interfaces>
<value>org.apache.servicemix.nmr.api.event.ExchangeListener</value>
<value>org.apache.servicemix.nmr.api.event.Listener</value>
- </osgi:interfaces>
- </osgi:service>
+ </interfaces>
+ </service>
-</beans>
+</blueprint>
Modified:
servicemix/sandbox/karaf/nmr/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/OsgiServiceRegistryTracker.java
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/OsgiServiceRegistryTracker.java?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/OsgiServiceRegistryTracker.java
(original)
+++
servicemix/sandbox/karaf/nmr/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/OsgiServiceRegistryTracker.java
Tue Sep 1 06:44:18 2009
@@ -33,7 +33,7 @@
* when services are registered / unregistered in the OSGi registry. This
avoid using spring proxies which are
* not always needed especially in our case.
*/
-public class OsgiServiceRegistryTracker<T> implements BundleContextAware,
InitializingBean, DisposableBean, ServiceTrackerCustomizer {
+public class OsgiServiceRegistryTracker<T> implements ServiceTrackerCustomizer
{
private BundleContext bundleContext;
private ServiceRegistry<T> registry;
@@ -64,7 +64,7 @@
this.registry = registry;
}
- public void afterPropertiesSet() throws Exception {
+ public void init() throws Exception {
tracker = new ServiceTracker(bundleContext, clazz.getName(), this);
tracker.open();
}
Modified:
servicemix/sandbox/karaf/nmr/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
(original)
+++
servicemix/sandbox/karaf/nmr/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
Tue Sep 1 06:44:18 2009
@@ -27,7 +27,7 @@
</type-converters>
<!-- ServiceMix NMR -->
- <bean id="servicemix" class="org.apache.servicemix.nmr.core.ServiceMix">
+ <bean id="servicemix" class="org.apache.servicemix.nmr.core.ServiceMix"
init-method="init">
<property name="endpointRegistry" ref="endpointRegistry" />
<property name="listenerRegistry" ref="listenerRegistry" />
<property name="flowRegistry" ref="flowRegistry" />
@@ -46,16 +46,18 @@
</list>
</property>
</bean>
- <bean class="org.apache.servicemix.nmr.osgi.OsgiServiceRegistryTracker">
+ <bean id="endpointTracker"
class="org.apache.servicemix.nmr.osgi.OsgiServiceRegistryTracker"
init-method="init" destroy-method="destroy">
<property name="interface"
value="org.apache.servicemix.nmr.api.internal.Flow" />
<property name="registry" ref="listenerRegistry" />
+ <property name="bundleContext" ref="blueprintBundleContext" />
</bean>
<!-- Listener registry and service tracker -->
<bean id="listenerRegistry"
class="org.apache.servicemix.nmr.core.ListenerRegistryImpl" />
- <bean class="org.apache.servicemix.nmr.osgi.OsgiServiceRegistryTracker">
+ <bean class="org.apache.servicemix.nmr.osgi.OsgiServiceRegistryTracker"
init-method="init" destroy-method="destroy">
<property name="interface"
value="org.apache.servicemix.nmr.api.event.Listener" />
<property name="registry" ref="listenerRegistry" />
+ <property name="bundleContext" ref="blueprintBundleContext" />
</bean>
<!-- Endpoint registry and service tracker -->
@@ -64,17 +66,21 @@
<property name="registry" ref="internalEndpointRegistry" />
<property name="executorFactory" ref="executorFactory" />
</bean>
- <bean id="internalEndpointRegistry"
class="org.apache.servicemix.nmr.osgi.InternalRegistryWrapper" />
- <bean class="org.apache.servicemix.nmr.osgi.OsgiServiceRegistryTracker">
+ <bean id="internalEndpointRegistry"
class="org.apache.servicemix.nmr.osgi.InternalRegistryWrapper">
+ <property name="bundleContext" ref="blueprintBundleContext"/>
+ </bean>
+ <bean class="org.apache.servicemix.nmr.osgi.OsgiServiceRegistryTracker"
init-method="init" destroy-method="destroy">
<property name="interface"
value="org.apache.servicemix.nmr.api.Endpoint" />
<property name="registry" ref="endpointRegistry" />
+ <property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
<!-- Wire registry and service tracker -->
<bean id="wireRegistry"
class="org.apache.servicemix.nmr.core.WireRegistryImpl"/>
- <bean class="org.apache.servicemix.nmr.osgi.OsgiServiceRegistryTracker">
+ <bean class="org.apache.servicemix.nmr.osgi.OsgiServiceRegistryTracker"
init-method="init" destroy-method="destroy">
<property name="interface" value="org.apache.servicemix.nmr.api.Wire"
/>
<property name="registry" ref="wireRegistry" />
+ <property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
<!-- AuthorizationService -->
Modified: servicemix/sandbox/karaf/nmr/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/pom.xml?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/pom.xml (original)
+++ servicemix/sandbox/karaf/nmr/pom.xml Tue Sep 1 06:44:18 2009
@@ -72,13 +72,16 @@
<derby.version>10.4.2.0</derby.version>
<depends.maven.plugin.version>1.0</depends.maven.plugin.version>
<easymock.version>2.4</easymock.version>
+ <equinox.version>3.5.0.v20090520</equinox.version>
<felix.configadmin.version>1.0.4</felix.configadmin.version>
<felix.plugin.version>1.4.3</felix.plugin.version>
- <felix.framework.version>1.5.0-r752991</felix.framework.version>
+ <felix.framework.version>1.9.0-SNAPSHOT</felix.framework.version>
<felix.osgi.version>1.2.0</felix.osgi.version>
<felix.compendium.version>1.2.0</felix.compendium.version>
<felix.bundlerepository.version>1.2.0</felix.bundlerepository.version>
<felix.prefs.version>1.0.2</felix.prefs.version>
+ <felix.karaf.version>0.9.0-SNAPSHOT</felix.karaf.version>
+ <felix.fileinstall.version>1.3.0-SNAPSHOT</felix.fileinstall.version>
<geronimo.j2ee.connector.version>2.0.0</geronimo.j2ee.connector.version>
<geronimo.jms.version>1.1.1</geronimo.jms.version>
<geronimo.jta.version>1.1.1</geronimo.jta.version>
@@ -98,7 +101,6 @@
<servicemix.http.version>2008.01</servicemix.http.version>
<servicemix.jsr181.version>2008.01</servicemix.jsr181.version>
<servicemix.shared.version>2008.01</servicemix.shared.version>
- <felix.karaf.version>0.9.0-SNAPSHOT</felix.karaf.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.specs.version>1.3.0</servicemix.specs.version>
<servicemix.utils.version>1.1.0</servicemix.utils.version>
@@ -427,6 +429,11 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>${felix.fileinstall.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.framework.version}</version>
</dependency>
Modified:
servicemix/sandbox/karaf/nmr/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/FrameworkUtil.java
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/FrameworkUtil.java?rev=809851&r1=809850&r2=809851&view=diff
==============================================================================
---
servicemix/sandbox/karaf/nmr/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/FrameworkUtil.java
(original)
+++
servicemix/sandbox/karaf/nmr/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/FrameworkUtil.java
Tue Sep 1 06:44:18 2009
@@ -16,7 +16,6 @@
*/
package org.apache.servicemix.platform.testing.support;
-import org.apache.felix.framework.FilterImpl;
import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
@@ -25,7 +24,7 @@
public class FrameworkUtil {
public static Filter createFilter(String f) throws InvalidSyntaxException {
- return new FilterImpl(f);
+ return org.osgi.framework.FrameworkUtil.createFilter(f);
}
}
