- logback-dev - mailman3.qos.ch

svn commit: r1485 - in logbackPDE/trunk/plugins: ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views ConsolePluginTest/src/ch/qos/logback/eclipse/test
by noreply.seb＠qos.ch 29 Mar '07

29 Mar '07

Author: seb Date: Thu Mar 29 15:06:41 2007 New Revision: 1485 Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/AbstractPluginTest.java logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/LogbackViewTest.java logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/SendEventTest.java Log: Unit tests are working again Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java Thu Mar 29 15:06:41 2007 @@ -25,6 +25,7 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IMemento; import org.eclipse.ui.ISharedImages; @@ -342,4 +343,18 @@ } } + public String getLastLine() { + //used for testing only + if (viewer.getTable().getItemCount() == 0) { + return null; + } + TableItem item = viewer.getTable().getItem((viewer.getTable().getItemCount()-1)); + return item.getText(); + } + + public int getNumberOfLines() { + //used for testing only + return viewer.getTable().getItemCount(); + } + } \ No newline at end of file Modified: logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/AbstractPluginTest.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/AbstractPluginTest.java (original) +++ logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/AbstractPluginTest.java Thu Mar 29 15:06:41 2007 @@ -3,9 +3,7 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.PlatformUI; import ch.qos.logback.eclipse.views.LogbackView; @@ -77,15 +75,13 @@ } protected void assertLogbackViewContent(LogbackView view, int numberOfLines, String lastLineText) { - TableViewer viewer = (TableViewer) view.getViewer(); - TableItem[] items = viewer.getTable().getItems(); - assertEquals(numberOfLines, items.length); + String last = view.getLastLine(); + assertEquals(numberOfLines, view.getNumberOfLines()); if (lastLineText != null) { - if (items.length == 0) { + if (last == null) { fail("Nothing to compare to expected text"); } - TableItem lastItem = items[items.length-1]; - assertEquals(lastLineText, lastItem.getText()); + assertEquals(lastLineText, last); } } Modified: logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/LogbackViewTest.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/LogbackViewTest.java (original) +++ logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/LogbackViewTest.java Thu Mar 29 15:06:41 2007 @@ -1,7 +1,5 @@ package ch.qos.logback.eclipse.test; -import org.eclipse.ui.PlatformUI; - import ch.qos.logback.eclipse.views.LogbackView; public class LogbackViewTest extends AbstractPluginTest { @@ -28,9 +26,6 @@ protected void tearDown() throws Exception { super.tearDown(); - // Dispose of test fixture. - waitForJobs(); - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().hideView(testView); } public void testView() { Modified: logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/SendEventTest.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/SendEventTest.java (original) +++ logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/SendEventTest.java Thu Mar 29 15:06:41 2007 @@ -49,8 +49,8 @@ public void testSendEvent() throws InterruptedException { rootLogger.debug("testing"); waitForJobs(); - //delay(3000); - assertLogbackViewContent(view, 1, "testing\n"); + delay(3000); + assertLogbackViewContent(view, 1, "testing"); } }

1 0

svn commit: r1484 - in logbackPDE/trunk/plugins: ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views ConsolePluginTest ConsolePluginTest/META-INF ConsolePluginTest/lib ConsolePluginTest/src/ch/qos/logback/eclipse/test
by noreply.seb＠qos.ch 29 Mar '07

29 Mar '07

Author: seb Date: Thu Mar 29 14:04:30 2007 New Revision: 1484 Added: logbackPDE/trunk/plugins/ConsolePluginTest/lib/logback-classic-0.9.3.jar (contents, props changed) logbackPDE/trunk/plugins/ConsolePluginTest/lib/logback-core-0.9.3.jar (contents, props changed) Removed: logbackPDE/trunk/plugins/ConsolePluginTest/lib/logback-classic-0.9.1-SNAPSHOT.jar logbackPDE/trunk/plugins/ConsolePluginTest/lib/logback-core-0.9.1-SNAPSHOT.jar Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackFilterDialog.java logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java logbackPDE/trunk/plugins/ConsolePluginTest/META-INF/MANIFEST.MF logbackPDE/trunk/plugins/ConsolePluginTest/build.properties logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/AbstractPluginTest.java logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/LogbackViewTest.java logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/SendEventTest.java Log: Corrected a bug in event manager Updating test cases Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackFilterDialog.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackFilterDialog.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackFilterDialog.java Thu Mar 29 14:04:30 2007 @@ -9,7 +9,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java Thu Mar 29 14:04:30 2007 @@ -267,6 +267,8 @@ this.memento = memento; initServer(); if (memento != null) { + LoggingEventManager.getManager().init(memento); + IMemento mem = memento.getChild(TAG_DISPLAY); if (mem == null) { return; @@ -275,7 +277,6 @@ tmpFontSize = mem.getInteger(TAG_FONTSIZE); tmpFontName = mem.getString(TAG_FONTNAME); } - LoggingEventManager.getManager().init(memento); } public Viewer getViewer() { Modified: logbackPDE/trunk/plugins/ConsolePluginTest/META-INF/MANIFEST.MF ============================================================================== --- logbackPDE/trunk/plugins/ConsolePluginTest/META-INF/MANIFEST.MF (original) +++ logbackPDE/trunk/plugins/ConsolePluginTest/META-INF/MANIFEST.MF Thu Mar 29 14:04:30 2007 @@ -10,9 +10,13 @@ ch.qos.logback.eclipse, org.junit, org.eclipse.ui.console, - org.eclipse.jface.text + org.eclipse.jface.text, + org.eclipse.jdt.core, + org.eclipse.core.resources, + org.eclipse.ui.ide, + org.eclipse.jdt.debug.ui Eclipse-LazyStart: true -Bundle-ClassPath: lib/logback-classic-0.9.1-SNAPSHOT.jar, - lib/logback-core-0.9.1-SNAPSHOT.jar, - lib/slf4j-api-1.3.0.jar, - . +Bundle-ClassPath: lib/slf4j-api-1.3.0.jar, + ., + lib/logback-classic-0.9.3.jar, + lib/logback-core-0.9.3.jar Modified: logbackPDE/trunk/plugins/ConsolePluginTest/build.properties ============================================================================== --- logbackPDE/trunk/plugins/ConsolePluginTest/build.properties (original) +++ logbackPDE/trunk/plugins/ConsolePluginTest/build.properties Thu Mar 29 14:04:30 2007 @@ -2,6 +2,6 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - lib/logback-classic-0.9.1-SNAPSHOT.jar,\ - lib/logback-core-0.9.1-SNAPSHOT.jar,\ - lib/slf4j-api-1.3.0.jar + lib/slf4j-api-1.3.0.jar,\ + lib/logback-classic-0.9.3.jar,\ + lib/logback-core-0.9.3.jar Added: logbackPDE/trunk/plugins/ConsolePluginTest/lib/logback-classic-0.9.3.jar ============================================================================== Binary file. No diff available. Added: logbackPDE/trunk/plugins/ConsolePluginTest/lib/logback-core-0.9.3.jar ============================================================================== Binary file. No diff available. Modified: logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/AbstractPluginTest.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/AbstractPluginTest.java (original) +++ logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/AbstractPluginTest.java Thu Mar 29 14:04:30 2007 @@ -3,17 +3,38 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PartInitException; +import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.PlatformUI; import ch.qos.logback.eclipse.views.LogbackView; public abstract class AbstractPluginTest extends TestCase { + private LogbackView view; + public AbstractPluginTest(String name) { super(name); } + + @Override + protected void setUp() throws Exception { + try { + view = (LogbackView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() + .showView(LogbackView.ID); + } catch (Exception e) { + e.printStackTrace(); + } + super.setUp(); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } + + /** * Process UI input but do not return for the specified time interval. @@ -23,14 +44,15 @@ */ public void delay(long waitTimeMillis) { Display display = Display.getCurrent(); - +// // If this is the UI thread, // then process input. if (display != null) { long endTimeMillis = System.currentTimeMillis() + waitTimeMillis; while (System.currentTimeMillis() < endTimeMillis) { - if (!display.readAndDispatch()) + if (!display.readAndDispatch()) { display.sleep(); + } } display.update(); } @@ -49,22 +71,25 @@ * Wait until all background tasks are complete. */ public void waitForJobs() { - while (Platform.getJobManager().currentJob() != null) + while (Platform.getJobManager().currentJob() != null) { delay(1000); + } } - protected void assertLogbackViewContent(LogbackView logbackView, String expectedContent) { -// String consoleText = logbackView.getViewer().getTextWidget().getText(); -// assertEquals(expectedContent, consoleText); + protected void assertLogbackViewContent(LogbackView view, int numberOfLines, String lastLineText) { + TableViewer viewer = (TableViewer) view.getViewer(); + TableItem[] items = viewer.getTable().getItems(); + assertEquals(numberOfLines, items.length); + if (lastLineText != null) { + if (items.length == 0) { + fail("Nothing to compare to expected text"); + } + TableItem lastItem = items[items.length-1]; + assertEquals(lastLineText, lastItem.getText()); + } } protected LogbackView getLogbackView() { - try { - return (LogbackView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .showView(LogbackView.ID); - } catch (PartInitException e) { - e.printStackTrace(); - return null; - } + return view; } } Modified: logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/LogbackViewTest.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/LogbackViewTest.java (original) +++ logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/LogbackViewTest.java Thu Mar 29 14:04:30 2007 @@ -17,8 +17,7 @@ // Initialize the test fixture for each test // that is run. waitForJobs(); - testView = (LogbackView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .showView(LogbackView.ID); + testView = getLogbackView(); // Delay for 3 seconds so that // the Favorites view can be seen. @@ -36,6 +35,6 @@ public void testView() { // check that the view is open and empty - assertLogbackViewContent(testView, ""); + assertLogbackViewContent(testView, 0, null); } } \ No newline at end of file Modified: logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/SendEventTest.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/SendEventTest.java (original) +++ logbackPDE/trunk/plugins/ConsolePluginTest/src/ch/qos/logback/eclipse/test/SendEventTest.java Thu Mar 29 14:04:30 2007 @@ -49,8 +49,8 @@ public void testSendEvent() throws InterruptedException { rootLogger.debug("testing"); waitForJobs(); - delay(3000); - assertLogbackViewContent(view, "testing\n"); + //delay(3000); + assertLogbackViewContent(view, 1, "testing\n"); } }

1 0

svn commit: r1483 - logback/trunk/logback-site/src/site/pages
by noreply.ceki＠qos.ch 28 Mar '07

28 Mar '07

Author: ceki Date: Wed Mar 28 21:46:50 2007 New Revision: 1483 Modified: logback/trunk/logback-site/src/site/pages/consolePlugin.html Log: minor rewording Modified: logback/trunk/logback-site/src/site/pages/consolePlugin.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/consolePlugin.html (original) +++ logback/trunk/logback-site/src/site/pages/consolePlugin.html Wed Mar 28 21:46:50 2007 @@ -27,9 +27,9 @@ print log output on the console. Typically, the developer will also customize the format of the log output by setting properties of a <code>PatternLayout</code> instance. The Logback Console - Plugin for Eclipse serves the same purpose, but offers several - advantages over the console. Below is a list of key advantages of - our plugin: + Plugin for Eclipse serves the same purpose as the regular console, + but offers several advantages over the plain-old console. Below is + a list of key advantages of our plugin: </p> <ul>

1 0

svn commit: r1482 - in logback/trunk/logback-site/src/site/pages: . templates
by noreply.ceki＠qos.ch 28 Mar '07

28 Mar '07

Author: ceki Date: Wed Mar 28 21:44:29 2007 New Revision: 1482 Modified: logback/trunk/logback-site/src/site/pages/consolePlugin.html logback/trunk/logback-site/src/site/pages/templates/left.js Log: updated docs Modified: logback/trunk/logback-site/src/site/pages/consolePlugin.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/consolePlugin.html (original) +++ logback/trunk/logback-site/src/site/pages/consolePlugin.html Wed Mar 28 21:44:29 2007 @@ -23,36 +23,34 @@ <h2>Logback Console Plugin for Eclipse</h2> - <p> - While developping a product, it is often useful to print logs to the console. Logging requests - may be displayed using a <code>PatternLayout</code>, and one can easily see which actions take - place when the code runs. - </p> - - <p> - The logback Console Plugin for Eclipse serves the same purpose, but offers several possibilities - that are not possible by using the usual output to the console. In short, here - are the key advantages of the logback plugin: + <p>During the development process, it is common for developers to + print log output on the console. Typically, the developer will + also customize the format of the log output by setting properties + of a <code>PatternLayout</code> instance. The Logback Console + Plugin for Eclipse serves the same purpose, but offers several + advantages over the console. Below is a list of key advantages of + our plugin: </p> <ul> - <li> - Filter logs using logback's powerful filtering mechanism without changing - your logging configuration - </li> - <li> - View stacktraces in Eclipse's StackTrace Console effortlessly - </li> - <li> - Immediately see where a certain logging request was issued - </li> - <li> - Easy configuration (only one line in your <em>logback.xml</em> file) - </li> - <li> - Change the information that is displayed about each log even after the - logs have been issued. - </li> + + <li>Event of level WARN and ERROR are colored in orange and + respectively in red.</li> + + <li>Go to the java class and line where any given logging request was + issued by double-clicking on its output line. + </li> + + <li>Filter events with logback's powerful filtering mechanism + without changing your logging configuration. + </li> + + <li>Change the output format dynamically whenever you chose to do so.</li> + + + <li>Easy configuration (only one line in your <em>logback.xml</em> file). + </li> + </ul> <h3>Installation</h3> Modified: logback/trunk/logback-site/src/site/pages/templates/left.js ============================================================================== --- logback/trunk/logback-site/src/site/pages/templates/left.js (original) +++ logback/trunk/logback-site/src/site/pages/templates/left.js Wed Mar 28 21:44:29 2007 @@ -12,7 +12,7 @@ document.write('<p class="menu"><a href="' + prefix + 'team.html">Logback Team</a></p>'); document.write('<p><a class="x" href="http://www.qos.ch/"><img src="' + prefix + 'images/logos/qosLogo.png" /></a></p>'); -document.write('<span class="small">Last updated 2007-02-27</span>'); +document.write('<span class="small">Last updated 2007-03-29</span>'); document.write('</p>');

1 0

svn commit: r1481 - logback/trunk/logback-site/src/site/pages
by noreply.ceki＠qos.ch 28 Mar '07

28 Mar '07

Author: ceki Date: Wed Mar 28 21:19:48 2007 New Revision: 1481 Modified: logback/trunk/logback-site/src/site/pages/access.html Log: doc updates Modified: logback/trunk/logback-site/src/site/pages/access.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/access.html (original) +++ logback/trunk/logback-site/src/site/pages/access.html Wed Mar 28 21:19:48 2007 @@ -439,7 +439,45 @@ </configuration> </div> -<script src="templates/footer.js"></script> +<p>Few clicks accessing the <a href="demo.html">logback-demo</a> +application configured as outlined above, yeilds: +</p> + +<div class="source"><b>GET /logback-demo/index.jsp HTTP/1.1</b> +Host: localhost:8080 +User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.11) Gecko/20070312 Firefox/1.5.0.11 +Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 +Accept-Language: en-us,en;q=0.5 +Accept-Encoding: gzip,deflate +Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7 +Keep-Alive: 300 +Connection: keep-alive +Referer: http://localhost:8080/logback-demo/login.jsp +Cookie: JSESSIONID=15c7tqi9ehlwk; OID324nkzcmr=null; OID32862zgoa=null; + + + +<b>HTTP/1.1 200 OK</b> +Content-Type: text/html; charset=iso-8859-1 +Expires: Thu, 01 Jan 1970 00:00:00 GMT +Set-Cookie: JSESSIONID=bgebt99ce9om;path=/logback-demo + + +<html> +<head> + <LINK REL=StyleSheet HREF="css/pk.css" /> +</head> +<body> + +<h2>Logback demo center</h2> + +[snip, so that text is reasonably sized]</div> + +<p> </p> + </div> +<script src="templates/footer.js"></script> + + </body> </html>

1 0

svn commit: r1480 - in logback/trunk/logback-site/src/site: pages resources/images/plugin
by noreply.seb＠qos.ch 28 Mar '07

28 Mar '07

Author: seb Date: Wed Mar 28 21:09:33 2007 New Revision: 1480 Modified: logback/trunk/logback-site/src/site/pages/consolePlugin.html logback/trunk/logback-site/src/site/pages/documentation.html logback/trunk/logback-site/src/site/resources/images/plugin/createFilter.gif logback/trunk/logback-site/src/site/resources/images/plugin/filterWindow.gif Log: Updated doc Modified: logback/trunk/logback-site/src/site/pages/consolePlugin.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/consolePlugin.html (original) +++ logback/trunk/logback-site/src/site/pages/consolePlugin.html Wed Mar 28 21:09:33 2007 @@ -310,6 +310,16 @@ </p> <p> + You may have noticed the two buttons on the left side of the filter windows + labelled <em>Up</em> and <em>Down</em>. An important concept ruling the filters + in logback is that filters are called in a chain. As we've seen above, + a filter returning <em>ACCEPT</em> or <em>DENY</em> will stop the chain + and have a direct impact on the logging event. It is sometimes important + to manage the order in which filters are called to achieve a specific + filtering policy. + </p> + + <p> You should now be ready to experience the logback plugin and use its functionnalites. If you have any question about its use, feel free to use the logback <a href="mailinglist.html">mailing lists</a>. Modified: logback/trunk/logback-site/src/site/pages/documentation.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/documentation.html (original) +++ logback/trunk/logback-site/src/site/pages/documentation.html Wed Mar 28 21:09:33 2007 @@ -48,7 +48,10 @@ </li> <li> <a href="demo.html">Walk-through logback-demo webApp</a> - </li> + </li> + <li> + <a href="consolePlugin.html">User guide of the logback plugin for Eclipse</a> + </li> </ul> <p>Source code related documentation:</p> Modified: logback/trunk/logback-site/src/site/resources/images/plugin/createFilter.gif ============================================================================== Binary files. No diff available. Modified: logback/trunk/logback-site/src/site/resources/images/plugin/filterWindow.gif ============================================================================== Binary files. No diff available.

1 0

svn commit: r1479 - in logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse: dialog model views
by noreply.seb＠qos.ch 28 Mar '07

28 Mar '07

Author: seb Date: Wed Mar 28 21:09:11 2007 New Revision: 1479 Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackFilterDialog.java logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/model/EventFilter.java logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java Log: Added buttons to re-order filters Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackFilterDialog.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackFilterDialog.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/dialog/LogbackFilterDialog.java Wed Mar 28 21:09:11 2007 @@ -51,7 +51,7 @@ protected Control createDialogArea(Composite parent) { Composite container = (Composite) super.createDialogArea(parent); - container.setSize(1000, 3000); + container.setSize(900, 3000); FillLayout layout = new FillLayout(); layout.type = SWT.VERTICAL; @@ -59,8 +59,9 @@ createTable(container); Composite editComposite = new Composite(container, SWT.BORDER); - editComposite.setSize(1000, 1000); + editComposite.setSize(900, 1000); createEditionUIPart(editComposite); + createButtons(editComposite); return container; } @@ -71,38 +72,69 @@ container.setLayout(gridLayout); final Label infoLabel = new Label(container, SWT.NONE); - infoLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 3, 1)); + infoLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1)); infoLabel.setText("Enter java code in the expression field."); + final Button moveUp = new Button(container, SWT.PUSH); + moveUp.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false, 1, 1)); + moveUp.setText("Up"); + moveUp.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + super.widgetSelected(e); + EventFilter.moveFilterUp(current); + viewer.refresh(); + } + }); + final Label infoLabel2 = new Label(container, SWT.NONE); - infoLabel2.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 3, 1)); + infoLabel2.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1)); infoLabel2.setText("Enter ACCEPT, DENY or NEUTRAL in the other two fields."); + final Button moveDown = new Button(container, SWT.PUSH); + moveDown.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false, 1, 1)); + moveDown.setText("Down"); + moveDown.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + super.widgetSelected(e); + EventFilter.moveFilterDown(current); + viewer.refresh(); + } + }); expressionField = new Text(container, SWT.WRAP | SWT.V_SCROLL | SWT.MULTI); GridData gridData = new GridData(); gridData.grabExcessHorizontalSpace = true; gridData.grabExcessVerticalSpace = true; gridData.heightHint = 75; - gridData.widthHint = 300; + gridData.widthHint = 320; gridData.horizontalSpan = 3; gridData.verticalSpan = 2; expressionField.setLayoutData(gridData); - final Label infoLabel3 = new Label(container, SWT.NONE); - infoLabel3.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1)); + Composite cmp = new Composite(container, SWT.NONE); + cmp.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 3, 1)); + GridLayout grd = new GridLayout(); + grd.numColumns = 2; + cmp.setLayout(grd); + final Label infoLabel3 = new Label(cmp, SWT.NONE); + infoLabel3.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 1, 1)); infoLabel3.setText("Action on filter match"); - matchField = new Text(container, SWT.BORDER); - Rectangle bounds2 = matchField.getBounds(); - bounds2.width = 150; + matchField = new Text(cmp, SWT.BORDER); +// Rectangle bounds2 = matchField.getBounds(); +// bounds2.width = 150; matchField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); - final Label infoLabel4 = new Label(container, SWT.NONE); - infoLabel4.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1)); + final Label infoLabel4 = new Label(cmp, SWT.NONE); + infoLabel4.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 1, 1)); infoLabel4.setText("Action on filter mismatch"); - mismatchField = new Text(container, SWT.BORDER); - Rectangle bounds3 = mismatchField.getBounds(); - bounds3.width = 150; + mismatchField = new Text(cmp, SWT.BORDER); +// Rectangle bounds3 = mismatchField.getBounds(); +// bounds3.width = 150; mismatchField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); - + } + + private void createButtons(Composite container) { + final Button saveButton = new Button(container, SWT.PUSH); saveButton.setText("Save"); saveButton.addSelectionListener(new SelectionAdapter() { @@ -182,7 +214,6 @@ expressionField.setText(eval.getExpression()); matchField.setText(current.getOnMatch().toString()); mismatchField.setText(current.getOnMismatch().toString()); - } private void saveCurrentFilter() { Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/model/EventFilter.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/model/EventFilter.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/model/EventFilter.java Wed Mar 28 21:09:11 2007 @@ -101,4 +101,20 @@ } } + public static void moveFilterUp(EvaluatorFilter filter) { + int index = filterList.indexOf(filter); + if (index > 0) { + filterList.remove(filter); + filterList.add(index-1, filter); + } + } + + public static void moveFilterDown(EvaluatorFilter filter) { + int index = filterList.indexOf(filter); + if (index < filterList.size()-1) { + filterList.remove(filter); + filterList.add(index+1, filter); + } + } + } Modified: logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java ============================================================================== --- logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java (original) +++ logbackPDE/trunk/plugins/ConsolePlugin/src/main/java/ch/qos/logback/eclipse/views/LogbackView.java Wed Mar 28 21:09:11 2007 @@ -213,8 +213,10 @@ if (SimpleSocketServer.isPortFree(port)) { server.stop(); openAndCloseClientToServer(); - serverThread.interrupt(); - serverThread = null; + if (serverThread != null) { + serverThread.interrupt(); + serverThread = null; + } server.setPort(port); startServerThread(server); }

