FELIX-1463: Switch to Felix Fileinstall instead of our own file deployer
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@809481 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/deployer/features/pom.xml b/karaf/deployer/features/pom.xml
index d56f795..19cee2b 100644
--- a/karaf/deployer/features/pom.xml
+++ b/karaf/deployer/features/pom.xml
@@ -50,8 +50,12 @@
<artifactId>org.apache.felix.karaf.features.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.deployer</groupId>
- <artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
diff --git a/karaf/deployer/features/src/main/java/org/apache/felix/karaf/deployer/features/FeatureDeploymentListener.java b/karaf/deployer/features/src/main/java/org/apache/felix/karaf/deployer/features/FeatureDeploymentListener.java
index b7d4b47..0ea82bb 100644
--- a/karaf/deployer/features/src/main/java/org/apache/felix/karaf/deployer/features/FeatureDeploymentListener.java
+++ b/karaf/deployer/features/src/main/java/org/apache/felix/karaf/deployer/features/FeatureDeploymentListener.java
@@ -43,7 +43,7 @@
import org.apache.felix.karaf.features.Feature;
import org.apache.felix.karaf.features.FeaturesService;
import org.apache.felix.karaf.features.Repository;
-import org.apache.felix.karaf.deployer.filemonitor.DeploymentListener;
+import org.apache.felix.fileinstall.listener.ArtifactTransformer;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
@@ -53,7 +53,7 @@
/**
* A deployment listener able to hot deploy a feature descriptor
*/
-public class FeatureDeploymentListener implements DeploymentListener, SynchronousBundleListener {
+public class FeatureDeploymentListener implements ArtifactTransformer, SynchronousBundleListener {
public static final String FEATURE_PATH = "org.apache.felix.karaf.gshell.features";
@@ -106,7 +106,7 @@
return false;
}
- public File handle(File artifact, File tmpDir) {
+ public File transform(File artifact, File tmpDir) {
// We can't really install the feature right now and just return nothing.
// We would not be aware of the fact that the bundle has been uninstalled
// and therefore require the feature to be uninstalled.
diff --git a/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml b/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml
index 474b993..c27d26e 100644
--- a/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml
+++ b/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml
@@ -21,8 +21,7 @@
xmlns:cm="http://www.osgi.org/xmlns/blueprint-cm/v1.0.0"
default-activation="lazy">
- <service interface="org.apache.felix.karaf.deployer.filemonitor.DeploymentListener"
- ref="featureDeploymentListener"/>
+ <service ref="featureDeploymentListener" auto-export="interfaces"/>
<bean id="featureDeploymentListener" class="org.apache.felix.karaf.deployer.features.FeatureDeploymentListener"
init-method="init" destroy-method="destroy" activation="lazy">