Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 64459 invoked from network); 31 Aug 2009 07:19:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 31 Aug 2009 07:19:35 -0000 Received: (qmail 92138 invoked by uid 500); 31 Aug 2009 07:19:35 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 92066 invoked by uid 500); 31 Aug 2009 07:19:35 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 92057 invoked by uid 99); 31 Aug 2009 07:19:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Aug 2009 07:19:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Aug 2009 07:19:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 21EE52388891; Mon, 31 Aug 2009 07:19:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/... Date: Mon, 31 Aug 2009 07:19:01 -0000 To: commits@felix.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090831071902.21EE52388891@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ org.apache.felix.karaf.deployer - org.apache.felix.karaf.deployer.filemonitor - - - org.apache.felix.karaf.deployer org.apache.felix.karaf.deployer.spring @@ -159,6 +155,10 @@ org.apache.felix.bundlerepository + org.apache.felix + org.apache.felix.fileinstall + + org.apache.mina mina-core 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 @@ org.apache.felix:org.apache.felix.configadmin org.apache.felix:org.apache.felix.prefs org.apache.felix:org.apache.felix.framework + org.apache.felix:org.apache.felix.fileinstall @@ -181,7 +182,6 @@ false org/apache/felix/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} - org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.filemonitor org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.spring org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.blueprint org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.features 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 @@ org.apache.felix:org.apache.felix.configadmin org.apache.felix:org.apache.felix.prefs org.apache.felix:org.apache.felix.framework + org.apache.felix:org.apache.felix.fileinstall @@ -173,7 +174,6 @@ false org/apache/felix/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} - org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.filemonitor org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.spring org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.blueprint org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.features 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 @@ spring-osgi-core - org.apache.felix.karaf.deployer - org.apache.felix.karaf.deployer.filemonitor + commons-logging + commons-logging + + + org.apache.felix + org.apache.felix.fileinstall org.apache.servicemix.bundles 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 @@ - + 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 @@ org.apache.felix.karaf.features.core - org.apache.felix.karaf.deployer - org.apache.felix.karaf.deployer.filemonitor + commons-logging + commons-logging + + + org.apache.felix + org.apache.felix.fileinstall org.apache.servicemix.bundles 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"> - + 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 @@ Apache Felix Karaf :: Deployer - filemonitor spring blueprint features 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 @@ spring-osgi-core - org.apache.felix.karaf.deployer - org.apache.felix.karaf.deployer.filemonitor + commons-logging + commons-logging + + + org.apache.felix + org.apache.felix.fileinstall org.apache.servicemix.bundles 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 @@ - + 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 @@ 1.4.0 1.2.0 1.0.4 + 1.3.0-SNAPSHOT 1.9.0-SNAPSHOT 0.9.0-SNAPSHOT 1.3.0-SNAPSHOT @@ -224,11 +225,13 @@ org.apache.felix.karaf.client ${pom.version} + org.apache.felix.karaf.deployer org.apache.felix.karaf.deployer.spring @@ -434,8 +437,8 @@ org.apache.felix - org.apache.felix.metatype - ${felix.metatype.version} + org.apache.felix.fileinstall + ${felix.fileinstall.version} org.apache.felix