svn commit: r1089785 - in /incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl: MainDataFileProvider.java WebConsolePlugin.java

[bd...@apache.org]

Author: bdelacretaz
Date: Thu Apr  7 09:04:53 2011
New Revision: 1089785

URL: http://svn.apache.org/viewvc?rev=1089785&view=rev
Log:
STANBOL-146 - more info in Webconsole plugin, and fix service ranking

Modified:
    incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java
    incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/WebConsolePlugin.java

Modified: incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java?rev=1089785&r1=1089784&r2=1089785&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java (original)
+++ incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java Thu Apr  7 09:04:53 2011
@@ -28,6 +28,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+// DO NOT REMOVE - workaround for FELIX-2906 
+import java.lang.Integer;
+
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -47,17 +50,17 @@ import org.slf4j.LoggerFactory;
 /** The main DatafileProvider, delegates to other DataFileProvider if 
  *  the requested file is not found in its datafiles folder.
  *  
- *  Must have the lowest service ranking of all DatafileProvider, so
- *  that this is the default one which delegates to others. 
+ *  Must have the highest service ranking of all DatafileProvider, so
+ *  that this is the default one which delegates to others.
  */
 @Component(immediate=true, metatype=true)
 @Service
-@Property(name=Constants.SERVICE_RANKING, intValue=0)
+@Property(name=Constants.SERVICE_RANKING, intValue=Integer.MAX_VALUE)
 public class MainDataFileProvider implements DataFileProvider, DataFileProviderLog {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
     
-    @Property(value="./datafiles")
+    @Property(value="datafiles")
     public static final String DATA_FILES_FOLDER_PROP = "data.files.folder";
     private File dataFilesFolder;
     
@@ -192,4 +195,8 @@ public class MainDataFileProvider implem
         log.info("Successfully loaded file {}", event);
         return result;
     }
+    
+    File getDataFilesFolder() {
+        return dataFilesFolder;
+    }
 }
\ No newline at end of file

Modified: incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/WebConsolePlugin.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/WebConsolePlugin.java?rev=1089785&r1=1089784&r2=1089785&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/WebConsolePlugin.java (original)
+++ incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/WebConsolePlugin.java Thu Apr  7 09:04:53 2011
@@ -31,6 +31,7 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileProvider;
 import org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileProviderEvent;
 import org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileProviderLog;
 
@@ -47,13 +48,28 @@ public class WebConsolePlugin extends Ht
     @Reference
     private DataFileProviderLog dataFileProviderLog;
     
+    @Reference
+    private DataFileProvider dataFileProvider;
+    
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
     throws ServletException, IOException {
         final PrintWriter pw = response.getWriter();
         
         pw.println("<p class='statline ui-state-highlight'>");
-        pw.println("Last " + dataFileProviderLog.size() + " DataFileProvider events");
+        pw.println("Displaying the last " + dataFileProviderLog.size() + " DataFileProvider events");
+
+        String dfPath = "<PATH NOT FOUND??>";
+        if(dataFileProvider instanceof MainDataFileProvider) {
+            dfPath = ((MainDataFileProvider)dataFileProvider).getDataFilesFolder().getAbsolutePath();
+        }
+            
+        pw.println("<br/>");
+        pw.println("Data files found in the " + dfPath + " folder have precedence");
+        
+        pw.println("<br/>");
+        pw.println("The main DataFileProvider is " + dataFileProvider.getClass().getName());
+        
         pw.println("</p>");
         
         pw.println("<table class='nicetable'>");