Author: ldywicki
Date: Thu Aug 30 19:58:03 2012
New Revision: 1379099
URL: http://svn.apache.org/viewvc?rev=1379099&view=rev
Log:
KARAF-1780 Solve serialization issues in log plugin
Modified:
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogEntriesDataProvider.java
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogsPage.java
karaf/webconsole/trunk/osgi/log/src/main/resources/OSGI-INF/blueprint/log.xml
Modified:
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogEntriesDataProvider.java
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogEntriesDataProvider.java?rev=1379099&r1=1379098&r2=1379099&view=diff
==============================================================================
---
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogEntriesDataProvider.java
(original)
+++
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogEntriesDataProvider.java
Thu Aug 30 19:58:03 2012
@@ -40,7 +40,7 @@ final class LogEntriesDataProvider exten
private Options options;
- private transient List<Matcher> matchers;
+ private List<Matcher> matchers;
public LogEntriesDataProvider(LogReaderService logReader, Options options,
List<Matcher> matchers) {
this.logReader = logReader;
Modified:
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogsPage.java
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogsPage.java?rev=1379099&r1=1379098&r2=1379099&view=diff
==============================================================================
---
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogsPage.java
(original)
+++
karaf/webconsole/trunk/osgi/log/src/main/java/org/apache/karaf/webconsole/osgi/log/LogsPage.java
Thu Aug 30 19:58:03 2012
@@ -23,12 +23,7 @@ import java.util.List;
import org.apache.karaf.webconsole.core.table.PropertyColumnExt;
import org.apache.karaf.webconsole.osgi.core.shared.OsgiPage;
-import org.apache.karaf.webconsole.osgi.log.search.BundleMatcher;
-import org.apache.karaf.webconsole.osgi.log.search.DateFromMatcher;
-import org.apache.karaf.webconsole.osgi.log.search.DateToMatcher;
import org.apache.karaf.webconsole.osgi.log.search.Matcher;
-import org.apache.karaf.webconsole.osgi.log.search.MessageMatcher;
-import org.apache.karaf.webconsole.osgi.log.search.PriorityMatcher;
import
org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import
org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import
org.apache.wicket.extensions.markup.html.repeater.data.table.DefaultDataTable;
@@ -55,6 +50,9 @@ public class LogsPage extends OsgiPage {
@PaxWicketBean(name = "logReader")
private LogReaderService logReader;
+ @PaxWicketBean(name = "matchers")
+ private List<Matcher> matchers;
+
private Options options = new Options();
@SuppressWarnings("serial")
@@ -84,14 +82,6 @@ public class LogsPage extends OsgiPage {
OptionsForm form = new OptionsForm("filters", model);
- List<Matcher> matchers = Arrays.asList(
- new PriorityMatcher(),
- new MessageMatcher(),
- new BundleMatcher(),
- new DateFromMatcher(),
- new DateToMatcher()
- );
-
LogEntriesDataProvider provider = new
LogEntriesDataProvider(logReader, options, matchers);
DefaultDataTable<LogEntry> table = new
DefaultDataTable<LogEntry>("logs", Arrays.asList(columns), provider, 20);
Modified:
karaf/webconsole/trunk/osgi/log/src/main/resources/OSGI-INF/blueprint/log.xml
URL:
http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/log/src/main/resources/OSGI-INF/blueprint/log.xml?rev=1379099&r1=1379098&r2=1379099&view=diff
==============================================================================
---
karaf/webconsole/trunk/osgi/log/src/main/resources/OSGI-INF/blueprint/log.xml
(original)
+++
karaf/webconsole/trunk/osgi/log/src/main/resources/OSGI-INF/blueprint/log.xml
Thu Aug 30 19:58:03 2012
@@ -27,4 +27,22 @@
<reference id="logReader"
interface="org.osgi.service.log.LogReaderService" />
+ <reference-list id="matchers"
interface="org.apache.karaf.webconsole.osgi.log.search.Matcher"
availability="optional" />
+
+ <service auto-export="interfaces">
+ <bean
class="org.apache.karaf.webconsole.osgi.log.search.PriorityMatcher" />
+ </service>
+ <service auto-export="interfaces">
+ <bean
class="org.apache.karaf.webconsole.osgi.log.search.MessageMatcher" />
+ </service>
+ <service auto-export="interfaces">
+ <bean
class="org.apache.karaf.webconsole.osgi.log.search.BundleMatcher" />
+ </service>
+ <service auto-export="interfaces">
+ <bean
class="org.apache.karaf.webconsole.osgi.log.search.DateFromMatcher" />
+ </service>
+ <service auto-export="interfaces">
+ <bean
class="org.apache.karaf.webconsole.osgi.log.search.DateToMatcher" />
+ </service>
+
</blueprint>
