Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 57171 invoked from network); 5 Nov 2008 23:22:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Nov 2008 23:22:08 -0000 Received: (qmail 40405 invoked by uid 500); 5 Nov 2008 23:22:14 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 40379 invoked by uid 500); 5 Nov 2008 23:22:14 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 40370 invoked by uid 99); 5 Nov 2008 23:22:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Nov 2008 15:22:14 -0800 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; Wed, 05 Nov 2008 23:20:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 43A0223888A2; Wed, 5 Nov 2008 15:21:39 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r711738 - in /incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl: BundleResourceProcessor.java ConfigResourceProcessor.java ConfigurationPid.java OsgiControllerImpl.java Date: Wed, 05 Nov 2008 23:21:38 -0000 To: sling-commits@incubator.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081105232139.43A0223888A2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Wed Nov 5 15:21:36 2008 New Revision: 711738 URL: http://svn.apache.org/viewvc?rev=711738&view=rev Log: SLING-719 - do not require .cfg extension for config nodes Modified: incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/BundleResourceProcessor.java incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/ConfigResourceProcessor.java incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/ConfigurationPid.java incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/OsgiControllerImpl.java Modified: incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/BundleResourceProcessor.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/BundleResourceProcessor.java?rev=711738&r1=711737&r2=711738&view=diff ============================================================================== --- incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/BundleResourceProcessor.java (original) +++ incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/BundleResourceProcessor.java Wed Nov 5 15:21:36 2008 @@ -208,7 +208,7 @@ final Long longId = (Long) attributes.get(KEY_BUNDLE_ID); if (longId == null) { log.debug( - "No bundle id in metadata for {}, bundle cannot be uninstalled.", + "Bundle {} cannot be uninstalled, bundle id not found, ignored", uri); } else { final Bundle b = ctx.getBundle(longId); Modified: incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/ConfigResourceProcessor.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/ConfigResourceProcessor.java?rev=711738&r1=711737&r2=711738&view=diff ============================================================================== --- incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/ConfigResourceProcessor.java (original) +++ incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/ConfigResourceProcessor.java Wed Nov 5 15:21:36 2008 @@ -113,7 +113,7 @@ final ConfigurationPid pid = new ConfigurationPid(uri); final Configuration cfg = getConfiguration(pid, false); if(cfg == null) { - log.debug("Config {} deleted but {} not found, ignoring", uri, pid); + log.debug("Cannot delete config {}, pid {} not found, ignored", uri, pid); } else { log.info("Deleting config {} (uri = {})", pid, uri); cfg.delete(); Modified: incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/ConfigurationPid.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/ConfigurationPid.java?rev=711738&r1=711737&r2=711738&view=diff ============================================================================== --- incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/ConfigurationPid.java (original) +++ incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/ConfigurationPid.java Wed Nov 5 15:21:36 2008 @@ -27,15 +27,19 @@ private final String factoryPid; public ConfigurationPid(String path) { - // cut off path and extension + // cut off path String pid = path; final int lastSlash = path.lastIndexOf('/'); if(lastSlash >= 0) { pid = path.substring(lastSlash + 1); } - final int lastDot = pid.lastIndexOf('.'); - if(lastDot >= 0) { - pid = pid.substring(0, lastDot); + + // cut off extension if it's .cfg + if(pid.endsWith(ConfigResourceProcessor.CONFIG_EXTENSION)) { + final int lastDot = pid.lastIndexOf('.'); + if(lastDot >= 0) { + pid = pid.substring(0, lastDot); + } } // split pid and factory pid alias Modified: incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/OsgiControllerImpl.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/OsgiControllerImpl.java?rev=711738&r1=711737&r2=711738&view=diff ============================================================================== --- incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/OsgiControllerImpl.java (original) +++ incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/OsgiControllerImpl.java Wed Nov 5 15:21:36 2008 @@ -129,15 +129,18 @@ } public void uninstall(String uri) throws JcrInstallException { - final OsgiResourceProcessor p = getProcessor(uri, null); - if(p != null) { - try { - p.uninstall(uri, storage.getMap(uri)); - storage.remove(uri); - storage.saveToFile(); - } catch(Exception e) { - throw new JcrInstallException("Exception in uninstall (" + uri + ")", e); - } + try { + // let each processor try to uninstall, one of them + // should know how that handle uri + for(OsgiResourceProcessor p : this.processors) { + p.uninstall(uri, storage.getMap(uri)); + } + + storage.remove(uri); + storage.saveToFile(); + + } catch(Exception e) { + throw new JcrInstallException("Exception in uninstall (" + uri + ")", e); } }