Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 24757 invoked from network); 7 Jul 2008 12:43:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Jul 2008 12:43:09 -0000 Received: (qmail 41635 invoked by uid 500); 7 Jul 2008 12:43:09 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 41600 invoked by uid 500); 7 Jul 2008 12:43:09 -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 41591 invoked by uid 99); 7 Jul 2008 12:43:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jul 2008 05:43:09 -0700 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, 07 Jul 2008 12:42:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 267982388A3A; Mon, 7 Jul 2008 05:42:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674472 - /incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties Date: Mon, 07 Jul 2008 12:42:17 -0000 To: sling-commits@incubator.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080707124218.267982388A3A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Mon Jul 7 05:42:17 2008 New Revision: 674472 URL: http://svn.apache.org/viewvc?rev=674472&view=rev Log: As FELIX-58 is fixed, we can enable url handlers of the framework by default. Modified: incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties Modified: incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties?rev=674472&r1=674471&r2=674472&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties (original) +++ incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties Mon Jul 7 05:42:17 2008 @@ -39,26 +39,6 @@ # -############################################################################### -### -### TEMPORARY FIX for URLStreamHandler issue - we simply disable -### URLStreamHandler support in the framework. -### -### As soon as Felix has fixed issue http://issues.apache.org/jira/browse/FELIX-38 -### this property must be removed again, to enable respective support -### -### Not setting this property or setting it to true would enable -### URLStreamHandler support but prevent stopping/starting cycles of the -### Sling Servlet in any servlet container. -### -### We set this here globally, to have the same behaviour of Sling regardless -### being started standalone or as a web application. -### -felix.service.urlhandlers = false -############################################################################### - - -# # List of packages to append to the org.osgi.framework.system.packages property # NOTE: If this is set, it must start with a comma ! # org.apache.sling.launcher.system.packages