Return-Path: Delivered-To: apmail-incubator-ace-commits-archive@minotaur.apache.org Received: (qmail 60753 invoked from network); 26 Oct 2009 09:09:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Oct 2009 09:09:56 -0000 Received: (qmail 70262 invoked by uid 500); 26 Oct 2009 09:09:56 -0000 Delivered-To: apmail-incubator-ace-commits-archive@incubator.apache.org Received: (qmail 70197 invoked by uid 500); 26 Oct 2009 09:09:56 -0000 Mailing-List: contact ace-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ace-dev@incubator.apache.org Delivered-To: mailing list ace-commits@incubator.apache.org Received: (qmail 69893 invoked by uid 99); 26 Oct 2009 09:09:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Oct 2009 09:09:56 +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, 26 Oct 2009 09:09:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 808552388897; Mon, 26 Oct 2009 09:09:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r829731 - /incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java Date: Mon, 26 Oct 2009 09:09:32 -0000 To: ace-commits@incubator.apache.org From: marrs@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091026090932.808552388897@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: marrs Date: Mon Oct 26 09:09:31 2009 New Revision: 829731 URL: http://svn.apache.org/viewvc?rev=829731&view=rev Log: Added a configurable default directory for targets that have no specific versions as described in ACE-60. Modified: incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java Modified: incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java?rev=829731&r1=829730&r2=829731&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java Mon Oct 26 09:09:31 2009 @@ -55,9 +55,13 @@ * org.osgi.framework.Version format. */ public class FileBasedProvider implements DeploymentProvider, ManagedService { + /** Directory where all the target ID folders are located. */ private static final String DIRECTORY_NAME = "BaseDirectoryName"; + /** Fallback directory for all targets that have no specific versions. Defaults to BaseDirectoryName if not specified. */ + private static final String DEFAULT_DIRECTORY_NAME = "DefaultDirectoryName"; private static final int OSGI_R4_MANIFEST_VERSION = 2; private volatile File m_baseDirectory; + private volatile File m_defaultDirectory; private volatile LogService m_log; private final Semaphore m_disk = new Semaphore(1, true); @@ -77,8 +81,7 @@ versionDirectory = findMatchingVersionDirectory(gatewayDirectory, version); } else { - // shared folder from m_baseDirectory - versionDirectory = findMatchingVersionDirectory(m_baseDirectory, version); + versionDirectory = findMatchingVersionDirectory(m_defaultDirectory, version); } List bundleData = new ArrayList(); @@ -287,8 +290,8 @@ getVersions(gatewayId, versionList, gatewayDirectory); } else { - // try from m_baseDirectory - getVersions(gatewayId, versionList, m_baseDirectory); + // try the default + getVersions(gatewayId, versionList, m_defaultDirectory); } // now sort the list of versions and convert all values to strings. @@ -344,6 +347,16 @@ throw new ConfigurationException(DIRECTORY_NAME, "The directory called '" + baseDirectoryName + "' " + (baseDirectory.exists() ? "is no directory." : "doesn't exist.")); } m_baseDirectory = baseDirectory; + + String defaultDirectoryName = (String) settings.get(DEFAULT_DIRECTORY_NAME); + File defaultDirectory = new File(defaultDirectoryName); + if (!defaultDirectory.exists() || !defaultDirectory.isDirectory()) { + // fallback to using the base directory + m_defaultDirectory = baseDirectory; + } + else { + m_defaultDirectory = defaultDirectory; + } } }