You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/08/31 09:19:01 UTC
svn commit: r809481 - in /felix/trunk/karaf: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/distribution/text/etc/
assembly/src/main/filtered-resources/etc/ deployer/ deployer/blueprint/
deployer/blueprint/src/main/java/org/apache/felix/...
Author: gnodet
Date: Mon Aug 31 07:19:00 2009
New Revision: 809481
URL: http://svn.apache.org/viewvc?rev=809481&view=rev
Log:
FELIX-1463: Switch to Felix Fileinstall instead of our own file deployer
Added:
felix/trunk/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg
Removed:
felix/trunk/karaf/deployer/filemonitor/pom.xml
felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/DeploymentListener.java
felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java
felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorActivator.java
felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/JarUtil.java
felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/Scanner.java
felix/trunk/karaf/deployer/filemonitor/src/test/data/camel-example-spring/META-INF/LICENSE.txt
felix/trunk/karaf/deployer/filemonitor/src/test/data/camel-example-spring/META-INF/MANIFEST.MF
felix/trunk/karaf/deployer/filemonitor/src/test/data/camel-example-spring/META-INF/NOTICE.txt
felix/trunk/karaf/deployer/filemonitor/src/test/data/camel-example-spring/META-INF/spring/camel-context.xml
felix/trunk/karaf/deployer/filemonitor/src/test/data/camel-example-spring/org/apache/camel/example/spring/MyRouteBuilder$SomeBean.class
felix/trunk/karaf/deployer/filemonitor/src/test/data/camel-example-spring/org/apache/camel/example/spring/MyRouteBuilder.class
felix/trunk/karaf/deployer/filemonitor/src/test/data/foo/META-INF/MANIFEST.MF
felix/trunk/karaf/deployer/filemonitor/src/test/data/foo/foo.txt
felix/trunk/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/BundlePackerTest.java
felix/trunk/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorTest.java
Modified:
felix/trunk/karaf/assembly/pom.xml
felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml
felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties
felix/trunk/karaf/deployer/blueprint/pom.xml
felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListener.java
felix/trunk/karaf/deployer/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint-deployer.xml
felix/trunk/karaf/deployer/features/pom.xml
felix/trunk/karaf/deployer/features/src/main/java/org/apache/felix/karaf/deployer/features/FeatureDeploymentListener.java
felix/trunk/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml
felix/trunk/karaf/deployer/pom.xml
felix/trunk/karaf/deployer/spring/pom.xml
felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListener.java
felix/trunk/karaf/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml
felix/trunk/karaf/pom.xml
Modified: felix/trunk/karaf/assembly/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/pom.xml?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/pom.xml (original)
+++ felix/trunk/karaf/assembly/pom.xml Mon Aug 31 07:19:00 2009
@@ -44,10 +44,6 @@
</dependency>
<dependency>
<groupId>org.apache.felix.karaf.deployer</groupId>
- <artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix.karaf.deployer</groupId>
<artifactId>org.apache.felix.karaf.deployer.spring</artifactId>
</dependency>
<dependency>
@@ -159,6 +155,10 @@
<artifactId>org.apache.felix.bundlerepository</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</dependency>
Modified: felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml Mon Aug 31 07:19:00 2009
@@ -124,6 +124,7 @@
<include>org.apache.felix:org.apache.felix.configadmin</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.apache.felix:org.apache.felix.framework</include>
+ <include>org.apache.felix:org.apache.felix.fileinstall</include>
</includes>
</dependencySet>
<dependencySet>
@@ -181,7 +182,6 @@
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/felix/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.filemonitor</include>
<include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.spring</include>
<include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.blueprint</include>
<include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.features</include>
Modified: felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml Mon Aug 31 07:19:00 2009
@@ -116,6 +116,7 @@
<include>org.apache.felix:org.apache.felix.configadmin</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.apache.felix:org.apache.felix.framework</include>
+ <include>org.apache.felix:org.apache.felix.fileinstall</include>
</includes>
</dependencySet>
<dependencySet>
@@ -173,7 +174,6 @@
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/felix/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.filemonitor</include>
<include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.spring</include>
<include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.blueprint</include>
<include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.features</include>
Added: felix/trunk/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg?rev=809481&view=auto
==============================================================================
--- felix/trunk/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg (added)
+++ felix/trunk/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.fileinstall-deploy.cfg Mon Aug 31 07:19:00 2009
@@ -0,0 +1,22 @@
+################################################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+felix.fileinstall.dir = ${karaf.base}/deploy
+felix.fileinstall.tmpdir = ${karaf.base}/data/generated-bundles
+felix.fileinstall.poll = 1000
Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties Mon Aug 31 07:19:00 2009
@@ -49,11 +49,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
#
# Java platform package export properties.
Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/etc/startup.properties Mon Aug 31 07:19:00 2009
@@ -29,7 +29,7 @@
org/ops4j/pax/logging/pax-logging-service/${pax.logging.version}/pax-logging-service-${pax.logging.version}.jar=8
org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
org/apache/felix/org.apache.felix.prefs/${felix.prefs.version}/org.apache.felix.prefs-${felix.prefs.version}.jar=10
-org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.filemonitor/${pom.version}/org.apache.felix.karaf.deployer.filemonitor-${pom.version}.jar=15
+org/apache/felix/org.apache.felix.fileinstall/${felix.fileinstall.version}/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar=10
#
# The rest of the services..
Modified: felix/trunk/karaf/deployer/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/blueprint/pom.xml?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/blueprint/pom.xml (original)
+++ felix/trunk/karaf/deployer/blueprint/pom.xml Mon Aug 31 07:19:00 2009
@@ -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>
Modified: felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListener.java?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListener.java (original)
+++ felix/trunk/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListener.java Mon Aug 31 07:19:00 2009
@@ -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 BlueprintDeploymentListener implements DeploymentListener {
+public class BlueprintDeploymentListener implements ArtifactTransformer {
private static final Log LOGGER = LogFactory.getLog(BlueprintDeploymentListener.class);
@@ -56,7 +56,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);
Modified: felix/trunk/karaf/deployer/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint-deployer.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint-deployer.xml?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint-deployer.xml (original)
+++ felix/trunk/karaf/deployer/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint-deployer.xml Mon Aug 31 07:19:00 2009
@@ -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.blueprint.BlueprintDeploymentListener"/>
</service>
Modified: felix/trunk/karaf/deployer/features/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/features/pom.xml?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/features/pom.xml (original)
+++ felix/trunk/karaf/deployer/features/pom.xml Mon Aug 31 07:19:00 2009
@@ -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>
Modified: felix/trunk/karaf/deployer/features/src/main/java/org/apache/felix/karaf/deployer/features/FeatureDeploymentListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/features/src/main/java/org/apache/felix/karaf/deployer/features/FeatureDeploymentListener.java?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/features/src/main/java/org/apache/felix/karaf/deployer/features/FeatureDeploymentListener.java (original)
+++ felix/trunk/karaf/deployer/features/src/main/java/org/apache/felix/karaf/deployer/features/FeatureDeploymentListener.java Mon Aug 31 07:19:00 2009
@@ -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.
Modified: felix/trunk/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml (original)
+++ felix/trunk/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml Mon Aug 31 07:19:00 2009
@@ -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">
Modified: felix/trunk/karaf/deployer/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/pom.xml?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/pom.xml (original)
+++ felix/trunk/karaf/deployer/pom.xml Mon Aug 31 07:19:00 2009
@@ -34,7 +34,6 @@
<name>Apache Felix Karaf :: Deployer</name>
<modules>
- <module>filemonitor</module>
<module>spring</module>
<module>blueprint</module>
<module>features</module>
Modified: felix/trunk/karaf/deployer/spring/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/spring/pom.xml?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/spring/pom.xml (original)
+++ felix/trunk/karaf/deployer/spring/pom.xml Mon Aug 31 07:19:00 2009
@@ -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>
Modified: felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListener.java?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListener.java (original)
+++ felix/trunk/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListener.java Mon Aug 31 07:19:00 2009
@@ -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);
Modified: felix/trunk/karaf/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml (original)
+++ felix/trunk/karaf/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml Mon Aug 31 07:19:00 2009
@@ -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>
Modified: felix/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=809481&r1=809480&r2=809481&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Mon Aug 31 07:19:00 2009
@@ -74,6 +74,7 @@
<felix.bundlerepository.version>1.4.0</felix.bundlerepository.version>
<felix.compendium.version>1.2.0</felix.compendium.version>
<felix.configadmin.version>1.0.4</felix.configadmin.version>
+ <felix.fileinstall.version>1.3.0-SNAPSHOT</felix.fileinstall.version>
<felix.framework.version>1.9.0-SNAPSHOT</felix.framework.version>
<felix.gogo.version>0.9.0-SNAPSHOT</felix.gogo.version>
<felix.osgi.version>1.3.0-SNAPSHOT</felix.osgi.version>
@@ -224,11 +225,13 @@
<artifactId>org.apache.felix.karaf.client</artifactId>
<version>${pom.version}</version>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.felix.karaf.deployer</groupId>
<artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
<version>${pom.version}</version>
</dependency>
+ -->
<dependency>
<groupId>org.apache.felix.karaf.deployer</groupId>
<artifactId>org.apache.felix.karaf.deployer.spring</artifactId>
@@ -434,8 +437,8 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <version>${felix.metatype.version}</version>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>${felix.fileinstall.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>