Author: tomekopo
Date: Tue Jul 27 18:24:41 2010
New Revision: 979794
URL: http://svn.apache.org/viewvc?rev=979794&view=rev
Log:
Fixed bug with not clearing previous page after going to another. Added
external logger's configuration
Added:
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/logging.properties
Modified:
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/pom.xml
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/servlet/Generate.java
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml
cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/browser/client/view/BrowseViewImpl.java
Added:
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/logging.properties
URL:
http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/logging.properties?rev=979794&view=auto
==============================================================================
---
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/logging.properties
(added)
+++
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/logging.properties
Tue Jul 27 18:24:41 2010
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+handlers = java.util.logging.ConsoleHandler
+
+.level = WARNING
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+demo.logbrowser.servlet.Generate.level = FINE
+org.apache.cxf.interceptor.LoggingInInterceptor.level = INFO
+org.apache.cxf.interceptor.LoggingOutInterceptor.level = INFO
Modified:
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/pom.xml?rev=979794&r1=979793&r2=979794&view=diff
==============================================================================
---
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/pom.xml
(original)
+++
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/pom.xml
Tue Jul 27 18:24:41 2010
@@ -49,6 +49,12 @@
</goals>
<configuration>
<mainClass>demo.logbrowser.servlet.Server</mainClass>
+ <systemProperties>
+ <systemProperty>
+ <key>java.util.logging.config.file</key>
+
<value>${basedir}/logging.properties</value>
+ </systemProperty>
+ </systemProperties>
</configuration>
</execution>
</executions>
Modified:
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/servlet/Generate.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/servlet/Generate.java?rev=979794&r1=979793&r2=979794&view=diff
==============================================================================
---
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/servlet/Generate.java
(original)
+++
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/servlet/Generate.java
Tue Jul 27 18:24:41 2010
@@ -32,10 +32,6 @@ import org.apache.cxf.common.logging.Log
public class Generate extends HttpServlet {
private static final Logger LOGGER = LogUtils.getL7dLogger(Generate.class);
- static {
- LOGGER.setLevel(Level.FINEST);
- }
-
private static final String LEVEL = "level";
private static final String MESSAGE = "message";
private static final String COPIES = "copies";
Modified:
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml?rev=979794&r1=979793&r2=979794&view=diff
==============================================================================
---
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml
(original)
+++
cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml
Tue Jul 27 18:24:41 2010
@@ -46,19 +46,21 @@
demo.logbrowser.App
</param-value>
</init-param>
+
<init-param>
<param-name>jaxrs.inInterceptors</param-name>
<param-value>
org.apache.cxf.interceptor.LoggingInInterceptor
</param-value>
</init-param>
+
<init-param>
<param-name>jaxrs.outInterceptors</param-name>
<param-value>
org.apache.cxf.interceptor.LoggingOutInterceptor
</param-value>
</init-param>
-
+
<load-on-startup>2</load-on-startup>
</servlet>
Modified:
cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/browser/client/view/BrowseViewImpl.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/browser/client/view/BrowseViewImpl.java?rev=979794&r1=979793&r2=979794&view=diff
==============================================================================
---
cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/browser/client/view/BrowseViewImpl.java
(original)
+++
cxf/sandbox/logbrowser/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/browser/client/view/BrowseViewImpl.java
Tue Jul 27 18:24:41 2010
@@ -19,6 +19,7 @@
package org.apache.cxf.management.web.logging.browser.client.view;
+import java.util.ArrayList;
import java.util.List;
import com.google.gwt.core.client.GWT;
@@ -233,16 +234,18 @@ public class BrowseViewImpl extends Comp
}
- public void setEntries(List<Entry> entries) {
- if (entries == null || entries.isEmpty()) {
+ public void setEntries(List<Entry> newEntries) {
+ entriesTable.clear(true);
+ entries = new ArrayList<Entry>();
+
+ if (newEntries == null || newEntries.isEmpty()) {
setNoEntriesLayout();
return;
} else {
- entriesTable.clear();
setEntriesLayout();
}
- this.entries = entries;
+ entries = newEntries;
int row = 0;
for (Entry entry : entries) {
