You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2007/12/24 11:18:43 UTC
svn commit: r606687 -
/incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
Author: cziegeler
Date: Mon Dec 24 02:18:42 2007
New Revision: 606687
URL: http://svn.apache.org/viewvc?rev=606687&view=rev
Log:
Correct property value (although it isn't really used).
Modified:
incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
Modified: incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java?rev=606687&r1=606686&r2=606687&view=diff
==============================================================================
--- incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java (original)
+++ incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java Mon Dec 24 02:18:42 2007
@@ -16,7 +16,7 @@
*/
package org.apache.sling.launcher.webapp;
-import static org.apache.felix.framework.util.FelixConstants.LOG_LEVEL_PROP;
+import static org.apache.felix.framework.util.FelixConstants.*;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -42,6 +42,7 @@
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;
/**
@@ -244,11 +245,12 @@
// Try to load it from one of these places.
Map<String, String> props = new HashMap<String, String>();
+ // The following property must start with a comma!
final String servletVersion = getServletContext().getMajorVersion() + "." +
getServletContext().getMinorVersion();
props.put(
Sling.PROP_SYSTEM_PACKAGES,
- "javax.servlet;javax.servlet.http;javax.servlet.resources; version=" + servletVersion);
+ ",javax.servlet;javax.servlet.http;javax.servlet.resources; version=" + servletVersion);
// prevent system properties from being considered
props.put(Sling.SLING_IGNORE_SYSTEM_PROPERTIES, "true");
Re: svn commit: r606687 - /incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
Posted by Carsten Ziegeler <cz...@apache.org>.
Hehe :)
Yepp, my Eclipse crashed completly two days ago and all settings and
preferences were lost (as all projects are under version control I don't
keep backups of my workspace...hmpf) - so I have wrong settings here and
there until I find all places...
And yes, I hate "*" imports as well :)
Carsten
Felix Meschberger wrote:
> Oops, Sorry, this was not really meant for the list :-) Anyway, I just
> want to note, that I don't like "*" static imports...
>
> Regards
> Felix
>
> Am Freitag, den 28.12.2007, 19:30 +0100 schrieb Felix Meschberger:
>> Sali Carsten,
>>
>> Am Montag, den 24.12.2007, 10:18 +0000 schrieb cziegeler@apache.org:
>>> -import static org.apache.felix.framework.util.FelixConstants.LOG_LEVEL_PROP;
>>> +import static org.apache.felix.framework.util.FelixConstants.*;
>> Ist das eine Panne ? Ich finde nämlich solche "*" Importe bei statischen
>> imports noch schlimmer als bei normalen Klassen :-)
>>
>> Gruss
>> Felix
>
>
--
Carsten Ziegeler
cziegeler@apache.org
Re: svn commit: r606687 -
/incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
Posted by Felix Meschberger <fm...@gmail.com>.
Oops, Sorry, this was not really meant for the list :-) Anyway, I just
want to note, that I don't like "*" static imports...
Regards
Felix
Am Freitag, den 28.12.2007, 19:30 +0100 schrieb Felix Meschberger:
> Sali Carsten,
>
> Am Montag, den 24.12.2007, 10:18 +0000 schrieb cziegeler@apache.org:
> > -import static org.apache.felix.framework.util.FelixConstants.LOG_LEVEL_PROP;
> > +import static org.apache.felix.framework.util.FelixConstants.*;
>
> Ist das eine Panne ? Ich finde nämlich solche "*" Importe bei statischen
> imports noch schlimmer als bei normalen Klassen :-)
>
> Gruss
> Felix
Re: svn commit: r606687 -
/incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
Posted by Felix Meschberger <Fe...@day.com>.
Sali Carsten,
Am Montag, den 24.12.2007, 10:18 +0000 schrieb cziegeler@apache.org:
> -import static org.apache.felix.framework.util.FelixConstants.LOG_LEVEL_PROP;
> +import static org.apache.felix.framework.util.FelixConstants.*;
Ist das eine Panne ? Ich finde nämlich solche "*" Importe bei statischen
imports noch schlimmer als bei normalen Klassen :-)
Gruss
Felix