Return-Path: 
 <sling-commits-return-878-apmail-incubator-sling-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org
Received: (qmail 6452 invoked from network); 7 Jan 2008 13:33:48 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Jan 2008 13:33:48 -0000
Received: (qmail 25061 invoked by uid 500); 7 Jan 2008 13:33:38 -0000
Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org
Received: (qmail 25023 invoked by uid 500); 7 Jan 2008 13:33:37 -0000
Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:sling-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:sling-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:sling-commits@incubator.apache.org>
List-Id: <sling-commits.incubator.apache.org>
Reply-To: sling-dev@incubator.apache.org
Delivered-To: mailing list sling-commits@incubator.apache.org
Received: (qmail 25014 invoked by uid 99); 7 Jan 2008 13:33:37 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2008 05:33:37 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2008 13:33:34 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E27A71A9897; Mon,  7 Jan 2008 05:33:25 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r609602 - in
 /incubator/sling/whiteboard/fmeschbe/resource/launcher/webapp: pom.xml
 src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
Date: Mon, 07 Jan 2008 13:33:25 -0000
To: sling-commits@incubator.apache.org
From: fmeschbe@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080107133325.E27A71A9897@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: fmeschbe
Date: Mon Jan  7 05:33:24 2008
New Revision: 609602

URL: http://svn.apache.org/viewvc?rev=609602&view=rev
Log:
Need to add dependency on Felix framework to keep M2Eclipse happy. After all
the dependency is actually a good thing because it clearly indicates
that we are actually using some stuff of this project here.

Modified:
    incubator/sling/whiteboard/fmeschbe/resource/launcher/webapp/pom.xml
    incubator/sling/whiteboard/fmeschbe/resource/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java

Modified: incubator/sling/whiteboard/fmeschbe/resource/launcher/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/whiteboard/fmeschbe/resource/launcher/webapp/pom.xml?rev=609602&r1=609601&r2=609602&view=diff
==============================================================================
--- incubator/sling/whiteboard/fmeschbe/resource/launcher/webapp/pom.xml (original)
+++ incubator/sling/whiteboard/fmeschbe/resource/launcher/webapp/pom.xml Mon Jan  7 05:33:24 2008
@@ -204,6 +204,11 @@
             <version>1.0.0-v20070606</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
+        </dependency>
 
         <!-- The servlet container will have to provide these API classes -->
         <dependency>

Modified: incubator/sling/whiteboard/fmeschbe/resource/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/whiteboard/fmeschbe/resource/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java?rev=609602&r1=609601&r2=609602&view=diff
==============================================================================
--- incubator/sling/whiteboard/fmeschbe/resource/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java (original)
+++ incubator/sling/whiteboard/fmeschbe/resource/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java Mon Jan  7 05:33:24 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.sling.launcher.webapp;
 
-import static org.apache.felix.framework.util.FelixConstants.*;
+import static org.apache.felix.framework.util.FelixConstants.LOG_LEVEL_PROP;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -43,7 +43,6 @@
 import org.apache.sling.osgi.log.LogbackManager;
 import org.eclipse.equinox.http.servlet.HttpServiceServlet;
 import org.osgi.framework.BundleException;
-import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceReference;
 
 /**