felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r693945 - in /felix/trunk/shell.remote: pom.xml src/main/java/org/apache/felix/shell/remote/ServiceMediator.java
Date Wed, 10 Sep 2008 19:33:26 GMT
Author: fmeschbe
Date: Wed Sep 10 12:33:25 2008
New Revision: 693945

URL: http://svn.apache.org/viewvc?rev=693945&view=rev
Log:
FELIX-709 Make remote shell workable without a LogService provider
and reorganize Manifest Header Generation a bit

Modified:
    felix/trunk/shell.remote/pom.xml
    felix/trunk/shell.remote/src/main/java/org/apache/felix/shell/remote/ServiceMediator.java

Modified: felix/trunk/shell.remote/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/shell.remote/pom.xml?rev=693945&r1=693944&r2=693945&view=diff
==============================================================================
--- felix/trunk/shell.remote/pom.xml (original)
+++ felix/trunk/shell.remote/pom.xml Wed Sep 10 12:33:25 2008
@@ -57,22 +57,16 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Private-Package>
-                            org.apache.felix.shell.remote.*
-                        </Private-Package>
                         <Bundle-Category>console</Bundle-Category>
                         <Bundle-Activator>
                             org.apache.felix.shell.remote.Activator
                         </Bundle-Activator>
-                        <Bundle-SymbolicName>
-                            ${pom.artifactId}
-                        </Bundle-SymbolicName>
-                        <Bundle-Vendor>
-                            The Apache Software Foundation
-                        </Bundle-Vendor>
-                        <Bundle-Copyright>
-                            Dieter Wimberger
-                        </Bundle-Copyright>
+                        <Private-Package>
+                            org.apache.felix.shell.remote.*
+                        </Private-Package>
+                        <Import-Package>
+                            org.osgi.service.log;resolution:=optional,* 
+                        </Import-Package>
                         <Import-Service>
                             org.apache.felix.shell.ShellService
                         </Import-Service>

Modified: felix/trunk/shell.remote/src/main/java/org/apache/felix/shell/remote/ServiceMediator.java
URL: http://svn.apache.org/viewvc/felix/trunk/shell.remote/src/main/java/org/apache/felix/shell/remote/ServiceMediator.java?rev=693945&r1=693944&r2=693945&view=diff
==============================================================================
--- felix/trunk/shell.remote/src/main/java/org/apache/felix/shell/remote/ServiceMediator.java
(original)
+++ felix/trunk/shell.remote/src/main/java/org/apache/felix/shell/remote/ServiceMediator.java
Wed Sep 10 12:33:25 2008
@@ -207,9 +207,18 @@
         //prepareDefinitions listener
         ServiceListener serviceListener = new ServiceListenerImpl();
 
-        //prepareDefinitions the filter
-        String filter = "(|(objectclass=" + ShellService.class.getName() + ")" + "(objectclass="
-            + LogService.class.getName() + "))";
+        //prepareDefinitions the filter, ShellService is required,
+        //LogService may be missing, in which case we only use the
+        // ShellService part of the filter
+        String filter = "(objectclass=" + ShellService.class.getName() + ")";
+        try
+        {
+            filter = "(|" + filter + "(objectclass=" + LogService.class.getName() + "))";
+        }
+        catch ( Throwable t )
+        {
+            // ignore
+        }
 
         try
         {



Mime
View raw message