You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/01/07 14:33:25 UTC
svn commit: r609602 - in
/incubator/sling/whiteboard/fmeschbe/resource/launcher/webapp: pom.xml
src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
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;
/**