Author: shuber
Date: Fri Sep 14 11:27:56 2007
New Revision: 3
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D3&repname=3Dj=
ahia_loganalyzer
Log:
New version with configurable reg exp and date format, and initial preparat=
ion for Exception GUI.
Modified:
trunk/jahialoganalyzer.iws
trunk/pom.xml
trunk/src/main/java/org/jahia/loganalyzer/JahiaPerfLineAnalyzer.java
trunk/src/main/java/org/jahia/loganalyzer/LogParser.java
trunk/src/main/java/org/jahia/loganalyzer/gui/swing/LogAnalyzerMainDial=
og.form
trunk/src/main/java/org/jahia/loganalyzer/gui/swing/LogAnalyzerMainDial=
og.java
trunk/src/main/java/org/jahia/loganalyzer/loganalyzer_messages.properti=
es
trunk/src/test/java/org/jahia/loganalyzer/LogParserTest.java
Modified: trunk/jahialoganalyzer.iws
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/jahialoganalyze=
r.iws&rev=3D3&repname=3Djahia_loganalyzer
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/jahialoganalyzer.iws (original)
+++ trunk/jahialoganalyzer.iws Fri Sep 14 11:27:56 2007
@@ -160,7 +160,7 @@
<file leaf-file-name=3D"LogParser.java" pinned=3D"false" current=3D"=
false" current-in-tab=3D"false">
<entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/logana=
lyzer/LogParser.java">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"27" column=3D"41" selection-start=3D"555" selec=
tion-end=3D"580" vertical-scroll-proportion=3D"0.3580247">
+ <state line=3D"36" column=3D"81" selection-start=3D"1263" sele=
ction-end=3D"1263" vertical-scroll-proportion=3D"0.90605426">
<folding />
</state>
</provider>
@@ -169,16 +169,16 @@
<file leaf-file-name=3D"LogParserTest.java" pinned=3D"false" current=
=3D"false" current-in-tab=3D"false">
<entry file=3D"file://$PROJECT_DIR$/src/test/java/org/jahia/logana=
lyzer/LogParserTest.java">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"36" column=3D"49" selection-start=3D"883" selec=
tion-end=3D"883" vertical-scroll-proportion=3D"0.6181818">
+ <state line=3D"42" column=3D"83" selection-start=3D"1287" sele=
ction-end=3D"1287" vertical-scroll-proportion=3D"1.2776618">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name=3D"JahiaPerfLineAnalyzer.java" pinned=3D"false"=
current=3D"true" current-in-tab=3D"true">
+ <file leaf-file-name=3D"JahiaPerfLineAnalyzer.java" pinned=3D"false"=
current=3D"false" current-in-tab=3D"false">
<entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/logana=
lyzer/JahiaPerfLineAnalyzer.java">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"71" column=3D"46" selection-start=3D"2739" sele=
ction-end=3D"2739" vertical-scroll-proportion=3D"0.7407407">
+ <state line=3D"22" column=3D"0" selection-start=3D"695" select=
ion-end=3D"783" vertical-scroll-proportion=3D"0.42588726">
<folding />
</state>
</provider>
@@ -187,13 +187,13 @@
<file leaf-file-name=3D"LogEntry.java" pinned=3D"false" current=3D"f=
alse" current-in-tab=3D"false">
<entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/logana=
lyzer/LogEntry.java">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"17" column=3D"24" selection-start=3D"402" selec=
tion-end=3D"402" vertical-scroll-proportion=3D"0.32969698">
+ <state line=3D"17" column=3D"24" selection-start=3D"402" selec=
tion-end=3D"402" vertical-scroll-proportion=3D"0.034412954">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name=3D"LogAnalyzerMainDialog.form" pinned=3D"false"=
current=3D"false" current-in-tab=3D"false">
+ <file leaf-file-name=3D"LogAnalyzerMainDialog.form" pinned=3D"false"=
current=3D"true" current-in-tab=3D"true">
<entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/logana=
lyzer/gui/swing/LogAnalyzerMainDialog.form">
<provider selected=3D"true" editor-type-id=3D"ui-designer">
<state />
@@ -203,7 +203,7 @@
<file leaf-file-name=3D"pom.xml" pinned=3D"false" current=3D"false" =
current-in-tab=3D"false">
<entry file=3D"file://$PROJECT_DIR$/pom.xml">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"37" column=3D"57" selection-start=3D"1273" sele=
ction-end=3D"1273" vertical-scroll-proportion=3D"0.22545454">
+ <state line=3D"37" column=3D"57" selection-start=3D"1273" sele=
ction-end=3D"1273" vertical-scroll-proportion=3D"0.42379957">
<folding />
</state>
</provider>
@@ -212,7 +212,7 @@
<file leaf-file-name=3D"LogAnalyzerMainDialog.java" pinned=3D"false"=
current=3D"false" current-in-tab=3D"false">
<entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/logana=
lyzer/gui/swing/LogAnalyzerMainDialog.java">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"54" column=3D"14" selection-start=3D"1713" sele=
ction-end=3D"1713" vertical-scroll-proportion=3D"0.56666666">
+ <state line=3D"26" column=3D"49" selection-start=3D"859" selec=
tion-end=3D"859" vertical-scroll-proportion=3D"0.6388309">
<folding />
</state>
</provider>
@@ -221,7 +221,7 @@
<file leaf-file-name=3D"ProgressMonitorInputStream.java" pinned=3D"f=
alse" current=3D"false" current-in-tab=3D"false">
<entry file=3D"jar://C:/Program Files/Java/jdk1.5.0_12/src.zip!/ja=
vax/swing/ProgressMonitorInputStream.java">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"131" column=3D"0" selection-start=3D"4063" sele=
ction-end=3D"4063" vertical-scroll-proportion=3D"0.06419753">
+ <state line=3D"131" column=3D"0" selection-start=3D"4063" sele=
ction-end=3D"4063" vertical-scroll-proportion=3D"0.13987474">
<folding />
</state>
</provider>
@@ -239,7 +239,7 @@
<file leaf-file-name=3D"CSVLogEntryWriter.java" pinned=3D"false" cur=
rent=3D"false" current-in-tab=3D"false">
<entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/logana=
lyzer/CSVLogEntryWriter.java">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"26" column=3D"54" selection-start=3D"905" selec=
tion-end=3D"905" vertical-scroll-proportion=3D"0.44074073">
+ <state line=3D"26" column=3D"54" selection-start=3D"905" selec=
tion-end=3D"905" vertical-scroll-proportion=3D"0.74530274">
<folding />
</state>
</provider>
@@ -495,6 +495,28 @@
<option name=3D"myItemId" value=3D"PsiDirectory:C:\java\products=
_svn\jahia_loganalyzer\src\main" />
<option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name=3D"myItemId" value=3D"jahialoganalyzer.ipr" />
+ <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name=3D"myItemId" value=3D"jahialoganalyzer" />
+ <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name=3D"myItemId" value=3D"PsiDirectory:C:\java\products=
_svn\jahia_loganalyzer" />
+ <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name=3D"myItemId" value=3D"PsiDirectory:C:\java\products=
_svn\jahia_loganalyzer\src" />
+ <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name=3D"myItemId" value=3D"PsiDirectory:C:\java\products=
_svn\jahia_loganalyzer\src\main" />
+ <option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
<PATH_ELEMENT>
<option name=3D"myItemId" value=3D"PsiDirectory:C:\java\products=
_svn\jahia_loganalyzer\src\main\java" />
<option name=3D"myItemType" value=3D"com.intellij.ide.projectVie=
w.impl.nodes.PsiDirectoryNode" />
@@ -555,7 +577,7 @@
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
- <showStructure Scope=3D"false" ProjectPane=3D"false" PackagesPane=3D=
"false" Favorites=3D"false" />
+ <showStructure PackagesPane=3D"false" ProjectPane=3D"false" Scope=3D=
"false" Favorites=3D"false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -575,6 +597,9 @@
<option name=3D"SHOW_DIALOG" value=3D"true" />
</component>
<component name=3D"RecentsManager">
+ <key name=3D"IntroduceConstantDialog.RECENTS_KEY">
+ <recent name=3D"org.jahia.loganalyzer.gui.swing.LogAnalyzerMainDialo=
g" />
+ </key>
<key name=3D"MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name=3D"org.jahia.loganalyzer" />
</key>
@@ -583,11 +608,11 @@
<component name=3D"RunManager" selected=3D"Application.LogAnalyzerMainDi=
alog">
<tempConfiguration default=3D"false" name=3D"LogAnalyzerMainDialog" ty=
pe=3D"Application" factoryName=3D"Application" enabled=3D"false" merge=3D"f=
alse">
<option name=3D"MAIN_CLASS_NAME" value=3D"org.jahia.loganalyzer.gui.=
swing.LogAnalyzerMainDialog" />
- <option name=3D"VM_PARAMETERS" />
- <option name=3D"PROGRAM_PARAMETERS" />
- <option name=3D"WORKING_DIRECTORY" value=3D"$PROJECT_DIR$" />
+ <option name=3D"VM_PARAMETERS" value=3D"" />
+ <option name=3D"PROGRAM_PARAMETERS" value=3D"" />
+ <option name=3D"WORKING_DIRECTORY" value=3D"file://$PROJECT_DIR$" />
<option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
- <option name=3D"ALTERNATIVE_JRE_PATH" />
+ <option name=3D"ALTERNATIVE_JRE_PATH" value=3D"" />
<option name=3D"ENABLE_SWING_INSPECTOR" value=3D"false" />
<module name=3D"jahialoganalyzer" />
<RunnerSettings RunnerId=3D"JProfiler">
@@ -596,7 +621,7 @@
<option name=3D"INTERPRETED" value=3D"false" />
</RunnerSettings>
<RunnerSettings RunnerId=3D"Profile ">
- <option name=3D"myExternalizedOptions" />
+ <option name=3D"myExternalizedOptions" value=3D" snapshot=
s-dir=3D " />
</RunnerSettings>
<RunnerSettings RunnerId=3D"Run" />
<ConfigurationWrapper RunnerId=3D"Run" />
@@ -604,6 +629,33 @@
<option name=3D"Make" value=3D"true" />
</method>
</tempConfiguration>
+ <configuration default=3D"true" type=3D"Applet" factoryName=3D"Applet">
+ <module name=3D"" />
+ <option name=3D"MAIN_CLASS_NAME" />
+ <option name=3D"HTML_FILE_NAME" />
+ <option name=3D"HTML_USED" value=3D"false" />
+ <option name=3D"WIDTH" value=3D"400" />
+ <option name=3D"HEIGHT" value=3D"300" />
+ <option name=3D"POLICY_FILE" value=3D"$APPLICATION_HOME_DIR$/bin/app=
letviewer.policy" />
+ <option name=3D"VM_PARAMETERS" />
+ <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
+ <option name=3D"ALTERNATIVE_JRE_PATH" />
+ <RunnerSettings RunnerId=3D"JProfiler">
+ <option name=3D"WINDOW" value=3D"false" />
+ <option name=3D"JVMPI" value=3D"false" />
+ <option name=3D"INTERPRETED" value=3D"false" />
+ </RunnerSettings>
+ <RunnerSettings RunnerId=3D"Profile ">
+ <option name=3D"myExternalizedOptions" />
+ </RunnerSettings>
+ </configuration>
+ <configuration default=3D"true" type=3D"Remote" factoryName=3D"Remote">
+ <option name=3D"USE_SOCKET_TRANSPORT" value=3D"true" />
+ <option name=3D"SERVER_MODE" value=3D"false" />
+ <option name=3D"SHMEM_ADDRESS" value=3D"javadebug" />
+ <option name=3D"HOST" value=3D"localhost" />
+ <option name=3D"PORT" value=3D"5005" />
+ </configuration>
<configuration default=3D"true" type=3D"JUnit" factoryName=3D"JUnit" e=
nabled=3D"false" merge=3D"false">
<module name=3D"" />
<option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
@@ -644,33 +696,6 @@
<option name=3D"Make" value=3D"true" />
</method>
</configuration>
- <configuration default=3D"true" type=3D"Applet" factoryName=3D"Applet">
- <module name=3D"" />
- <option name=3D"MAIN_CLASS_NAME" />
- <option name=3D"HTML_FILE_NAME" />
- <option name=3D"HTML_USED" value=3D"false" />
- <option name=3D"WIDTH" value=3D"400" />
- <option name=3D"HEIGHT" value=3D"300" />
- <option name=3D"POLICY_FILE" value=3D"$APPLICATION_HOME_DIR$/bin/app=
letviewer.policy" />
- <option name=3D"VM_PARAMETERS" />
- <option name=3D"ALTERNATIVE_JRE_PATH_ENABLED" value=3D"false" />
- <option name=3D"ALTERNATIVE_JRE_PATH" />
- <RunnerSettings RunnerId=3D"JProfiler">
- <option name=3D"WINDOW" value=3D"false" />
- <option name=3D"JVMPI" value=3D"false" />
- <option name=3D"INTERPRETED" value=3D"false" />
- </RunnerSettings>
- <RunnerSettings RunnerId=3D"Profile ">
- <option name=3D"myExternalizedOptions" />
- </RunnerSettings>
- </configuration>
- <configuration default=3D"true" type=3D"Remote" factoryName=3D"Remote">
- <option name=3D"USE_SOCKET_TRANSPORT" value=3D"true" />
- <option name=3D"SERVER_MODE" value=3D"false" />
- <option name=3D"SHMEM_ADDRESS" value=3D"javadebug" />
- <option name=3D"HOST" value=3D"localhost" />
- <option name=3D"PORT" value=3D"5005" />
- </configuration>
<configuration name=3D"<template>" type=3D"WebApp" default=3D"tr=
ue" selected=3D"false">
<Host>localhost</Host>
<Port>5050</Port>
@@ -753,11 +778,11 @@
<frame x=3D"-4" y=3D"-4" width=3D"1288" height=3D"1002" extended-state=
=3D"0" />
<editor active=3D"true" />
<layout>
- <window_info id=3D"UI Designer" active=3D"false" anchor=3D"left" aut=
o_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false"=
weight=3D"0.32927817" order=3D"3" />
+ <window_info id=3D"UI Designer" active=3D"false" anchor=3D"left" aut=
o_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"true" =
weight=3D"0.32927817" order=3D"3" />
<window_info id=3D"CVS" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.33" order=3D"8" />
<window_info id=3D"IDEtalk" active=3D"false" anchor=3D"right" auto_h=
ide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" we=
ight=3D"0.33" order=3D"3" />
<window_info id=3D"TODO" active=3D"false" anchor=3D"bottom" auto_hid=
e=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weig=
ht=3D"0.33" order=3D"7" />
- <window_info id=3D"Project" active=3D"false" anchor=3D"left" auto_hi=
de=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"true" weig=
ht=3D"0.32927817" order=3D"0" />
+ <window_info id=3D"Project" active=3D"false" anchor=3D"left" auto_hi=
de=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" wei=
ght=3D"0.32927817" order=3D"0" />
<window_info id=3D"Find" active=3D"false" anchor=3D"bottom" auto_hid=
e=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weig=
ht=3D"0.32951945" order=3D"1" />
<window_info id=3D"Structure" active=3D"false" anchor=3D"left" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.24979724" order=3D"1" />
<window_info id=3D"Messages" active=3D"false" anchor=3D"bottom" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.32951945" order=3D"8" />
@@ -765,10 +790,10 @@
<window_info id=3D"Profile" active=3D"false" anchor=3D"bottom" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.33" order=3D"8" />
<window_info id=3D"Module Dependencies" active=3D"false" anchor=3D"r=
ight" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=
=3D"false" weight=3D"0.33" order=3D"3" />
<window_info id=3D"Dependency Viewer" active=3D"false" anchor=3D"bot=
tom" auto_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=
=3D"false" weight=3D"0.33" order=3D"8" />
- <window_info id=3D"Palette" active=3D"false" anchor=3D"right" auto_h=
ide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" we=
ight=3D"0.20032442" order=3D"3" />
+ <window_info id=3D"Palette" active=3D"false" anchor=3D"right" auto_h=
ide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"true" wei=
ght=3D"0.20032442" order=3D"3" />
<window_info id=3D"Ant Build" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.25" order=3D"1" />
<window_info id=3D"Changes" active=3D"false" anchor=3D"bottom" auto_=
hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" w=
eight=3D"0.33" order=3D"8" />
- <window_info id=3D"Run" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" weigh=
t=3D"0.32951945" order=3D"2" />
+ <window_info id=3D"Run" active=3D"false" anchor=3D"bottom" auto_hide=
=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"true" weight=
=3D"0.32951945" order=3D"2" />
<window_info id=3D"Hierarchy" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.25" order=3D"2" />
<window_info id=3D"File View" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.33" order=3D"3" />
<window_info id=3D"Commander" active=3D"false" anchor=3D"right" auto=
_hide=3D"false" internal_type=3D"DOCKED" type=3D"DOCKED" visible=3D"false" =
weight=3D"0.4" order=3D"0" />
@@ -891,35 +916,23 @@
</state>
</provider>
</entry>
- <entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/loganalyze=
r/LogParser.java">
- <provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"27" column=3D"41" selection-start=3D"555" selection=
-end=3D"580" vertical-scroll-proportion=3D"0.3580247">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file=3D"file://$PROJECT_DIR$/src/test/java/org/jahia/loganalyze=
r/LogParserTest.java">
+ <entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/loganalyze=
r/LogEntry.java">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"36" column=3D"49" selection-start=3D"883" selection=
-end=3D"883" vertical-scroll-proportion=3D"0.6181818">
+ <state line=3D"17" column=3D"24" selection-start=3D"402" selection=
-end=3D"402" vertical-scroll-proportion=3D"0.034412954">
<folding />
</state>
</provider>
</entry>
- <entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/loganalyze=
r/gui/swing/LogAnalyzerMainDialog.form">
- <provider selected=3D"true" editor-type-id=3D"ui-designer">
- <state />
- </provider>
- </entry>
<entry file=3D"file://$PROJECT_DIR$/pom.xml">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"37" column=3D"57" selection-start=3D"1273" selectio=
n-end=3D"1273" vertical-scroll-proportion=3D"0.22545454">
+ <state line=3D"37" column=3D"57" selection-start=3D"1273" selectio=
n-end=3D"1273" vertical-scroll-proportion=3D"0.42379957">
<folding />
</state>
</provider>
</entry>
<entry file=3D"jar://C:/Program Files/Java/jdk1.5.0_12/src.zip!/javax/=
swing/ProgressMonitorInputStream.java">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"131" column=3D"0" selection-start=3D"4063" selectio=
n-end=3D"4063" vertical-scroll-proportion=3D"0.06419753">
+ <state line=3D"131" column=3D"0" selection-start=3D"4063" selectio=
n-end=3D"4063" vertical-scroll-proportion=3D"0.13987474">
<folding />
</state>
</provider>
@@ -933,32 +946,44 @@
</entry>
<entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/loganalyze=
r/CSVLogEntryWriter.java">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"26" column=3D"54" selection-start=3D"905" selection=
-end=3D"905" vertical-scroll-proportion=3D"0.44074073">
+ <state line=3D"26" column=3D"54" selection-start=3D"905" selection=
-end=3D"905" vertical-scroll-proportion=3D"0.74530274">
<folding />
</state>
</provider>
</entry>
<entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/loganalyze=
r/gui/swing/LogAnalyzerMainDialog.java">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"54" column=3D"14" selection-start=3D"1713" selectio=
n-end=3D"1713" vertical-scroll-proportion=3D"0.56666666">
+ <state line=3D"26" column=3D"49" selection-start=3D"859" selection=
-end=3D"859" vertical-scroll-proportion=3D"0.6388309">
<folding />
</state>
</provider>
</entry>
- <entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/loganalyze=
r/LogEntry.java">
+ <entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/loganalyze=
r/LogParser.java">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"17" column=3D"24" selection-start=3D"402" selection=
-end=3D"402" vertical-scroll-proportion=3D"0.32969698">
+ <state line=3D"36" column=3D"81" selection-start=3D"1263" selectio=
n-end=3D"1263" vertical-scroll-proportion=3D"0.90605426">
<folding />
</state>
</provider>
</entry>
<entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/loganalyze=
r/JahiaPerfLineAnalyzer.java">
<provider selected=3D"true" editor-type-id=3D"text-editor">
- <state line=3D"71" column=3D"46" selection-start=3D"2739" selectio=
n-end=3D"2739" vertical-scroll-proportion=3D"0.7407407">
+ <state line=3D"22" column=3D"0" selection-start=3D"695" selection-=
end=3D"783" vertical-scroll-proportion=3D"0.42588726">
<folding />
</state>
</provider>
</entry>
+ <entry file=3D"file://$PROJECT_DIR$/src/test/java/org/jahia/loganalyze=
r/LogParserTest.java">
+ <provider selected=3D"true" editor-type-id=3D"text-editor">
+ <state line=3D"42" column=3D"83" selection-start=3D"1287" selectio=
n-end=3D"1287" vertical-scroll-proportion=3D"1.2776618">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file=3D"file://$PROJECT_DIR$/src/main/java/org/jahia/loganalyze=
r/gui/swing/LogAnalyzerMainDialog.form">
+ <provider selected=3D"true" editor-type-id=3D"ui-designer">
+ <state />
+ </provider>
+ </entry>
</component>
</project>
=
Modified: trunk/pom.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/pom.xml&rev=3D3=
&repname=3Djahia_loganalyzer
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/pom.xml (original)
+++ trunk/pom.xml Fri Sep 14 11:27:56 2007
@@ -4,7 +4,7 @@
<groupId>org.jahia.loganalyzer</groupId>
<artifactId>jahia_loganalyzer</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>0.2-SNAPSHOT</version>
<name>jahia_loganalyzer</name>
<url>http://www.jahia.org</url>
<dependencies>
Modified: trunk/src/main/java/org/jahia/loganalyzer/JahiaPerfLineAnalyzer.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/main/java/o=
rg/jahia/loganalyzer/JahiaPerfLineAnalyzer.java&rev=3D3&repname=3Djahia_log=
analyzer
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/main/java/org/jahia/loganalyzer/JahiaPerfLineAnalyzer.java (o=
riginal)
+++ trunk/src/main/java/org/jahia/loganalyzer/JahiaPerfLineAnalyzer.java Fr=
i Sep 14 11:27:56 2007
@@ -2,6 +2,7 @@
=
import java.util.StringTokenizer;
import java.util.Date;
+import java.util.List;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import java.text.DateFormat;
@@ -17,14 +18,32 @@
*/
public class JahiaPerfLineAnalyzer implements LineAnalyzer {
=
- private static final String MATCHING_PATTERN =3D ".*?\\[(.*?)\\].*org\=
\.jahia\\.bin\\.Jahia.*Processed \\[(.*?)\\](?: esi=3D\\[(.*?)\\])? user=3D=
\\[(.*)\\] ip=3D\\[(.*)\\] in \\[(.*)ms\\].*";
- private static final Pattern LINEPATTERN =3D Pattern.compile(MATCHING_=
PATTERN);
- private static final DateFormat dateFormat =3D new SimpleDateFormat("y=
yyy-MM-dd HH:mm:ss,SSS");
+ private static final String DEFAULT_MATCHING_PATTERN =3D ".*?\\[(.*?)\=
\].*org\\.jahia\\.bin\\.Jahia.*Processed \\[(.*?)\\](?: esi=3D\\[(.*?)\\])?=
user=3D\\[(.*)\\] ip=3D\\[(.*)\\] in \\[(.*)ms\\].*";
+ private static final String DEFAULT_DATE_FORMAT_STRING =3D "yyyy-MM-dd=
HH:mm:ss,SSS";
+ private Pattern linePattern;
+ private DateFormat dateFormat;
+
+ /**
+ *
+ * @param patterns only one pattern is supported in the current versio=
n.
+ */
+ public JahiaPerfLineAnalyzer(List patterns, String dateFormatString) {
+ if (patterns.size() > 0) {
+ linePattern =3D Pattern.compile((String)patterns.get(0));
+ } else {
+ linePattern =3D Pattern.compile(DEFAULT_MATCHING_PATTERN);
+ }
+ if (dateFormatString !=3D null) {
+ dateFormat =3D new SimpleDateFormat(dateFormatString);
+ } else {
+ dateFormat =3D new SimpleDateFormat(DEFAULT_DATE_FORMAT_STRING=
);
+ }
+ }
=
public LogEntry parseLine(String line) {
LogEntry logEntry =3D new LogEntry();
=
- Matcher matcher =3D LINEPATTERN.matcher(line);
+ Matcher matcher =3D linePattern.matcher(line);
boolean matches =3D matcher.matches();
if (!matches) {
return null;
Modified: trunk/src/main/java/org/jahia/loganalyzer/LogParser.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/main/java/o=
rg/jahia/loganalyzer/LogParser.java&rev=3D3&repname=3Djahia_loganalyzer
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/main/java/org/jahia/loganalyzer/LogParser.java (original)
+++ trunk/src/main/java/org/jahia/loganalyzer/LogParser.java Fri Sep 14 11:=
27:56 2007
@@ -29,12 +29,12 @@
this.csvOutputSeparatorChar =3D csvOutputSeparatorChar;
}
=
- public JahiaTimeReports parse(Reader reader, Writer writer, List patte=
rns) throws IOException {
+ public JahiaTimeReports parse(Reader reader, Writer writer, List patte=
rns, String dateFormatString) throws IOException {
JahiaTimeReports timeReports =3D new JahiaTimeReports();
// @todo make the following instantiation configurable so that we =
can choose the implementations to modify application input and output
LineNumberReader lineNumberReader =3D new LineNumberReader(reader);
LogEntryWriter logEntryWriter =3D new CSVLogEntryWriter(writer, cs=
vOutputSeparatorChar);
- LineAnalyzer lineAnalyzer =3D new JahiaPerfLineAnalyzer();
+ LineAnalyzer lineAnalyzer =3D new JahiaPerfLineAnalyzer(patterns, =
dateFormatString);
String currentLine =3D null;
try {
while ( ( currentLine =3D lineNumberReader.readLine()) !=3D null) {
Modified: trunk/src/main/java/org/jahia/loganalyzer/gui/swing/LogAnalyzerMa=
inDialog.form
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/main/java/o=
rg/jahia/loganalyzer/gui/swing/LogAnalyzerMainDialog.form&rev=3D3&repname=
=3Djahia_loganalyzer
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/main/java/org/jahia/loganalyzer/gui/swing/LogAnalyzerMainDial=
og.form (original)
+++ trunk/src/main/java/org/jahia/loganalyzer/gui/swing/LogAnalyzerMainDial=
og.form Fri Sep 14 11:27:56 2007
@@ -3,7 +3,7 @@
<grid id=3D"cbd77" binding=3D"contentPane" layout-manager=3D"GridLayoutM=
anager" row-count=3D"2" column-count=3D"1" same-size-horizontally=3D"false"=
same-size-vertically=3D"false" hgap=3D"-1" vgap=3D"-1">
<margin top=3D"10" left=3D"10" bottom=3D"10" right=3D"10"/>
<constraints>
- <xy x=3D"48" y=3D"54" width=3D"630" height=3D"297"/>
+ <xy x=3D"48" y=3D"54" width=3D"701" height=3D"297"/>
</constraints>
<properties>
<toolTipText value=3D""/>
@@ -51,7 +51,7 @@
</grid>
</children>
</grid>
- <grid id=3D"e3588" layout-manager=3D"GridLayoutManager" row-count=3D=
"4" column-count=3D"3" same-size-horizontally=3D"false" same-size-verticall=
y=3D"false" hgap=3D"-1" vgap=3D"-1">
+ <grid id=3D"e3588" layout-manager=3D"GridLayoutManager" row-count=3D=
"2" column-count=3D"3" same-size-horizontally=3D"false" same-size-verticall=
y=3D"false" hgap=3D"-1" vgap=3D"-1">
<margin top=3D"0" left=3D"0" bottom=3D"0" right=3D"0"/>
<constraints>
<grid row=3D"0" column=3D"0" row-span=3D"1" col-span=3D"1" vsize=
-policy=3D"3" hsize-policy=3D"3" anchor=3D"0" fill=3D"3" indent=3D"0" use-p=
arent-layout=3D"false">
@@ -61,7 +61,7 @@
<properties/>
<border type=3D"none"/>
<children>
- <component id=3D"1b6d1" class=3D"javax.swing.JButton" binding=3D=
"browseButton" default-binding=3D"true">
+ <component id=3D"1b6d1" class=3D"javax.swing.JButton" binding=3D=
"browseInputLogFile">
<constraints>
<grid row=3D"0" column=3D"2" row-span=3D"1" col-span=3D"1" v=
size-policy=3D"0" hsize-policy=3D"3" anchor=3D"0" fill=3D"1" indent=3D"0" u=
se-parent-layout=3D"false"/>
</constraints>
@@ -86,60 +86,124 @@
</constraints>
<properties/>
</component>
- <component id=3D"3074d" class=3D"javax.swing.JLabel">
+ <tabbedpane id=3D"e64b" binding=3D"typeTabbedPane">
<constraints>
- <grid row=3D"3" column=3D"0" row-span=3D"1" col-span=3D"1" v=
size-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"0" u=
se-parent-layout=3D"false"/>
- </constraints>
- <properties>
- <text resource-bundle=3D"org/jahia/loganalyzer/loganalyzer_m=
essages" key=3D"org.jahia.loganalyzer.gui.swing.label.separatorChar"/>
- </properties>
- </component>
- <component id=3D"87c72" class=3D"javax.swing.JLabel">
- <constraints>
- <grid row=3D"1" column=3D"0" row-span=3D"1" col-span=3D"1" v=
size-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"0" u=
se-parent-layout=3D"false"/>
+ <grid row=3D"1" column=3D"0" row-span=3D"1" col-span=3D"3" v=
size-policy=3D"3" hsize-policy=3D"3" anchor=3D"0" fill=3D"3" indent=3D"0" u=
se-parent-layout=3D"false">
+ <preferred-size width=3D"200" height=3D"200"/>
+ </grid>
</constraints>
<properties>
- <text resource-bundle=3D"org/jahia/loganalyzer/loganalyzer_m=
essages" key=3D"org.jahia.loganalyzer.gui.swing.label.enterCSVOutputFile"/>
+ <tabPlacement value=3D"1"/>
</properties>
- </component>
- <component id=3D"6880e" class=3D"javax.swing.JTextField" binding=
=3D"csvOutputFile">
- <constraints>
- <grid row=3D"1" column=3D"1" row-span=3D"1" col-span=3D"1" v=
size-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D"0" u=
se-parent-layout=3D"false">
- <minimum-size width=3D"400" height=3D"-1"/>
- <preferred-size width=3D"400" height=3D"-1"/>
+ <border type=3D"none"/>
+ <children>
+ <grid id=3D"c7465" layout-manager=3D"GridLayoutManager" row-=
count=3D"5" column-count=3D"3" same-size-horizontally=3D"false" same-size-v=
ertically=3D"false" hgap=3D"-1" vgap=3D"-1">
+ <margin top=3D"0" left=3D"0" bottom=3D"0" right=3D"0"/>
+ <constraints>
+ <tabbedpane title-resource-bundle=3D"org/jahia/loganalyz=
er/loganalyzer_messages" title-key=3D"org.jahia.loganalyzer.gui.swing.tab.p=
erformance"/>
+ </constraints>
+ <properties/>
+ <border type=3D"none"/>
+ <children>
+ <component id=3D"87c72" class=3D"javax.swing.JLabel">
+ <constraints>
+ <grid row=3D"1" column=3D"0" row-span=3D"1" col-span=
=3D"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=
=3D"0" use-parent-layout=3D"false"/>
+ </constraints>
+ <properties>
+ <text resource-bundle=3D"org/jahia/loganalyzer/logan=
alyzer_messages" key=3D"org.jahia.loganalyzer.gui.swing.label.enterCSVOutpu=
tFile"/>
+ </properties>
+ </component>
+ <component id=3D"6880e" class=3D"javax.swing.JTextField"=
binding=3D"csvOutputFile">
+ <constraints>
+ <grid row=3D"1" column=3D"1" row-span=3D"1" col-span=
=3D"1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=
=3D"0" use-parent-layout=3D"false">
+ <minimum-size width=3D"400" height=3D"-1"/>
+ <preferred-size width=3D"400" height=3D"-1"/>
+ </grid>
+ </constraints>
+ <properties/>
+ </component>
+ <component id=3D"75e5f" class=3D"javax.swing.JButton" bi=
nding=3D"browseCSVOutputFile">
+ <constraints>
+ <grid row=3D"1" column=3D"2" row-span=3D"1" col-span=
=3D"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"0" fill=3D"1" indent=
=3D"0" use-parent-layout=3D"false"/>
+ </constraints>
+ <properties>
+ <text resource-bundle=3D"org/jahia/loganalyzer/logan=
alyzer_messages" key=3D"org.jahia.loganalyzer.gui.swing.button.selectCSVOut=
putFile"/>
+ </properties>
+ </component>
+ <component id=3D"3074d" class=3D"javax.swing.JLabel">
+ <constraints>
+ <grid row=3D"4" column=3D"0" row-span=3D"1" col-span=
=3D"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=
=3D"0" use-parent-layout=3D"false"/>
+ </constraints>
+ <properties>
+ <text resource-bundle=3D"org/jahia/loganalyzer/logan=
alyzer_messages" key=3D"org.jahia.loganalyzer.gui.swing.label.separatorChar=
"/>
+ </properties>
+ </component>
+ <component id=3D"89e6" class=3D"javax.swing.JTextField" =
binding=3D"csvSeparatorCharField">
+ <constraints>
+ <grid row=3D"4" column=3D"1" row-span=3D"1" col-span=
=3D"1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=
=3D"0" use-parent-layout=3D"false">
+ <preferred-size width=3D"10" height=3D"-1"/>
+ <maximum-size width=3D"20" height=3D"-1"/>
+ </grid>
+ </constraints>
+ <properties>
+ <text resource-bundle=3D"org/jahia/loganalyzer/logan=
alyzer_messages" key=3D"org.jahia.loganalyzer.gui.swing.defaultSeparatorCha=
t"/>
+ </properties>
+ </component>
+ <component id=3D"1fef0" class=3D"javax.swing.JCheckBox" =
binding=3D"activatedCheckBox" default-binding=3D"true">
+ <constraints>
+ <grid row=3D"0" column=3D"0" row-span=3D"1" col-span=
=3D"1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"8" fill=3D"0" indent=
=3D"0" use-parent-layout=3D"false"/>
+ </constraints>
+ <properties>
+ <enabled value=3D"false"/>
+ <selected value=3D"true"/>
+ <text resource-bundle=3D"org/jahia/loganalyzer/logan=
alyzer_messages" key=3D"org.jahia.loganalyzer.gui.swing.radioButton.activat=
ed"/>
+ </properties>
+ </component>
+ <component id=3D"471af" class=3D"javax.swing.JTextField"=
binding=3D"regexpPatternField">
+ <constraints>
+ <grid row=3D"2" column=3D"1" row-span=3D"1" col-span=
=3D"1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=
=3D"0" use-parent-layout=3D"false">
+ <preferred-size width=3D"150" height=3D"-1"/>
+ </grid>
+ </constraints>
+ <properties/>
+ </component>
+ <component id=3D"eae73" class=3D"javax.swing.JLabel">
+ <constraints>
+ <grid row=3D"2" column=3D"0" row-span=3D"1" col-span=
=3D"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=
=3D"0" use-parent-layout=3D"false"/>
+ </constraints>
+ <properties>
+ <text resource-bundle=3D"org/jahia/loganalyzer/logan=
alyzer_messages" key=3D"org.jahia.loganalyzer.gui.swing.label.regexpPattern=
"/>
+ </properties>
+ </component>
+ <component id=3D"a1390" class=3D"javax.swing.JTextField"=
binding=3D"dateFormatField">
+ <constraints>
+ <grid row=3D"3" column=3D"1" row-span=3D"1" col-span=
=3D"1" vsize-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=
=3D"0" use-parent-layout=3D"false">
+ <preferred-size width=3D"150" height=3D"-1"/>
+ </grid>
+ </constraints>
+ <properties/>
+ </component>
+ <component id=3D"1dfb9" class=3D"javax.swing.JLabel">
+ <constraints>
+ <grid row=3D"3" column=3D"0" row-span=3D"1" col-span=
=3D"1" vsize-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=
=3D"0" use-parent-layout=3D"false"/>
+ </constraints>
+ <properties>
+ <text resource-bundle=3D"org/jahia/loganalyzer/logan=
alyzer_messages" key=3D"org.jahia.loganalyzer.gui.swing.label.dateFormat"/>
+ </properties>
+ </component>
+ </children>
</grid>
- </constraints>
- <properties/>
- </component>
- <component id=3D"89e6" class=3D"javax.swing.JTextField" binding=
=3D"csvSeparatorCharField">
- <constraints>
- <grid row=3D"3" column=3D"1" row-span=3D"1" col-span=3D"1" v=
size-policy=3D"0" hsize-policy=3D"6" anchor=3D"8" fill=3D"1" indent=3D"0" u=
se-parent-layout=3D"false">
- <preferred-size width=3D"10" height=3D"-1"/>
- <maximum-size width=3D"20" height=3D"-1"/>
+ <grid id=3D"fc4e4" layout-manager=3D"GridLayoutManager" row-=
count=3D"1" column-count=3D"1" same-size-horizontally=3D"false" same-size-v=
ertically=3D"false" hgap=3D"-1" vgap=3D"-1">
+ <margin top=3D"0" left=3D"0" bottom=3D"0" right=3D"0"/>
+ <constraints>
+ <tabbedpane title-resource-bundle=3D"org/jahia/loganalyz=
er/loganalyzer_messages" title-key=3D"org.jahia.loganalyzer.gui.swing.tab.e=
xceptions"/>
+ </constraints>
+ <properties/>
+ <border type=3D"none"/>
+ <children/>
</grid>
- </constraints>
- <properties>
- <text resource-bundle=3D"org/jahia/loganalyzer/loganalyzer_m=
essages" key=3D"org.jahia.loganalyzer.gui.swing.defaultSeparatorChat"/>
- </properties>
- </component>
- <component id=3D"2e351" class=3D"javax.swing.JComboBox" binding=
=3D"analysisTypeSelection">
- <constraints>
- <grid row=3D"2" column=3D"1" row-span=3D"1" col-span=3D"1" v=
size-policy=3D"0" hsize-policy=3D"2" anchor=3D"8" fill=3D"1" indent=3D"0" u=
se-parent-layout=3D"false"/>
- </constraints>
- <properties>
- <model>
- <item value=3D"Performance analysis"/>
- </model>
- </properties>
- </component>
- <component id=3D"788cf" class=3D"javax.swing.JLabel">
- <constraints>
- <grid row=3D"2" column=3D"0" row-span=3D"1" col-span=3D"1" v=
size-policy=3D"0" hsize-policy=3D"0" anchor=3D"8" fill=3D"0" indent=3D"0" u=
se-parent-layout=3D"false"/>
- </constraints>
- <properties>
- <text resource-bundle=3D"org/jahia/loganalyzer/loganalyzer_m=
essages" key=3D"org.jahia.loganalyzer.gui.swing.label.selectAnalysisType"/>
- </properties>
- </component>
+ </children>
+ </tabbedpane>
</children>
</grid>
</children>
Modified: trunk/src/main/java/org/jahia/loganalyzer/gui/swing/LogAnalyzerMa=
inDialog.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/main/java/o=
rg/jahia/loganalyzer/gui/swing/LogAnalyzerMainDialog.java&rev=3D3&repname=
=3Djahia_loganalyzer
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/main/java/org/jahia/loganalyzer/gui/swing/LogAnalyzerMainDial=
og.java (original)
+++ trunk/src/main/java/org/jahia/loganalyzer/gui/swing/LogAnalyzerMainDial=
og.java Fri Sep 14 11:27:56 2007
@@ -1,13 +1,12 @@
package org.jahia.loganalyzer.gui.swing;
=
-import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
import com.jgoodies.looks.plastic.PlasticXPLookAndFeel;
-import com.jgoodies.looks.windows.WindowsLookAndFeel;
=
import javax.swing.*;
import java.awt.event.*;
import java.io.*;
import java.util.ArrayList;
+import java.util.List;
=
import org.jahia.loganalyzer.LogParser;
=
@@ -15,12 +14,18 @@
private JPanel contentPane;
private JButton buttonOK;
private JButton buttonCancel;
- private JButton browseButton;
+ private JButton browseInputLogFile;
private JTextField inputLogFile;
private JTextField csvOutputFile;
private JTextField csvSeparatorCharField;
- private JComboBox analysisTypeSelection;
+ private JButton browseCSVOutputFile;
+ private JTabbedPane typeTabbedPane;
+ private JCheckBox activatedCheckBox;
+ private JTextField regexpPatternField;
+ private JTextField dateFormatField;
private JFileChooser fileChooser;
+ private static final String DEFAULT_REGEXP_PATTERN =3D ".*?\\[(.*?)\\]=
.*org\\.jahia\\.bin\\.Jahia.*Processed \\[(.*?)\\](?: esi=3D\\[(.*?)\\])? u=
ser=3D\\[(.*)\\] ip=3D\\[(.*)\\] in \\[(.*)ms\\].*";
+ private static final String DEFAULT_DATE_FORMAT_STRING =3D "yyyy-MM-dd=
HH:mm:ss,SSS";
=
public LogAnalyzerMainDialog() {
setTitle("Jahia Log Analysis Tool");
@@ -59,6 +64,8 @@
inputLogFile.setText(defaultInputLogFile.getAbsoluteFile().toStrin=
g());
File defaultOutputFile =3D new File("jahia-log-analyzer.csv");
csvOutputFile.setText(defaultOutputFile.getAbsoluteFile().toString=
());
+ regexpPatternField.setText(DEFAULT_REGEXP_PATTERN);
+ dateFormatField.setText(DEFAULT_DATE_FORMAT_STRING);
=
//Create a file chooser
fileChooser =3D new JFileChooser();
@@ -73,8 +80,9 @@
//fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
//fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTOR=
IES);
=
- browseButton.addActionListener(new ActionListener() {
+ browseInputLogFile.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
+ fileChooser.setSelectedFile(new File(inputLogFile.getText(=
)));
int returnVal =3D fileChooser.showOpenDialog(LogAnalyzerMa=
inDialog.this);
=
if (returnVal =3D=3D JFileChooser.APPROVE_OPTION) {
@@ -85,27 +93,43 @@
}
}
});
+ browseCSVOutputFile.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ fileChooser.setSelectedFile(new File(csvOutputFile.getText=
()));
+ int returnVal =3D fileChooser.showOpenDialog(LogAnalyzerMa=
inDialog.this);
+
+ if (returnVal =3D=3D JFileChooser.APPROVE_OPTION) {
+ File file =3D fileChooser.getSelectedFile();
+ //This is where a real application would open the file.
+ csvOutputFile.setText(file.getAbsoluteFile().toString(=
));
+ } else {
+ }
+ }
+ });
}
=
private void disableUI() {
buttonOK.setEnabled(false);
buttonCancel.setEnabled(false);
- browseButton.setEnabled(false);
+ browseInputLogFile.setEnabled(false);
setEnabled(false);
}
=
private void enableUI() {
buttonOK.setEnabled(true);
buttonCancel.setEnabled(true);
- browseButton.setEnabled(true);
+ browseInputLogFile.setEnabled(true);
setEnabled(true);
}
=
private void onOK() {
disableUI();
+ List patternList =3D new ArrayList();
+ patternList.add(regexpPatternField.getText());
AnalysisWorker worker =3D new AnalysisWorker(inputLogFile.getText(=
),
csvOutputFile.getText(),
- csvSeparatorCharField.getText().charAt(0));
+ csvSeparatorCharField.getText().charAt(0),
+ patternList, dateFormatField.getText());
worker.start();
}
=
@@ -129,11 +153,15 @@
private String inputFileName;
private String outputFileName;
private char csvSeparatorChar;
+ private List patternList;
+ private String dateFormatString;
=
- public AnalysisWorker(String inputFileName, String outputFileName,=
char csvSeparatorChar) {
+ public AnalysisWorker(String inputFileName, String outputFileName,=
char csvSeparatorChar, List patternList, String dateFormatString) {
this.inputFileName =3D inputFileName;
this.outputFileName =3D outputFileName;
this.csvSeparatorChar =3D csvSeparatorChar;
+ this.patternList =3D patternList;
+ this.dateFormatString =3D dateFormatString;
}
=
public void run() {
@@ -147,7 +175,7 @@
FileWriter writer =3D new FileWriter(outputFileName);
LogParser logParser =3D new LogParser();
logParser.setCsvOutputSeparatorChar(csvSeparatorChar);
- logParser.parse(reader, writer, new ArrayList());
+ logParser.parse(reader, writer, patternList, dateFormatStr=
ing);
} catch (InterruptedIOException iioe) {
JOptionPane.showMessageDialog(LogAnalyzerMainDialog.this, =
"Analysis cancelled by user", "Warning", JOptionPane.WARNING_MESSAGE);
enableUI();
Modified: trunk/src/main/java/org/jahia/loganalyzer/loganalyzer_messages.pr=
operties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/main/java/o=
rg/jahia/loganalyzer/loganalyzer_messages.properties&rev=3D3&repname=3Djahi=
a_loganalyzer
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/main/java/org/jahia/loganalyzer/loganalyzer_messages.properti=
es (original)
+++ trunk/src/main/java/org/jahia/loganalyzer/loganalyzer_messages.properti=
es Fri Sep 14 11:27:56 2007
@@ -16,4 +16,10 @@
org.jahia.loganalyzer.gui.swing.defaultSeparatorChat=3D;
org.jahia.loganalyzer.gui.swing.dialogTitle=3DJahia Log Analyzing Tool
org.jahia.loganalyzer.gui.swing.button.analyzeButton=3DAnalyze
-org.jahia.loganalyzer.gui.swing.label.selectAnalysisType=3DSelect analysis=
type
\ No newline at end of file
+org.jahia.loganalyzer.gui.swing.label.selectAnalysisType=3DSelect analysis=
type
+org.jahia.loganalyzer.gui.swing.button.selectCSVOutputFile=3DBrowse...
+org.jahia.loganalyzer.gui.swing.tab.performance=3DPerformance
+org.jahia.loganalyzer.gui.swing.radioButton.activated=3DActivated
+org.jahia.loganalyzer.gui.swing.tab.exceptions=3DExceptions
+org.jahia.loganalyzer.gui.swing.label.regexpPattern=3DRegex Pattern
+org.jahia.loganalyzer.gui.swing.label.dateFormat=3DDate format
\ No newline at end of file
Modified: trunk/src/test/java/org/jahia/loganalyzer/LogParserTest.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/test/java/o=
rg/jahia/loganalyzer/LogParserTest.java&rev=3D3&repname=3Djahia_loganalyzer
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/test/java/org/jahia/loganalyzer/LogParserTest.java (original)
+++ trunk/src/test/java/org/jahia/loganalyzer/LogParserTest.java Fri Sep 14=
11:27:56 2007
@@ -16,6 +16,8 @@
* To change this template use File | Settings | File Templates.
*/
public class LogParserTest extends TestCase {
+
+ private static final String DEFAULT_DATE_FORMAT_STRING =3D "yyyy-MM-dd=
HH:mm:ss,SSS";
/**
* Create the test case
*
@@ -38,7 +40,7 @@
InputStream jahiaLogStream =3D this.getClass().getResourceAsStream=
("/jahia-tomcat/catalina.out");
Reader reader =3D new InputStreamReader(jahiaLogStream);
Writer writer =3D new FileWriter("jahia-log-report.csv");
- logParser.parse(reader, writer, new ArrayList());
+ logParser.parse(reader, writer, new ArrayList(), DEFAULT_DATE_FORM=
AT_STRING);
}
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