1 0

svn commit: r1478 - logback/trunk/logback-site/src/site/pages
by noreply.ceki＠qos.ch 28 Mar '07

28 Mar '07

Author: ceki Date: Wed Mar 28 21:01:34 2007 New Revision: 1478 Modified: logback/trunk/logback-site/src/site/pages/access.html logback/trunk/logback-site/src/site/pages/news.html Log: doc updates Modified: logback/trunk/logback-site/src/site/pages/access.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/access.html (original) +++ logback/trunk/logback-site/src/site/pages/access.html Wed Mar 28 21:01:34 2007 @@ -30,86 +30,88 @@ <h1>Introduction</h1> <p>Logback was designed as a modular framework from the - start. Making logback-core reusable under different - circumstances, without too much coding was one of our main - goals. As such, logback-access builds on top of logback-core. It - fully integrates with Servlet containers such as Jetty or Tomcat - to provide HTTP-access log functionality. + start. Making logback-core reusable under different circumstances, + without much recoding was one of our main goals. As such, + logback-access builds on top of logback-core. It fully integrates + with Servlet containers such as Jetty or Tomcat to provide + HTTP-access log functionality. </p> <a name="tomcat"></a> - <h2>Logback Access and Tomcat</h2> + <h2>Logback-access and Tomcat</h2> - <p> - To use logback-access with Tomcat, after downlading the logback - distribution, place the files <em>logback-core-VERSION.jar</em> - and <em>logback-access-VERSION.jar</em> under $TOMCAT_HOME/server/lib - directory, where $TOMCAT_HOME is the folder where you have - installed Tomcat. We have tested logback-access module with Tomcat - version 5.5.20. + <p>To use logback-access with Tomcat, after downlading the logback + distribution, place the files <em>logback-core-VERSION.jar</em> + and <em>logback-access-VERSION.jar</em> under + $TOMCAT_HOME/server/lib directory, where $TOMCAT_HOME is the + folder where you have installed Tomcat. We have tested + logback-access module with Tomcat version 5.5.20. </p> <h3>LogbackValve</h3> <p>The <a - href="xref/ch/qos/logback/access/tomcat/LogbackValve.html"> - <code>ch.qos.logback.access.tomcat.LogbackValve</code></a> class - extends Tomcat's <code><a - href="http://tomcat.apache.org/tomcat-5.5-doc/catalina/docs/api/org/apache/catali…"> - ValveBase</a></code> class. This class is used to allow external - components to be integrated into Tomcat. + href="xref/ch/qos/logback/access/tomcat/LogbackValve.html"> + <code>ch.qos.logback.access.tomcat.LogbackValve</code></a> class + extends Tomcat's <code><a + href="http://tomcat.apache.org/tomcat-5.5-doc/catalina/docs/api/org/apache/catali…"> + ValveBase</a></code> class. This class is used to allow external + components to be integrated into Tomcat. </p> <p>To configure Tomcat in order to use <code>LogbackValve</code>, - add the following lines to the tomcat server configuration file, - namely <em>$TOMCAT_HOME/conf/server.xml</em>: + add the following lines to the tomcat server configuration file, + namely <em>$TOMCAT_HOME/conf/server.xml</em>: </p> <div class="source"><pre><Valve className="ch.qos.logback.access.tomcat.LogbackValve"/></pre></div> - <p>This line need to be nested in an <em>Engine</em> element. + <p>This line is usually nested within an <em>Engine</em> element. </p> - <p>By default, <code>LogbackValve</code> looks for a logback - configuration file called <em>logback-access.xml</em>, in the - same folder where <em>server.xml</em> is located, that is in - <em>$TOMCAT_HOME/conf/</em>. This configuration file contains - directives for configuring logback components. Among others, you - can specify the appenders where the logging requests will be - sent, and their format. Please refer to the description below - about logback access configuration for examples. + <p>By default, <code>LogbackValve</code> looks for a configuration + file called <em>logback-access.xml</em>, in the same folder where + <em>server.xml</em> is located, that is in + <em>$TOMCAT_HOME/conf/</em>. This configuration file contains + directives for configuring logback-access components. It is used + to specify appenders where the logging requests will be their + format, and filters. Please refer to the <a + href="#configuration">section discussing</a> this subject further + below. </p> <a name="jetty"></a> - <h2>Logback Access and Jetty</h2> + <h2>Logback-access and Jetty</h2> - <p>To use logback-access with Jetty, after downlading the logback - distribution, place the files <em>logback-core-VERSION.jar</em> - and <em>logback-access-VERSION.jar</em> under $JETTY_HOME/lib - directory, where $JETTY_HOME is the folder where you have - installed Jetty. We have tested logback-access module with Jetty - version 6.0.1. + <p>After downlading the logback distribution, place the files + <em>logback-core-VERSION.jar</em> and + <em>logback-access-VERSION.jar</em> under $JETTY_HOME/lib + directory, where $JETTY_HOME is the folder where you have + installed Jetty. We have tested logback-access module with Jetty + version 6.0 as well as 6.1. </p> - <h3>Logback's RequestLog implementation</h3> + <h3>Logback's implementation of + <code>org.mortbay.jetty.RequestLog</code> interface</h3> <p>The <a - href="xref/ch/qos/logback/access/jetty/RequestLogImpl.html"> - <code>ch.qos.logback.access.jetty.RequestLogImpl</code></a> - class implements jetty's <code><a - href="http://jetty.mortbay.org/apidocs/org/mortbay/jetty/RequestLog.html">RequestLog</a></code> - interface. This interface is used by Jetty to allow external - components to manage request logging. + href="xref/ch/qos/logback/access/jetty/RequestLogImpl.html"> + <code>ch.qos.logback.access.jetty.RequestLogImpl</code></a> class + implements jetty's <code><a + href="http://jetty.mortbay.org/apidocs/org/mortbay/jetty/RequestLog.html">RequestLog</a></code> + interface. Jetty delegates the manament of access logging + functionality to implementations of this interface. </p> - <p>In logback, logging destinations are called Appenders. These - classes can be attached directly to <code>RequestLogImpl</code>. + <p>In logback, a logging destination is called an "appender" which + can be directly attached to a + <code>ch.qos.logback.access.jetty.RequestLogImpl</code> instance. </p> - <p>To configure jetty in order to use logback's - <code>RequestLogImpl</code>, add the following lines to the - jetty configuration file, namely - <em>$JETTY_HOME/etc/jetty.xml</em>: + <p>In order to configure Jetty to use logback-access's + <code>RequestLogImpl</code>, please add the following lines to + jetty's main configuration file, namely + <em>$JETTY_HOME/etc/jetty.xml</em>: </p> <div class="source"><pre><Ref id="requestLog"> <Set name="requestLog"> @@ -119,11 +121,6 @@ </Set> </Ref></pre></div> - <p>These lines reference the requestLog functionnality of Jetty, - setting the actual class that will be called at each logging - request. - </p> - <p>By default, <code>RequestLogImpl</code> looks for a logback configuration file called <em>logback-access.xml</em>, in the same folder where <em>jetty.xml</em> is located. This configuration @@ -134,8 +131,8 @@ <p>As long the path is specified, you can place the logback configuration file in any location. Here is another example of - jetty configuration file, with a path to the logback access - configuration file. + jetty configuration file, including the path to the + <em>logback-access.xml</em> configuration file. </p> <div class="source"><pre><Ref id="requestLog"> @@ -147,20 +144,21 @@ </Set> </Ref></pre></div> - <h2>Logback Access Configuration</h2> + <a name="configuration"></a> + <h2>Logback-access configuration</h2> <p>Altough similar, the <em>logback-access.xml</em> file is slightly - different than the usual logback classic configuration file. + different than its more common counterpart in logback-classic. Appenders and Layouts are declared the exact same way. However, in the access module there is no notion of loggers and consequently - loggers elements are disallowed in configuraiton files for - logback-access. + logger elements are disallowed in logback-access configuraiton + files. </p> <h3>Example 1: basic logback-access configuration</h3> <p> - Here is a sample <em>logback-access.xml</em> file that you can - immediately put to use: + Here is a small but fully functional <em>logback-access.xml</em> + configuration file: </p> <div class="source"><pre><configuration> <appender name="STDOUT" @@ -174,18 +172,18 @@ <appender-ref ref="STDOUT" /> </configuration></pre></div> <p> - It declares a <code>ConsoleAppender</code> which directs its - output at the console. The <code>ConsoleAppender</code> contains - a <code>PatternLayout</code> format the output. The log format is - specied using the %h %l %u %user %date "%r" %s %b" pattern which - is the Commong Log Format (CLF). This format is recognized by log - analysers such as <a href="http://www.analog.cx/">Analog</a> or <a - href="http://awstats.sourceforge.net/">AWStats</a>. + It declares a <code>ConsoleAppender</code> which prints its output + on the console. The <code>ConsoleAppender</code> contains a + <code>PatternLayout</code> object responsible to format this + output. The log format is specied by the "%h %l %u %user %date + "%r" %s %b" pattern which incidentally corresponds to Common Log + Format (CLF). This format is recognized by log analysers such as + <a href="http://www.analog.cx/">Analog</a> or <a + href="http://awstats.sourceforge.net/">AWStats</a>. </p> - <p>Instead of specifying the complete pattern, the word "common" - or "clf" can be used as a shorthand. Thus, the following are all - equivalent + <p>The words "common" or "clf" are interpreted as shorthands for + the said pattern. Thus, the following are all equivalent: </p> <div class="source"><pre><Pattern>%h %l %u %user %date "%r" %s %b</Pattern> @@ -211,8 +209,13 @@ <h3>Example 2: RollingFileAppender</h3> - <p>Another configuration file, using logback' - <code>RollingFileAppender</code>, could be:</p> + <p>The configuration file below configures a daily rolling + <code>RollingFileAppender</code>. Note that due to the + <em>.zip</em> suffix included in the value for <span + class="option">FileNamePattern</span> option, the log file are not + only rolled daily, but they are also automatically compressed.</p> + + <div class="source"><pre><configuration> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> @@ -229,86 +232,61 @@ <appender-ref ref="FILE" /> </configuration></pre></div> - - <p> - Here, there is no output to the console. Instead, logback access - logs to the file named access.log. This file will be rolled over - every 24 hours. We specify in the configuration the name of the file - where the actual logging is added, and the pattern that the archived - files must match. - The newly archived file will be automatically compressed. - </p> - <p> - These two configuration examples should give you an idea of the - possibilities offered by the logback-access module. In - principle, most of the things that you can do with - logback-classic module are equally possible with logback-access. + <p>These two examples should give you an idea of the possibilities + offered by logback-access. In principle, most if not all of the + features available in logback-classic are also available in + logback-access. </p> <h3>PatternLayout</h3> - <p> - An http-specific implementation of <code>PatternLayout</code> is - included in the access module. The <a - href="xref/ch/qos/logback/access/PatternLayout.html"> - <code>ch.qos.logback.access.PatternLayout</code></a> provides a - way to format the logging output that is just as easy and - flexible as the <code>PatternLayout</code> found in logback - classic. - </p> - - <p> - For detailled instructions on how to use the <code>PatternLayout</code> for - logback access, please refer to the - <a href="manual/layouts.html#AccessPatternLayout">corresponding chapter</a> - of the logback manual. + <p>Logback-access ships with an http-specific implementation of <a + href="xref/ch/qos/logback/access/PatternLayout.html"> + <code>PatternLayout</code></a>. For detailled instructions on how + to use the <code>PatternLayout</code>, please refer to the <a + href="manual/layouts.html#AccessPatternLayout">corresponding + chapter</a> of the logback manual. </p> <h2>JMX Components</h2> - <p>Logback access easily integrates with JMX servers to publish useful information - about some of its components. + <p>Logback-access integrates with JMX servers to publish + information about its components. </p> - <p> - Both <code>RequestLogImpl</code> and <code>LogbackValve</code> can be - published and modified via JMX. A special filter, that we will cover - further down this document, publishes statistical views of access logs. + <p>Both <code>RequestLogImpl</code> and <code>LogbackValve</code> + expose data and can be updated via JMX. A special filter, covered + further down this document, publishes statistical data on access + logs. </p> - <h3>Configuring Tomcat</h3> + <h3>Configuring Tomcat for JMX</h3> - <p> - Accessing JMX components with Tomcat requires to add the following lines - to the <em>$TOMCAT_HOME/bin/catalina.sh</em> configuration file: + <p>In order to configure Tomcat for JMX, please add the following + lines to the <em>$TOMCAT_HOME/bin/catalina.sh</em> shell script + (or its MS Windows equivalent): </p> <div class="source"><pre>CATALINA_OPTS="-Dcom.sun.management.jmxremote" CATALINA_OPTS="$CATALINA_OPTS -Dcom.sun.management.jmxremote.ssl=false" CATALINA_OPTS="$CATALINA_OPTS -Dcom.sun.management.jmxremote.authenticate=false"</pre></div> - <p> - Once started with these options, Tomcat's JMX compoenents can be accessed - with JConsole by issuing the following command in a shell: - </p> -<div class="source"><pre>jconsole &</pre></div> - - <p> - The user might prefer to access her components via a web-based solution using MX4J. - In that case, here are the required steps: - </p> - - <p> - First, <a href="http://mx4j.sourceforge.net/">download MX4J</a>. - Place the <em>mx4j-impl.jar</em> file in - the <em>$TOMCAT_HOME/bin/</em> directory, and the <em>mx4j-tools.jar</em> - in the <em>$TOMCAT_HOME/common/lib/</em> directory. - </p> - - <p>Then, add the following lines to the - <em>$TOMCAT_HOME/bin/catalina.sh</em> configuration file: + <p>After you launch Tomcat, you can access the MBeans exposed by + Tomcat throught he JConsole application, which can be started with + the following command: + </p> +<div class="source"><pre>jconsole</pre></div> + + <p>If you prefer MX4J to access your components via a web-based + interface, here is a short summary of the steps to follow. After + <a href="http://mx4j.sourceforge.net/">downloading MX4J</a>, place + the <em>mx4j-impl.jar</em> file in the <em>$TOMCAT_HOME/bin/</em> + directory, and the <em>mx4j-tools.jar</em> file in the + <em>$TOMCAT_HOME/common/lib/</em> directory. Once that is done, + add the following lines to the + <em>$TOMCAT_HOME/bin/catalina.sh</em> shell script: </p> <div class="source"><pre> @@ -331,11 +309,11 @@ protocol="AJP/1.3" /></pre></div> <p> - Once Tomcat is started, you should be ableo to reach the JMX components by - pointing a browser to the following URL: + Once Tomcat is started, you should be able to reach your JMX + components by pointing your browser at the following URL: </p> -<div class="source"><pre>http://host_name:8082/</pre></div> +<div class="source"><pre>http://localhost:8082/</pre></div> <h3>Configuring Jetty</h3> @@ -359,28 +337,27 @@ </Call> </Get></pre></div> - <p> - Once Jetty is started with this configuration, all available components can be reviewed - at this address: + <p>Once Jetty is started with this configuration, all available + components can be reviewed at: </p> -<div class="source"><pre>http://host_name:8082/</pre></div> +<div class="source"><pre>http://localhost:8082/</pre></div> - <p> - Logback's <code>RequestLogImpl</code> is available, and its <code>start()</code> - and <code>stop()</code> method can be called. + <p>Logback-access' <code>RequestLogImpl</code> should be + available, including its <code>start()</code> and + <code>stop()</code> methods. </p> - <h3>CountingFilter</h3> + <h2><code>CountingFilter</code></h2> - <p> - Logback can provide a statistical view of the accesses to the server. This is done by using the - <a href="xref/ch/qos/logback/access/filter/CountingFilter.html"><code>CountingFilter</code></a> class. + <p>With the help of <a + href="xref/ch/qos/logback/access/filter/CountingFilter.html"><code>CountingFilter</code></a> + class, logback-access can provide statistical data about access to + the web-server. </p> - <p> - To use the <code>CountingFilter</code>, one just needs to declare it, like any - other filter: + <p>If you wish to make use of <code>CountingFilter</code>, you to + declare it, as any other filter: </p> <div class="source"><pre><configuration> @@ -400,22 +377,68 @@ <p> This component registers itself to the JMX server and publishes - the following statistical figures: + the statistical data such as averages by minute, by hour, by + day, by week, and by month. Last month's, week's, day's, hour's + and minute's counts as well as the total number of access are + also exposed. </p> - - <ul> - <p>Minute average</p> - <p>Last minute's count</p> - <p>Hourly average</p> - <p>Last hour's count</p> - <p>Daily average</p> - <p>Last day's count</p> - <p>Weekly average</p> - <p>Last week's count</p> - <p>Monthly average</p> - <p>Last month's count</p> - <p>Total accesses</p> - </ul> + + + <h2><code>TeeFilter</code></h2> + + <p>For debugging purposes, it is often handy to capture the client + request as well as the server response as is. The + <code>TeeFilter</code> was desgined precisely for this purpose. + </p> + + <p>The <code>TeeFilter</code> is a regular servlet filter. Like other + servlet filters, it needs to be declared in your web-application's + <em>web.xml</em> file: +</p> + +<div class="source"><filter> + <filter-name>TeeFilter</filter-name> + <filter-class>ch.qos.logback.access.servlet.TeeFilter</filter-class> +</filter> + +<filter-mapping> + <filter-name>TeeFilter</filter-name> + <url-pattern>/*</url-pattern> +</filter-mapping> +</div> + + <p>We have tested <code>TeeFilter</code> to the best of our + ability. However, since it duplicates the input stream of the + request and the output stream of the response, it may interfere with + your application. For large input or output, it will add masurable + latency. Although we have already fixed all currently known bugs, + <code>TeeFilter</code> has broken otherwise correctly behaving + applications. Thus, in case of doubt, do not hesitate to disabl + <code>TeeFilter</code>. + + </p> + + <p>Once <code>TeeFilter</code> is installed, the <a + href="manual/layouts.html#AccessPatternLayout">PatternLayout </a> + converters <code>fullRequest</code> and <code>fullResponse</code> + will output the full contents of the request and respectively the + response. + </p> + + <p>Here is a sample logback-access.xml configuration file which will + output the full contents of the request and response on the console. + </p> +<div class="source"><configuration> + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.access.PatternLayout"> + <Pattern>%fullRequest%n%n%fullResponse</Pattern> + </layout> + </appender> + + <appender-ref ref="STDOUT" /> +</configuration> +</div> + <script src="templates/footer.js"></script> </div> </body> Modified: logback/trunk/logback-site/src/site/pages/news.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/news.html (original) +++ logback/trunk/logback-site/src/site/pages/news.html Wed Mar 28 21:01:34 2007 @@ -30,12 +30,14 @@ <h3>xxxx , 2007 - Release of version 0.9.4</h3> - <p>Significant bug fixes made to <code>TeeFilter</code> and - Co. located in the logback-access module. Images and other binary - files are now intercepted and replayed correctly. As for + <p>Significant bug fixes made to + <code>c.q.l.access.TeeFilter</code> and Co. Images and other + binary files are now intercepted and replayed correctly. As for "x-www-form-urlencoded" post requests, their input buffer is left - untouched. In a best-effort attempt, the input buffer is later - reconstructed. However, it may differ from the original. + untouched. In a best-effort attempt, the input buffer for + "x-www-form-urlencoded" post requests is later reconstructed + through the request parameters. However, it may differ from the + original buffer. </p> <h3>March 20th, 2007 - Release of version 0.9.3</h3>

1 0

[continuum] BUILD FAILURE: Logback Access Module
by John Noreplai 28 Mar '07

28 Mar '07

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Failed Previous State: Ok Started at: Wed, 28 Mar 2007 21:00:18 +0200 Finished at: Wed, 28 Mar 2007 21:00:33 +0200 Total time: 15s Build Trigger: Schedule Exit code: 1 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes ceki - We now avoid polluting the output with image contents which most of the time look like gibberish anyhow. /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/Constants.java /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java **************************************************************************** Output: **************************************************************************** [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Logback Access Module [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:compile] Compiling 65 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] [retrotranslator:translate {execution: default}] [INFO] Transforming 65 file(s) from /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/logback-access-0.9.4-SNAPSHOT-jdk14.jar. [INFO] Transformation of 65 file(s) completed successfully. [INFO] [resources:testResources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:testCompile] Compiling 22 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [surefire:test] [INFO] Surefire report directory: /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/surefire-reports ------------------------------------------------------- T E S T S ------------------------------------------------------- Running ch.qos.logback.access.db.DBAppenderTest [Server@7bd63e39]: [Thread[main,5,main]]: checkRunning(false) entered [Server@7bd63e39]: [Thread[main,5,main]]: checkRunning(false) exited [Server@7bd63e39]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@7bd63e39]: [Thread[main,5,main]]: checkRunning(false) entered [Server@7bd63e39]: [Thread[main,5,main]]: checkRunning(false) exited [Server@7bd63e39]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@12b7eea]: [Thread[main,5,main]]: checkRunning(false) entered [Server@12b7eea]: [Thread[main,5,main]]: checkRunning(false) exited [Server@12b7eea]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@12b7eea]: [Thread[main,5,main]]: checkRunning(false) entered [Server@12b7eea]: [Thread[main,5,main]]: checkRunning(false) exited [Server@12b7eea]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@54bb7759]: [Thread[main,5,main]]: checkRunning(false) entered [Server@54bb7759]: [Thread[main,5,main]]: checkRunning(false) exited [Server@54bb7759]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@54bb7759]: [Thread[main,5,main]]: checkRunning(false) entered [Server@54bb7759]: [Thread[main,5,main]]: checkRunning(false) exited [Server@54bb7759]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) [Server@70ba9340]: [Thread[main,5,main]]: checkRunning(false) entered [Server@70ba9340]: [Thread[main,5,main]]: checkRunning(false) exited [Server@70ba9340]: [Thread[main,5,main]]: setDatabaseName(0,test) [Server@70ba9340]: [Thread[main,5,main]]: checkRunning(false) entered [Server@70ba9340]: [Thread[main,5,main]]: checkRunning(false) exited [Server@70ba9340]: [Thread[main,5,main]]: setDatabasePath(0,mem:test;sql.enforce_strict_size=true) Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.393 sec Running ch.qos.logback.access.jetty.JettyBasicTest 2007-03-28 21:00:31.384::INFO: Logging to STDERR via org.mortbay.log.StdErrLog 2007-03-28 21:00:31.463::INFO: jetty-6.1.1 2007-03-28 21:00:31.945::INFO: Started SelectChannelConnector @ 0.0.0.0:1234 28/03/2007:21:00:32 +0200 localhost 127.0.0.1 28/03/2007:21:00:32 +0200 localhost 127.0.0.1 Tests run: 2, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 1.684 sec <<< FAILURE! Running ch.qos.logback.access.filter.AccessStatsTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec Running ch.qos.logback.access.pattern.ConverterTest Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.023 sec Running ch.qos.logback.access.filter.StatsByDayTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.018 sec Running ch.qos.logback.access.net.URLEvaluatorTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec Running ch.qos.logback.access.net.SocketAppenderTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.143 sec Results : Tests run: 29, Failures: 0, Errors: 1, Skipped: 0 [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] There are test failures. [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 13 seconds [INFO] Finished at: Wed Mar 28 21:00:33 CEST 2007 [INFO] Final Memory: 19M/199M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0

svn commit: r1477 - in logback/trunk/logback-access/src/main/java/ch/qos/logback/access: . servlet spi
by noreply.ceki＠qos.ch 28 Mar '07

28 Mar '07

Author: ceki Date: Wed Mar 28 20:41:36 2007 New Revision: 1477 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/Constants.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java Log: - We now avoid polluting the output with image contents which most of the time look like gibberish anyhow. Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/Constants.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/Constants.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/Constants.java Wed Mar 28 20:41:36 2007 @@ -5,4 +5,9 @@ public static final String LB_OUTPUT_BUFFER = "LB_OUTPUT_BUFFER"; public final static String X_WWW_FORM_URLECODED = "application/x-www-form-urlencoded"; + + public final static String IMAGE_CONTENT_TYPE = "image/"; + public final static String IMAGE_JPEG = "image/jpeg"; + public final static String IMAGE_GIF = "image/gif"; + public final static String IMAGE_PNG = "image/png"; } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java Wed Mar 28 20:41:36 2007 @@ -1,6 +1,7 @@ package ch.qos.logback.access.servlet; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import ch.qos.logback.access.Constants; @@ -14,4 +15,15 @@ return false; } } + + public static boolean isImageResponse(HttpServletResponse response) { + + String responseType = response.getContentType(); + + if (responseType != null && responseType.startsWith(Constants.IMAGE_CONTENT_TYPE)) { + return true; + } else { + return false; + } + } } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java Wed Mar 28 20:41:36 2007 @@ -330,24 +330,23 @@ if (Util.isFormUrlEncoded(httpRequest)) { StringBuffer buf = new StringBuffer(); - + Enumeration pramEnumeration = httpRequest.getParameterNames(); // example: id=1234&user=cgu - // number=1233&x=1 + // number=1233&x=1 int count = 0; try { - while(pramEnumeration.hasMoreElements()) { - - - String key = (String) pramEnumeration.nextElement(); + while (pramEnumeration.hasMoreElements()) { + + String key = (String) pramEnumeration.nextElement(); if (count++ != 0) { buf.append("&"); } buf.append(key); buf.append("="); String val = httpRequest.getParameter(key); - if(val != null) { + if (val != null) { buf.append(val); } else { buf.append(""); @@ -380,16 +379,21 @@ if (responseContent != null) { return responseContent; } - // retreive the byte array previously placed by TeeFilter - byte[] outputBuffer = (byte[]) httpRequest - .getAttribute(Constants.LB_OUTPUT_BUFFER); - if (outputBuffer != null) { - responseContent = new String(outputBuffer); - } + if (Util.isImageResponse(httpResponse)) { + responseContent = "[IMAGE CONTENTS SUPPRESSED]"; + } else { - if (responseContent == null || responseContent.length() == 0) { - responseContent = EMPTY; + // retreive the byte array previously placed by TeeFilter + byte[] outputBuffer = (byte[]) httpRequest + .getAttribute(Constants.LB_OUTPUT_BUFFER); + + if (outputBuffer != null) { + responseContent = new String(outputBuffer); + } + if (responseContent == null || responseContent.length() == 0) { + responseContent = EMPTY; + } } return responseContent;

1 0