Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 44904 invoked from network); 14 Sep 2010 14:27:28 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Sep 2010 14:27:28 -0000 Received: (qmail 38385 invoked by uid 500); 14 Sep 2010 14:27:28 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 38324 invoked by uid 500); 14 Sep 2010 14:27:26 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 38317 invoked by uid 99); 14 Sep 2010 14:27:26 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Sep 2010 14:27:26 +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; Tue, 14 Sep 2010 14:27:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CEB8F23889ED; Tue, 14 Sep 2010 14:26:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r996915 - /sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java Date: Tue, 14 Sep 2010 14:26:47 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100914142647.CEB8F23889ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Tue Sep 14 14:26:47 2010 New Revision: 996915 URL: http://svn.apache.org/viewvc?rev=996915&view=rev Log: Skip unknown resource types immediately for now Modified: sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java Modified: sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java?rev=996915&r1=996914&r2=996915&view=diff ============================================================================== --- sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java (original) +++ sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java Tue Sep 14 14:26:47 2010 @@ -199,8 +199,13 @@ public class OsgiInstallerImpl for(final InstallableResource r : resources ) { try { final RegisteredResource rr = RegisteredResourceImpl.create(ctx, r, scheme); - createdResources.add(rr); - logger.debug("Adding new resource {}", rr); + final String rt = rr.getType(); + if ( InstallableResource.TYPE_BUNDLE.equals(rt) || InstallableResource.TYPE_CONFIG.equals(rt) ) { + createdResources.add(rr); + logger.debug("Adding new resource {}", rr); + } else { + logger.debug("Ignoring unsupported resource type {} of resource {}", rt, rr); + } } catch (final IOException ioe) { logger.warn("Cannot create RegisteredResource (resource will be ignored):" + r, ioe); }