Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 96629 invoked from network); 16 Nov 2009 17:14:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Nov 2009 17:14:19 -0000 Received: (qmail 82424 invoked by uid 500); 16 Nov 2009 17:14:18 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 82358 invoked by uid 500); 16 Nov 2009 17:14:18 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 82347 invoked by uid 99); 16 Nov 2009 17:14:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Nov 2009 17:14:18 +0000 X-ASF-Spam-Status: No, hits=-6.1 required=5.0 tests=AWL,BAYES_00 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, 16 Nov 2009 17:14:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 812F223889B3; Mon, 16 Nov 2009 17:13:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r880855 - /geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Date: Mon, 16 Nov 2009 17:13:56 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091116171356.812F223889B3@eris.apache.org> Author: gawor Date: Mon Nov 16 17:13:55 2009 New Revision: 880855 URL: http://svn.apache.org/viewvc?rev=880855&view=rev Log: use ServiceLoader to get FrameworkFactory instead of using Felix-specific class Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=880855&r1=880854&r2=880855&view=diff ============================================================================== --- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original) +++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Mon Nov 16 17:13:55 2009 @@ -29,6 +29,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.ServiceLoader; import java.util.Set; import java.util.LinkedHashMap; import java.util.ArrayList; @@ -58,13 +59,11 @@ import org.apache.maven.shared.filtering.MavenFileFilter; import org.apache.maven.shared.filtering.MavenFilteringException; import org.apache.maven.shared.filtering.MavenResourcesFiltering; -import org.apache.felix.framework.FrameworkFactory; -import org.apache.felix.framework.cache.BundleCache; -import org.apache.felix.framework.util.FelixConstants; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.StringUtils; import org.osgi.framework.launch.Framework; +import org.osgi.framework.launch.FrameworkFactory; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; @@ -952,8 +951,10 @@ "javax.enterprise.deploy.shared," + "javax.enterprise.deploy.spi"); */ - properties.put(BundleCache.CACHE_ROOTDIR_PROP, basedir + "/target"); - Framework framework = new FrameworkFactory().newFramework(properties); + File storageDir = new File(basedir, "target/bundle-cache"); + properties.put(Constants.FRAMEWORK_STORAGE, storageDir.getAbsolutePath()); + ServiceLoader loader = ServiceLoader.load(FrameworkFactory.class); + Framework framework = loader.iterator().next().newFramework(properties); framework.start(); return framework; }