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/spring/pom.xml b/karaf/deployer/spring/pom.xml
index 55d0e95..e3ee5a6 100644
--- a/karaf/deployer/spring/pom.xml
+++ b/karaf/deployer/spring/pom.xml
@@ -46,8 +46,12 @@
<artifactId>spring-osgi-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/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListener.java b/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListener.java
index 7551f99..648cf1b 100644
--- a/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListener.java
+++ b/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListener.java
@@ -27,13 +27,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.felix.karaf.deployer.filemonitor.DeploymentListener;
+import org.apache.felix.fileinstall.listener.ArtifactTransformer;
/**
* A deployment listener that listens for spring xml applications
* and creates bundles for these.
*/
-public class SpringDeploymentListener implements DeploymentListener {
+public class SpringDeploymentListener implements ArtifactTransformer {
private static final Log LOGGER = LogFactory.getLog(SpringDeploymentListener.class);
@@ -55,7 +55,7 @@
return false;
}
- public File handle(File artifact, File tmpDir) {
+ public File transform(File artifact, File tmpDir) {
try {
File destFile = new File(tmpDir, artifact.getName() + ".jar");
FileOutputStream os = new FileOutputStream(destFile);
diff --git a/karaf/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml b/karaf/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml
index cb0c57b..6ec6a02 100644
--- a/karaf/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml
+++ b/karaf/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml
@@ -20,7 +20,7 @@
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:cm="http://www.osgi.org/xmlns/blueprint-cm/v1.0.0">
- <service interface="org.apache.felix.karaf.deployer.filemonitor.DeploymentListener">
+ <service auto-export="interfaces">
<bean class="org.apache.felix.karaf.deployer.spring.SpringDeploymentListener"/>
</service>