svn commit: r1044409 - in /sling/trunk/launchpad/base: pom.xml src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java

[cziegeler]

Author: cziegeler
Date: Fri Dec 10 15:52:41 2010
New Revision: 1044409

URL: http://svn.apache.org/viewvc?rev=1044409&view=rev
Log:
SLING-1893 : Upgrade to Apache Felix Framework 3.0.6

Modified:
    sling/trunk/launchpad/base/pom.xml
    
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java

Modified: sling/trunk/launchpad/base/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1044409&r1=1044408&r2=1044409&view=diff
==============================================================================
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Fri Dec 10 15:52:41 2010
@@ -224,7 +224,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java?rev=1044409&r1=1044408&r2=1044409&view=diff
==============================================================================
--- 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java
 (original)
+++ 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java
 Fri Dec 10 15:52:41 2010
@@ -44,7 +44,9 @@ import org.apache.sling.launchpad.base.i
 import org.apache.sling.launchpad.base.shared.Launcher;
 import org.apache.sling.launchpad.base.shared.Notifiable;
 import org.apache.sling.launchpad.base.shared.SharedConstants;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
+import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceReference;
 
 /**
@@ -416,8 +418,9 @@ public class SlingServletDelegate extend
         }
 
         @Override
-        protected void doLog(ServiceReference sr, int level, String msg,
-                Throwable throwable) {
+        protected void doLog(
+                Bundle bundle, ServiceReference sr, int level,
+                String msg, Throwable throwable) {
 
             // unwind throwable if it is a BundleException
             if ((throwable instanceof BundleException)
@@ -426,6 +429,7 @@ public class SlingServletDelegate extend
             }
 
             String s = (sr == null) ? null : "SvcRef " + sr;
+            s = (s == null) ? null : s + " Bundle '" + bundle.getBundleId() + 
"'";
             s = (s == null) ? msg : s + " " + msg;
             s = (throwable == null) ? s : s + " (" + throwable + ")";
 
@@ -476,11 +480,13 @@ public class SlingServletDelegate extend
                 path = "/" + path;
             }
 
+            @SuppressWarnings("rawtypes")
             Set resources = servletContext.getResourcePaths(path); // unchecked
             if (resources == null || resources.isEmpty()) {
                 resources = servletContext.getResourcePaths(WEB_INF + path); 
// unchecked
             }
 
+            @SuppressWarnings("rawtypes")
             Iterator resourceIterator;
             if ( resources == null || resources.isEmpty() ) {
                 // fall back to the class path