Menu
▾
▴
babeldoc-devel — Babeldoc developer list
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(14) |
Mar
(107) |
Apr
(211) |
May
(93) |
Jun
(158) |
Jul
(159) |
Aug
(368) |
Sep
(188) |
Oct
(151) |
Nov
(115) |
Dec
(98) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(25) |
Feb
|
Mar
(33) |
Apr
(28) |
May
(116) |
Jun
(2) |
Jul
(117) |
Aug
(19) |
Sep
(9) |
Oct
(2) |
Nov
|
Dec
(4) |
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(9) |
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
(22) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
(6) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(267) |
Sep
|
Oct
|
Nov
(6) |
Dec
(512) |
| 2008 |
Jan
(187) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: bruce m. <tr...@us...> - 2004-07-25 15:35:42
|
Update of /cvsroot/babeldoc/babeldoc/modules/scanner/config/service In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32135/modules/scanner/config/service Modified Files: query.properties Log Message: removed the scanmon from scanner and moved it to GUI. Removed dependency on GUI in the module setup. Index: query.properties =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/config/service/query.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** query.properties 5 Aug 2003 23:54:03 -0000 1.6 --- query.properties 25 Jul 2004 15:35:26 -0000 1.7 *************** *** 10,13 **** Command.scanner=com.babeldoc.scanner.Scanner - Command.scanmon=com.babeldoc.scanner.gui.ScannerMonitor --- 10,12 ---- |
|
From: bruce m. <tr...@us...> - 2004-07-25 15:23:14
|
Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/gui/scanner/rmiscanmon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30227/modules/scanner/src/com/babeldoc/gui/scanner/rmiscanmon Log Message: Directory /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/gui/scanner/rmiscanmon added to the repository |
|
From: bruce m. <tr...@us...> - 2004-07-25 15:23:07
|
Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/gui/scanner In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30174/modules/scanner/src/com/babeldoc/gui/scanner Log Message: Directory /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/gui/scanner added to the repository |
|
From: bruce m. <tr...@us...> - 2004-07-25 15:22:59
|
Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30153/modules/scanner/src/com/babeldoc/gui Log Message: Directory /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/gui added to the repository |
|
From: bruce m. <tr...@us...> - 2004-07-25 15:20:51
|
Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/scanner/rmiscanmon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29926/modules/gui/src/com/babeldoc/gui/scanner/rmiscanmon Log Message: Directory /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/scanner/rmiscanmon added to the repository |
|
From: bruce m. <tr...@us...> - 2004-07-25 15:18:55
|
Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/scanner/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29700/modules/gui/src/com/babeldoc/gui/scanner/builder Log Message: Directory /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/scanner/builder added to the repository |
|
From: bruce m. <tr...@us...> - 2004-07-24 18:33:03
|
Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5206/modules/gui/src/com/babeldoc/gui/wizard/addstage Modified Files: GetStageDetailsWizardPanel.java Log Message: Wrong language on the wizard screen Index: GetStageDetailsWizardPanel.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage/GetStageDetailsWizardPanel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GetStageDetailsWizardPanel.java 24 Jul 2004 18:07:53 -0000 1.5 --- GetStageDetailsWizardPanel.java 24 Jul 2004 18:32:53 -0000 1.6 *************** *** 143,147 **** panel = new JPanel(); panel.setLayout(new BoxLayout(panel, BoxLayout.LINE_AXIS)); ! panel.add(new JLabel(I18n.get("gui.wizard.addstage.setentrystage.stagename"))); String[] stagetypes = getModel().getAllPipelineStageTypes(); --- 143,147 ---- panel = new JPanel(); panel.setLayout(new BoxLayout(panel, BoxLayout.LINE_AXIS)); ! panel.add(new JLabel(I18n.get("gui.wizard.addstage.setentrystage.stagetype"))); String[] stagetypes = getModel().getAllPipelineStageTypes(); |
|
From: bruce m. <tr...@us...> - 2004-07-24 18:29:55
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/config/i18n In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4793/modules/core/config/i18n Modified Files: messages.properties Log Message: Fix some of the language. Index: messages.properties =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/config/i18n/messages.properties,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** messages.properties 23 Jul 2004 22:40:31 -0000 1.27 --- messages.properties 24 Jul 2004 18:29:46 -0000 1.28 *************** *** 398,404 **** core.pipeline.stageinfo.stageType=Type of pipeline stage ! core.pipeline.stageinfo.nextStage=Name of the next stage in pipeline ! core.pipeline.stageinfo.ignored=Is this stage ignored ! core.pipeline.stageinfo.tracked=Is this stage tracked core.pipeline.stageinfo.encoding=Encoding of resulting document. This is used for text documents. Default is system file.encoding core.pipeline.stageinfo.error.complex=Can't apply pipeline stage configuration data to non-complex option --- 398,404 ---- core.pipeline.stageinfo.stageType=Type of pipeline stage ! core.pipeline.stageinfo.nextStage=Name of the next stage in pipeline or null if this is the last stage. ! core.pipeline.stageinfo.ignored=If this is set then this stage is ignored? ! core.pipeline.stageinfo.tracked=If this is set then this stage is tracked? core.pipeline.stageinfo.encoding=Encoding of resulting document. This is used for text documents. Default is system file.encoding core.pipeline.stageinfo.error.complex=Can't apply pipeline stage configuration data to non-complex option |
|
From: bruce m. <tr...@us...> - 2004-07-24 18:08:03
|
Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1270/modules/gui/src/com/babeldoc/gui/wizard/addstage Modified Files: AddPipelineStageModel.java GetPipelineNameWizardPanel.java GetStageDetailsWizardPanel.java Log Message: Webhikers patch: 952429 ] Piepeline Wizards stage patches Index: AddPipelineStageModel.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage/AddPipelineStageModel.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AddPipelineStageModel.java 28 May 2004 10:31:12 -0000 1.8 --- AddPipelineStageModel.java 24 Jul 2004 18:07:53 -0000 1.9 *************** *** 66,72 **** package com.babeldoc.gui.wizard.addstage; - import com.babeldoc.core.config.ConfigException; import com.babeldoc.core.option.IConfigInfo; import com.babeldoc.core.option.MutableConfigValueException; import com.babeldoc.core.pipeline.*; import com.babeldoc.core.LogService; --- 66,72 ---- package com.babeldoc.gui.wizard.addstage; import com.babeldoc.core.option.IConfigInfo; import com.babeldoc.core.option.MutableConfigValueException; + import com.babeldoc.core.config.ConfigException; import com.babeldoc.core.pipeline.*; import com.babeldoc.core.LogService; *************** *** 128,137 **** if (finished) { ! //TODO: Implement proper exception handling ! try { ! PipelineBuilderModel.createPipelineStage(pipeline, stage, stageType); ! } catch (ConfigException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 128,136 ---- if (finished) { ! try { ! PipelineBuilderModel.createPipelineStage(pipeline, stage, stageType); ! } ! catch (ConfigException ce) { ! LogService.getInstance().logError(ce); } } Index: GetPipelineNameWizardPanel.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage/GetPipelineNameWizardPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GetPipelineNameWizardPanel.java 11 Jun 2003 23:35:38 -0000 1.2 --- GetPipelineNameWizardPanel.java 24 Jul 2004 18:07:53 -0000 1.3 *************** *** 68,71 **** --- 68,72 ---- import com.babeldoc.core.I18n; + import java.util.Arrays; import javax.swing.*; import javax.swing.event.ListSelectionEvent; *************** *** 104,107 **** --- 105,110 ---- String[] pipelines = getModel().getAllPipelineNames(); + Arrays.sort(pipelines); + int selected = 0; Index: GetStageDetailsWizardPanel.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/wizard/addstage/GetStageDetailsWizardPanel.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GetStageDetailsWizardPanel.java 26 Aug 2003 22:23:32 -0000 1.4 --- GetStageDetailsWizardPanel.java 24 Jul 2004 18:07:53 -0000 1.5 *************** *** 68,71 **** --- 68,72 ---- import com.babeldoc.core.I18n; + import java.util.Arrays; import java.awt.*; import java.awt.event.ActionEvent; *************** *** 143,147 **** panel.setLayout(new BoxLayout(panel, BoxLayout.LINE_AXIS)); panel.add(new JLabel(I18n.get("gui.wizard.addstage.setentrystage.stagename"))); ! stagetype = new JComboBox(getModel().getAllPipelineStageTypes()); stagetype.setSelectedIndex(0); stagetype.setMaximumSize(new Dimension(1000, 20)); --- 144,152 ---- panel.setLayout(new BoxLayout(panel, BoxLayout.LINE_AXIS)); panel.add(new JLabel(I18n.get("gui.wizard.addstage.setentrystage.stagename"))); ! ! String[] stagetypes = getModel().getAllPipelineStageTypes(); ! Arrays.sort(stagetypes); ! ! stagetype = new JComboBox(stagetypes); stagetype.setSelectedIndex(0); stagetype.setMaximumSize(new Dimension(1000, 20)); |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:32
|
Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/scanner/src/com/babeldoc/scanner Modified Files: ScannerThread.java ScannerWorker.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: ScannerWorker.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/ScannerWorker.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** ScannerWorker.java 28 May 2004 10:31:14 -0000 1.36 --- ScannerWorker.java 24 Jul 2004 00:18:52 -0000 1.37 *************** *** 332,338 **** this.initialize(); ! if (getLog().isDebugEnabled()) { getLog().logDebug(this.getName() + " worker initialized successfully"); - } //Set status to stopped if worker should be ignored --- 332,337 ---- this.initialize(); ! if (getLog().isDebugEnabled()) getLog().logDebug(this.getName() + " worker initialized successfully"); //Set status to stopped if worker should be ignored *************** *** 359,363 **** public void process() { //do not run in any status other then READY ! getLog().logDebug(this.getName() + " scanning for new documents"); if (this.getStatus().equals(ScannerWorkerStatus.READY)) { --- 358,363 ---- public void process() { //do not run in any status other then READY ! if (getLog().isDebugEnabled()) ! getLog().logDebug(this.getName() + " scanning for new documents"); if (this.getStatus().equals(ScannerWorkerStatus.READY)) { Index: ScannerThread.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/ScannerThread.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ScannerThread.java 17 Aug 2003 04:12:29 -0000 1.17 --- ScannerThread.java 24 Jul 2004 00:18:52 -0000 1.18 *************** *** 102,106 **** while (running && !(worker.isCountedDown())) { waitToRun(); ! LogService.getInstance().logDebug(this.getName() + "scanning..."); if(!worker.isCronScheduleType()) { --- 102,107 ---- while (running && !(worker.isCountedDown())) { waitToRun(); ! if(LogService.getInstance().isDebugEnabled()) ! LogService.getInstance().logDebug(this.getName() + "scanning..."); if(!worker.isCronScheduleType()) { |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:32
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/user/simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/core/src/com/babeldoc/core/user/simple Modified Files: SimpleUserFactory.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: SimpleUserFactory.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/user/simple/SimpleUserFactory.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SimpleUserFactory.java 27 Jun 2003 02:20:00 -0000 1.3 --- SimpleUserFactory.java 24 Jul 2004 00:18:52 -0000 1.4 *************** *** 66,69 **** --- 66,70 ---- package com.babeldoc.core.user.simple; + import com.babeldoc.core.LogService; import com.babeldoc.core.config.ConfigService; import com.babeldoc.core.user.*; *************** *** 157,161 **** */ public IUserContext getUserContext(String name) throws UserException { ! com.babeldoc.core.LogService.getInstance().logDebug("[SimpleUserManager.getUserContext]: getting context for user: " + name); --- 158,163 ---- */ public IUserContext getUserContext(String name) throws UserException { ! if(LogService.getInstance().isDebugEnabled()) ! LogService.getInstance().logDebug("[SimpleUserManager.getUserContext]: getting context for user: " + name); |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:31
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/processor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/core/src/com/babeldoc/core/pipeline/processor Modified Files: SyncPipelineStageProcessor.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: SyncPipelineStageProcessor.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/processor/SyncPipelineStageProcessor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SyncPipelineStageProcessor.java 12 Aug 2003 23:44:44 -0000 1.4 --- SyncPipelineStageProcessor.java 24 Jul 2004 00:18:51 -0000 1.5 *************** *** 90,94 **** private ThreadLocal localStages = new ThreadLocal() { protected synchronized Object initialValue() { ! LogService.getInstance().logDebug(I18n.get("019005", "new")); return new HashMap(); } --- 90,95 ---- private ThreadLocal localStages = new ThreadLocal() { protected synchronized Object initialValue() { ! if(LogService.getInstance().isDebugEnabled()) ! LogService.getInstance().logDebug(I18n.get("019005", "new")); return new HashMap(); } *************** *** 133,137 **** if (!stages.containsKey(stageName)) { ! LogService.getInstance().logDebug(I18n.get("019005", stageName)); try { --- 134,139 ---- if (!stages.containsKey(stageName)) { ! if(LogService.getInstance().isDebugEnabled()) ! LogService.getInstance().logDebug(I18n.get("019005", stageName)); try { |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:31
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/core/src/com/babeldoc/core/pipeline/stage Modified Files: DomifyPipelineStage.java ScriptingPipelineStage.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: DomifyPipelineStage.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage/DomifyPipelineStage.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** DomifyPipelineStage.java 28 May 2004 10:31:10 -0000 1.18 --- DomifyPipelineStage.java 24 Jul 2004 00:18:51 -0000 1.19 *************** *** 124,127 **** --- 124,130 ---- public static boolean USE_DTD_CACHE; + /** logging for this class */ + private LogService log = LogService.getInstance(this.getClass().getName()); + /** cache document representations here rather than as document attributes **/ private static Map domCache = Collections.synchronizedMap(new WeakHashMap()); *************** *** 288,292 **** } */ ! LogService.getInstance().logDebug(I18n.get("100014")); return buf.substring(0, startDTD - 1) + --- 291,296 ---- } */ ! if(log.isDebugEnabled()) ! log.logDebug(I18n.get("100014")); return buf.substring(0, startDTD - 1) + *************** *** 332,340 **** dfactory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA); } catch (IllegalArgumentException e) { ! LogService.getInstance().logWarn(I18n.get("100006")); } dfactory.setAttribute(JAXP_SCHEMA_SOURCE, schemaFile); ! LogService.getInstance().logDebug(I18n.get("100007", schemaFile)); } else { throw new PipelineException(I18n.get("100008"), null); --- 336,345 ---- dfactory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA); } catch (IllegalArgumentException e) { ! log.logWarn(I18n.get("100006")); } dfactory.setAttribute(JAXP_SCHEMA_SOURCE, schemaFile); ! if(log.isDebugEnabled()) ! log.logDebug(I18n.get("100007", schemaFile)); } else { throw new PipelineException(I18n.get("100008"), null); *************** *** 372,379 **** public void error(SAXParseException exception) { errorOccured = true; ! LogService.getInstance().logDebug(I18n.get("100011", ! exception.getMessage())); ! errorDescription = errorDescription + exception.getMessage() + ! "\n"; } --- 377,383 ---- public void error(SAXParseException exception) { errorOccured = true; ! if(log.isDebugEnabled()) ! log.logDebug(I18n.get("100011", exception.getMessage())); ! errorDescription = errorDescription + exception.getMessage() + "\n"; } *************** *** 385,392 **** public void fatalError(SAXParseException exception) { errorOccured = true; ! LogService.getInstance().logDebug(I18n.get("100012", ! exception.getMessage())); ! errorDescription = errorDescription + exception.getMessage() + ! "\n"; } --- 389,395 ---- public void fatalError(SAXParseException exception) { errorOccured = true; ! if(log.isDebugEnabled()) ! log.logDebug(I18n.get("100012",exception.getMessage())); ! errorDescription = errorDescription + exception.getMessage() + "\n"; } *************** *** 398,405 **** public void warning(SAXParseException exception) { errorOccured = true; ! LogService.getInstance().logDebug(I18n.get("100013", ! exception.getMessage())); ! errorDescription = errorDescription + exception.getMessage() + ! "\n"; } --- 401,407 ---- public void warning(SAXParseException exception) { errorOccured = true; ! if(log.isDebugEnabled()) ! log.logDebug(I18n.get("100013", exception.getMessage())); ! errorDescription = errorDescription + exception.getMessage() + "\n"; } *************** *** 426,430 **** throw pe; } catch (Exception e) { ! LogService.getInstance().logError(e); } --- 428,432 ---- throw pe; } catch (Exception e) { ! log.logError(e); } Index: ScriptingPipelineStage.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage/ScriptingPipelineStage.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ScriptingPipelineStage.java 12 Aug 2003 23:44:44 -0000 1.11 --- ScriptingPipelineStage.java 24 Jul 2004 00:18:51 -0000 1.12 *************** *** 246,253 **** } } ! ! LogService.getInstance().logDebug("Script to process ="); ! LogService.getInstance().logDebug(script); ! return script; } --- 246,255 ---- } } ! ! if(LogService.getInstance().isDebugEnabled()) { ! LogService.getInstance().logDebug("Script to process ="); ! LogService.getInstance().logDebug(script); ! } ! return script; } |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:31
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/resource In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/core/src/com/babeldoc/core/resource Modified Files: ResourceFactory.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: ResourceFactory.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/resource/ResourceFactory.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ResourceFactory.java 15 Aug 2003 00:25:29 -0000 1.6 --- ResourceFactory.java 24 Jul 2004 00:18:51 -0000 1.7 *************** *** 129,142 **** */ public static synchronized IResource getResource(String name) { ! // LogService.getInstance().logDebug("[ResourceFactory.getResource]: getting resource \""+name+"\""); IResource resource = (IResource) getInstance().resources.get(name); if (resource == null) { ! // LogService.getInstance().logDebug("[ResourceFactory.getResource] resource not cached, creating"); try { String resourceConfigName = RESOURCE + "/" + name; String typeName = ConfigService.getString(resourceConfigName, TYPE); ! // LogService.getInstance().logDebug("[ResourceFactory.getResource]: Type: \""+typeName+"\""); if (typeName != null) { Class classObj = ResourceType.getResourceType(typeName).getTypeClass(); --- 129,145 ---- */ public static synchronized IResource getResource(String name) { ! if(LogService.getInstance().isDebugEnabled()) ! LogService.getInstance().logDebug("[ResourceFactory.getResource]: getting resource \""+name+"\""); IResource resource = (IResource) getInstance().resources.get(name); if (resource == null) { ! if(LogService.getInstance().isDebugEnabled()) ! LogService.getInstance().logDebug("[ResourceFactory.getResource] resource not cached, creating"); try { String resourceConfigName = RESOURCE + "/" + name; String typeName = ConfigService.getString(resourceConfigName, TYPE); ! if(LogService.getInstance().isDebugEnabled()) ! LogService.getInstance().logDebug("[ResourceFactory.getResource]: Type: \""+typeName+"\""); if (typeName != null) { Class classObj = ResourceType.getResourceType(typeName).getTypeClass(); |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:31
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/config/light In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/core/src/com/babeldoc/core/config/light Modified Files: LightConfigService.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: LightConfigService.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/config/light/LightConfigService.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** LightConfigService.java 3 Apr 2004 15:11:32 -0000 1.13 --- LightConfigService.java 24 Jul 2004 00:18:50 -0000 1.14 *************** *** 132,137 **** public IConfig getConfig(String name) { String newname = getPropertyFileName(name); ! ! log.logDebug("Loading: " + name); Properties properties = mergePropertiesFileFromUserSearchPath(newname, new Properties()); --- 132,137 ---- public IConfig getConfig(String name) { String newname = getPropertyFileName(name); ! if(log.isDebugEnabled()) ! log.logDebug("Loading: " + name); Properties properties = mergePropertiesFileFromUserSearchPath(newname, new Properties()); |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:30
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/core/src/com/babeldoc/core/pipeline Modified Files: PipelineStage.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: PipelineStage.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/PipelineStage.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** PipelineStage.java 28 May 2004 10:31:14 -0000 1.23 --- PipelineStage.java 24 Jul 2004 00:18:51 -0000 1.24 *************** *** 338,343 **** : value; } catch (Exception e) { ! LogService.getInstance().logDebug( ! "Error resolving " + this.getName() + "." + key); // Do nothing ... this assumes that missing a configuration item is not a critical error --- 338,344 ---- : value; } catch (Exception e) { ! if(LogService.getInstance().isDebugEnabled() ) ! LogService.getInstance().logDebug( ! "Error resolving " + this.getName() + "." + key); // Do nothing ... this assumes that missing a configuration item is not a critical error |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:29
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/core/src/com/babeldoc/core/journal/simple Modified Files: SimpleJournal.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: SimpleJournal.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/simple/SimpleJournal.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SimpleJournal.java 16 Sep 2003 05:19:00 -0000 1.11 --- SimpleJournal.java 24 Jul 2004 00:18:50 -0000 1.12 *************** *** 153,156 **** --- 153,158 ---- private IConfigInfo info; + /** log setup */ + private LogService log = LogService.getInstance(SimpleJournal.class.getName()); *************** *** 251,256 **** Object obj = ois.readObject(); ! LogService.getInstance().logDebug(I18n.get("013003", ticket, ! Integer.toString(step), obj.getClass().toString())); try { --- 253,259 ---- Object obj = ois.readObject(); ! if(log.isDebugEnabled()) ! log.logDebug(I18n.get("013003", ticket, ! Integer.toString(step), obj.getClass().toString())); try { *************** *** 422,426 **** */ public synchronized IJournalTicket newTicket() throws JournalException { ! //LogService.getInstance().logDebug("[SimpleJournal.newTicket] called"); IJournalTicket ticket = new JournalTicket(getValueForTicket()); --- 425,429 ---- */ public synchronized IJournalTicket newTicket() throws JournalException { ! //log.logDebug("[SimpleJournal.newTicket] called"); IJournalTicket ticket = new JournalTicket(getValueForTicket()); *************** *** 452,456 **** rollLogFile(); } catch (IOException iox) { ! LogService.getInstance().logError(iox); } --- 455,459 ---- rollLogFile(); } catch (IOException iox) { ! log.logError(iox); } *************** *** 494,507 **** */ protected void rollLogFile() throws IOException { ! File log = new File(getLogFile()); ! if (log.length() > getLogMaxSize()) { getLogWriter().close(); String fileName = getLogFile() + "." + new Date().toString(); ! com.babeldoc.core.LogService.getInstance().logInfo(I18n.get("013001", ! fileName)); ! log.renameTo(new File(fileName)); logWriter = new FileWriter(getLogFile(), true); logPrinter = new CSVWriter(getLogWriter()); --- 497,509 ---- */ protected void rollLogFile() throws IOException { ! File logfile = new File(getLogFile()); ! if (logfile.length() > getLogMaxSize()) { getLogWriter().close(); String fileName = getLogFile() + "." + new Date().toString(); ! log.logInfo(I18n.get("013001", fileName)); ! logfile.renameTo(new File(fileName)); logWriter = new FileWriter(getLogFile(), true); logPrinter = new CSVWriter(getLogWriter()); *************** *** 580,584 **** i = directory.listFiles(new FilenameFilter() { public boolean accept(File dir, String name) { ! //LogService.getInstance().logDebug(name); return name.endsWith(DELTA_SUFFIX); } --- 582,586 ---- i = directory.listFiles(new FilenameFilter() { public boolean accept(File dir, String name) { ! //log.logDebug(name); return name.endsWith(DELTA_SUFFIX); } *************** *** 696,700 **** logWriter = new FileWriter(getLogFile(), true); } catch (IOException e) { ! LogService.getInstance().logError(e); } } --- 698,702 ---- logWriter = new FileWriter(getLogFile(), true); } catch (IOException e) { ! log.logError(e); } } |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:29
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/core/src/com/babeldoc/core/config Modified Files: ConfigService.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: ConfigService.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/config/ConfigService.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ConfigService.java 3 Apr 2004 15:11:33 -0000 1.13 --- ConfigService.java 24 Jul 2004 00:18:50 -0000 1.14 *************** *** 93,96 **** --- 93,99 ---- public class ConfigService implements IConfigService, IConfigChangeNotifier { + + private static LogService log = LogService.getInstance(ConfigService.class.getName()); + /** constant: configuration file */ public static final String CONFIG = "babel.config"; *************** *** 123,127 **** lruNum = Integer.parseInt(lruNumStr); } catch (Exception e) { ! LogService.getInstance().logError(com.babeldoc.core.I18n.get("007001", lruNumStr), e); } --- 126,130 ---- lruNum = Integer.parseInt(lruNumStr); } catch (Exception e) { ! log.logError(com.babeldoc.core.I18n.get("007001", lruNumStr), e); } *************** *** 138,142 **** configService = (IConfigService) Class.forName(config).newInstance(); } catch (Exception e) { ! LogService.getInstance().logError(e); } } --- 141,145 ---- configService = (IConfigService) Class.forName(config).newInstance(); } catch (Exception e) { ! log.logError(e); } } *************** *** 231,235 **** public static void clearCache() { configs.clear(); ! LogService.getInstance().logDebug("Clearing Entire Config Cache"); } --- 234,239 ---- public static void clearCache() { configs.clear(); ! if(log.isDebugEnabled()) ! log.logDebug("Clearing Entire Config Cache"); } *************** *** 242,246 **** public static void clearCache(String name) { configs.remove(name); ! LogService.getInstance().logDebug("Clearing Config Cache for " + name); } --- 246,251 ---- public static void clearCache(String name) { configs.remove(name); ! if(log.isDebugEnabled()) ! log.logDebug("Clearing Config Cache for " + name); } *************** *** 283,287 **** ((IConfigChangeNotifier)configService).addConfigChangeListener(listener); } else { ! throw new com.babeldoc.core.config.ConfigException(I18n.get("005200")); } } --- 288,292 ---- ((IConfigChangeNotifier)configService).addConfigChangeListener(listener); } else { ! throw new ConfigException(I18n.get("005200")); } } *************** *** 298,302 **** ((IConfigChangeNotifier)configService).addConfigChangeListener(listener, config); } else { ! throw new com.babeldoc.core.config.ConfigException(I18n.get("005200")); } } --- 303,307 ---- ((IConfigChangeNotifier)configService).addConfigChangeListener(listener, config); } else { ! throw new ConfigException(I18n.get("005200")); } } *************** *** 313,317 **** ((IConfigChangeNotifier)configService).addConfigChangeListener(listener, configs); } else { ! throw new com.babeldoc.core.config.ConfigException(I18n.get("005200")); } } --- 318,322 ---- ((IConfigChangeNotifier)configService).addConfigChangeListener(listener, configs); } else { ! throw new ConfigException(I18n.get("005200")); } } |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:29
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/core/src/com/babeldoc/core Modified Files: VelocityUtilityContext.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: VelocityUtilityContext.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/VelocityUtilityContext.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** VelocityUtilityContext.java 6 Aug 2003 23:33:06 -0000 1.11 --- VelocityUtilityContext.java 24 Jul 2004 00:18:50 -0000 1.12 *************** *** 111,114 **** --- 111,117 ---- /** static: keep a reference for convenience */ private static VelocityUtilityContext instance; + + /** logging instance */ + private static LogService log = LogService.getInstance(VelocityUtilityContext.class.getName()); /** *************** *** 177,181 **** return new BufferedReader(new InputStreamReader(System.in)).readLine(); } catch (Exception ex) { ! LogService.getInstance().logError(ex); } --- 180,184 ---- return new BufferedReader(new InputStreamReader(System.in)).readLine(); } catch (Exception ex) { ! log.logError(ex); } *************** *** 266,278 **** public void debugObject(Object obj) { if (obj == null) { ! logDebug(I18n.get("005001")); } else { Class classObj = obj.getClass(); ! logDebug(I18n.get("005002") + " " + classObj.toString()); Method[] methods = classObj.getMethods(); for (int i = 0; i < methods.length; ++i) { ! logDebug(I18n.get("005003") + " " + methods[i].getName() + ":" + methods[i].getReturnType()); } --- 269,284 ---- public void debugObject(Object obj) { if (obj == null) { ! if(log.isDebugEnabled()) ! log.logDebug(I18n.get("005001")); } else { Class classObj = obj.getClass(); ! if(log.isDebugEnabled()) ! log.logDebug(I18n.get("005002") + " " + classObj.toString()); Method[] methods = classObj.getMethods(); for (int i = 0; i < methods.length; ++i) { ! if(log.isDebugEnabled()) ! log.logDebug(I18n.get("005003") + " " + methods[i].getName() + ":" + methods[i].getReturnType()); } *************** *** 308,312 **** */ public void logDebug(String line) { ! LogService.getInstance().logDebug(line); } --- 314,318 ---- */ public void logDebug(String line) { ! log.logDebug(line); } *************** *** 317,321 **** */ public void logError(String line) { ! LogService.getInstance().logError(line, null); } --- 323,327 ---- */ public void logError(String line) { ! log.logError(line, null); } *************** *** 326,330 **** */ public void logInfo(String line) { ! LogService.getInstance().logInfo(line); } --- 332,336 ---- */ public void logInfo(String line) { ! log.logInfo(line); } *************** *** 335,339 **** */ public void logWarning(String line) { ! LogService.getInstance().logWarn(line); } --- 341,345 ---- */ public void logWarning(String line) { ! log.logWarn(line); } *************** *** 359,363 **** return new String(messageDigest.digest(value.getBytes())); } catch (NoSuchAlgorithmException e) { ! LogService.getInstance().logError(e); } return ""; --- 365,369 ---- return new String(messageDigest.digest(value.getBytes())); } catch (NoSuchAlgorithmException e) { ! log.logError(e); } return ""; |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:04
|
Update of /cvsroot/babeldoc/babeldoc/modules/web/src/com/babeldoc/web/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/web/src/com/babeldoc/web/main Modified Files: ConsoleServlet.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: ConsoleServlet.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/web/src/com/babeldoc/web/main/ConsoleServlet.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ConsoleServlet.java 27 Jun 2003 02:09:21 -0000 1.8 --- ConsoleServlet.java 24 Jul 2004 00:18:54 -0000 1.9 *************** *** 66,70 **** --- 66,72 ---- package com.babeldoc.web.main; + import com.babeldoc.core.EnvironmentLoader; import com.babeldoc.core.I18n; + import com.babeldoc.core.LogService; import com.babeldoc.core.user.*; *************** *** 129,132 **** --- 131,135 ---- static final String PARM_PASSWORD = "password"; + private LogService log = LogService.getInstance(this.getClass().getName()); /** * main routine to handle a request. Called by VelocityServlet, your *************** *** 160,165 **** outty = getTemplate(path); } catch (ParseErrorException pee) { ! com.babeldoc.core.LogService.getInstance().logError(I18n.get("web.005"), ! pee); try { --- 163,167 ---- outty = getTemplate(path); } catch (ParseErrorException pee) { ! log.logError(I18n.get("web.005"), pee); try { *************** *** 168,173 **** } } catch (ResourceNotFoundException rnfe) { ! com.babeldoc.core.LogService.getInstance().logError(com.babeldoc.core.I18n.get( ! "web.006"), rnfe); try { --- 170,174 ---- } } catch (ResourceNotFoundException rnfe) { ! log.logError(I18n.get("web.006"), rnfe); try { *************** *** 176,181 **** } } catch (Exception e) { ! com.babeldoc.core.LogService.getInstance().logError(com.babeldoc.core.I18n.get( ! "000001"), e); } --- 177,181 ---- } } catch (Exception e) { ! log.logError(I18n.get("000001"), e); } *************** *** 197,212 **** HttpSession session = request.getSession(true); String path = request.getServletPath(); ! System.out.println("Context path: " + request.getContextPath()); ! System.out.println("Servet path: " + path); UserResource resource = UserResourceFactory.getInstance().getUserResource(path); IUserContext userContext = (IUserContext) session.getAttribute(USER_CONTEXT); ! com.babeldoc.core.LogService.getInstance().logDebug(com.babeldoc.core.I18n.get( ! "web.002") + userContext); if ((userContext == null) && UserResourceFactory.getInstance().mustAuthenticate(resource)) { ! com.babeldoc.core.LogService.getInstance().logDebug(com.babeldoc.core.I18n.get( ! "web.003")); // If we are in process of logging in. --- 197,215 ---- HttpSession session = request.getSession(true); String path = request.getServletPath(); ! ! if(log.isDebugEnabled()) { ! log.logDebug("Context path: " + request.getContextPath()); ! log.logDebug("Servet path: " + path); ! } UserResource resource = UserResourceFactory.getInstance().getUserResource(path); IUserContext userContext = (IUserContext) session.getAttribute(USER_CONTEXT); ! if(log.isDebugEnabled()) ! log.logDebug(I18n.get("web.002") + userContext); if ((userContext == null) && UserResourceFactory.getInstance().mustAuthenticate(resource)) { ! if(log.isDebugEnabled()) ! log.logDebug(I18n.get("web.003")); // If we are in process of logging in. *************** *** 220,229 **** if (UserFactory.getInstance().authenticate(userContext, new PasswordUserCredential(password))) { ! com.babeldoc.core.LogService.getInstance().logDebug(com.babeldoc.core.I18n.get( ! "web.004")); request.getSession().setAttribute(USER_CONTEXT, userContext); ! com.babeldoc.core.LogService.getInstance().logDebug(com.babeldoc.core.I18n.get( ! "web.004")); path = (String) request.getSession().getAttribute(LOGON_BOUNCE); } else { --- 223,234 ---- if (UserFactory.getInstance().authenticate(userContext, new PasswordUserCredential(password))) { ! ! if(log.isDebugEnabled()) ! log.logDebug(I18n.get("web.004")); request.getSession().setAttribute(USER_CONTEXT, userContext); ! ! if(log.isDebugEnabled()) ! log.logDebug(I18n.get("web.004")); path = (String) request.getSession().getAttribute(LOGON_BOUNCE); } else { *************** *** 237,242 **** } else { session.setAttribute(LOGON_BOUNCE, path); ! com.babeldoc.core.LogService.getInstance().logDebug("LOGON_BOUNCE: " + ! path); path = LOGON_PAGE; } --- 242,247 ---- } else { session.setAttribute(LOGON_BOUNCE, path); ! if(log.isDebugEnabled()) ! log.logDebug("LOGON_BOUNCE: " + path); path = LOGON_PAGE; } *************** *** 271,275 **** p.setProperty("runtime.log", path + "velocity.log"); ! com.babeldoc.core.EnvironmentLoader.loadEnvironment(); System.out.println(p.toString()); --- 276,280 ---- p.setProperty("runtime.log", path + "velocity.log"); ! EnvironmentLoader.loadEnvironment(); System.out.println(p.toString()); |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:04
|
Update of /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/journal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/sql/src/com/babeldoc/sql/journal Modified Files: GenericSqlJournal.java OracleJournal.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: OracleJournal.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/journal/OracleJournal.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OracleJournal.java 27 Jun 2003 02:05:58 -0000 1.5 --- OracleJournal.java 24 Jul 2004 00:18:53 -0000 1.6 *************** *** 98,101 **** --- 98,104 ---- public static final String SELECT_BLOB = "journalSelectBlobForUpdate-oracle"; + /** Log service to use */ + private LogService log = LogService.getInstance(this.getClass().getName()); + /** * writeDelta - this method involves lots of db specific trickery (in this *************** *** 111,115 **** protected void writeDelta(Connection con, long id, long step, PipelineDocument doc) throws SQLException { ! LogService.getInstance().logDebug("[Oracle.writeDelta] called"); String insertStmt = SqlQueryManager.getSqlQuery(DELTA_MAKEROW); --- 114,120 ---- protected void writeDelta(Connection con, long id, long step, PipelineDocument doc) throws SQLException { ! ! if(log.isDebugEnabled()) ! log.logDebug("[Oracle.writeDelta] called"); String insertStmt = SqlQueryManager.getSqlQuery(DELTA_MAKEROW); *************** *** 120,124 **** try { ! LogService.getInstance().logDebug("[Oracle.writeDelta] Creating journal row"); con.setAutoCommit(false); pstmt = con.prepareStatement(insertStmt); --- 125,130 ---- try { ! if(log.isDebugEnabled()) ! log.logDebug("[Oracle.writeDelta] Creating journal row"); con.setAutoCommit(false); pstmt = con.prepareStatement(insertStmt); *************** *** 149,156 **** con.commit(); ! LogService.getInstance().logDebug("Commited"); } catch (Exception e) { ! com.babeldoc.core.LogService.getInstance().logError("Error updating document", ! e); con.rollback(); throw new SQLException(e.toString()); --- 155,162 ---- con.commit(); ! if(log.isDebugEnabled()) ! log.logDebug("Committed"); } catch (Exception e) { ! log.logError("Error updating document", e); con.rollback(); throw new SQLException(e.toString()); *************** *** 169,173 **** } } catch (Exception e) { ! com.babeldoc.core.LogService.getInstance().logError("Closing objects", e); } } --- 175,179 ---- } } catch (Exception e) { ! log.logError("Closing objects", e); } } Index: GenericSqlJournal.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/journal/GenericSqlJournal.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** GenericSqlJournal.java 3 Sep 2003 03:25:32 -0000 1.11 --- GenericSqlJournal.java 24 Jul 2004 00:18:53 -0000 1.12 *************** *** 126,129 **** --- 126,132 ---- private SqlJournalInfo info; + /** logging for this class */ + private LogService log = LogService.getInstance(this.getClass().getName()); + /** * getChildrenTickets. Get all the tickets which are children of this ticket *************** *** 148,153 **** String query = SqlQueryManager.getSqlQuery(LOG_QUERY_ALL_OTHER_VALUES); ! LogService.getInstance().logDebug("[GenericSqlJournal.getTickets] query: " + ! query.toString()); pstmt = con.prepareStatement(query); pstmt.setString(1, Long.toString(((JournalTicket) parent).getValue())); --- 151,156 ---- String query = SqlQueryManager.getSqlQuery(LOG_QUERY_ALL_OTHER_VALUES); ! if(log.isDebugEnabled()) ! log.logDebug("[GenericSqlJournal.getTickets] query: " + query.toString()); pstmt = con.prepareStatement(query); pstmt.setString(1, Long.toString(((JournalTicket) parent).getValue())); *************** *** 178,182 **** getResource().checkIn(con); } catch (Exception ex) { ! LogService.getInstance().logError(I18n.get("sql.403"), ex); } } --- 181,185 ---- getResource().checkIn(con); } catch (Exception ex) { ! log.logError(I18n.get("sql.403"), ex); } } *************** *** 229,233 **** getResource().checkIn(con); } catch (Exception ex) { ! LogService.getInstance().logError(ex); } } --- 232,236 ---- getResource().checkIn(con); } catch (Exception ex) { ! log.logError(ex); } } *************** *** 254,258 **** ((JournalTicket) ticket).getValue(), step)); } catch (Exception e) { ! LogService.getInstance().logError(e); throw new JournalException("[GenericSqlJournal.getDocumentAtTicketStep]", e); --- 257,261 ---- ((JournalTicket) ticket).getValue(), step)); } catch (Exception e) { ! log.logError(e); throw new JournalException("[GenericSqlJournal.getDocumentAtTicketStep]", e); *************** *** 261,265 **** getResource().checkIn(con); } catch (Exception e) { ! LogService.getInstance().logError(e); throw new JournalException("[GenericSqlJournal.getDocumentAtTicketStep]", e); --- 264,268 ---- getResource().checkIn(con); } catch (Exception e) { ! log.logError(e); throw new JournalException("[GenericSqlJournal.getDocumentAtTicketStep]", e); *************** *** 327,331 **** getResource().checkIn(con); } catch (Exception ex) { ! LogService.getInstance().logError(ex); } } --- 330,334 ---- getResource().checkIn(con); } catch (Exception ex) { ! log.logError(ex); } } *************** *** 440,444 **** } } catch (Exception e) { ! LogService.getInstance().logError("[GenericSqlJournal.getNextStep] close", e); } --- 443,447 ---- } } catch (Exception e) { ! log.logError("[GenericSqlJournal.getNextStep] close", e); } *************** *** 675,679 **** } } catch (Exception se) { ! LogService.getInstance().logError(se); } finally { try { --- 678,682 ---- } } catch (Exception se) { ! log.logError(se); } finally { try { *************** *** 684,688 **** getResource().checkIn(con); } catch (Exception se) { ! LogService.getInstance().logError(I18n.get("sql.403"), se); } } --- 687,691 ---- getResource().checkIn(con); } catch (Exception se) { ! log.logError(I18n.get("sql.403"), se); } } *************** *** 743,747 **** } } catch (Exception e) { ! LogService.getInstance().logError(I18n.get("sql.403"), e); } } --- 746,750 ---- } } catch (Exception e) { ! log.logError(I18n.get("sql.403"), e); } } *************** *** 785,789 **** } } catch (Exception e) { ! LogService.getInstance().logError(e); throw new SQLException(e.toString()); } finally { --- 788,792 ---- } } catch (Exception e) { ! log.logError(e); throw new SQLException(e.toString()); } finally { *************** *** 793,797 **** } } catch (Exception e) { ! LogService.getInstance().logError(I18n.get("sql.403"), e); } } --- 796,800 ---- } } catch (Exception e) { ! log.logError(I18n.get("sql.403"), e); } } |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:04
|
Update of /cvsroot/babeldoc/babeldoc/modules/web/src/com/babeldoc/web/context In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/web/src/com/babeldoc/web/context Modified Files: PipelineListingContext.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: PipelineListingContext.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/web/src/com/babeldoc/web/context/PipelineListingContext.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PipelineListingContext.java 12 Aug 2003 23:44:45 -0000 1.5 --- PipelineListingContext.java 24 Jul 2004 00:18:54 -0000 1.6 *************** *** 66,69 **** --- 66,70 ---- package com.babeldoc.web.context; + import com.babeldoc.core.LogService; import com.babeldoc.core.pipeline.*; import com.babeldoc.core.option.IConfigData; *************** *** 163,173 **** try { IPipelineStageFactory pstageFactory = PipelineFactoryFactory.getPipelineStageFactory(pipeline); ! com.babeldoc.core.LogService.getInstance().logDebug("Object: " + ! pstageFactory); return PipelineFactoryFactory.getPipelineStageFactory(pipeline) .getEntryStageName(); } catch (PipelineException pipex) { ! com.babeldoc.core.LogService.getInstance().logError(pipex); } --- 164,173 ---- try { IPipelineStageFactory pstageFactory = PipelineFactoryFactory.getPipelineStageFactory(pipeline); ! LogService.getInstance().logDebug("Object: " + pstageFactory); return PipelineFactoryFactory.getPipelineStageFactory(pipeline) .getEntryStageName(); } catch (PipelineException pipex) { ! LogService.getInstance().logError(pipex); } |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:03
|
Update of /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/pipeline/stage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/sql/src/com/babeldoc/sql/pipeline/stage Modified Files: SqlEnrichPipelineStage.java SqlQueryPipelineStage.java SqlWriterPipelineStage.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: SqlWriterPipelineStage.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/pipeline/stage/SqlWriterPipelineStage.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** SqlWriterPipelineStage.java 15 Aug 2003 00:25:30 -0000 1.15 --- SqlWriterPipelineStage.java 24 Jul 2004 00:18:54 -0000 1.16 *************** *** 109,112 **** --- 109,115 ---- private boolean batchSupported = false; private int batchSize = 20; + + /** logging instance */ + private LogService log = LogService.getInstance(this.getClass().getName()); /** *************** *** 243,253 **** //excute statement String command = br.readLine(); ! LogService.getInstance().logDebug("Current line= " + command); if (command == null) { if (batchSupported && (currentBatchSize > 0)) { stmt.executeBatch(); ! LogService.getInstance().logDebug("Executed " + currentBatchSize + ! " statements in batch"); } --- 246,258 ---- //excute statement String command = br.readLine(); ! if(log.isDebugEnabled()) ! log.logDebug("Current line= " + command); if (command == null) { if (batchSupported && (currentBatchSize > 0)) { stmt.executeBatch(); ! if(log.isDebugEnabled()) ! log.logDebug("Executed " + currentBatchSize + ! " statements in batch"); } *************** *** 284,299 **** if (batchSupported) { stmt.addBatch(command); ! LogService.getInstance().logDebug("LightConfigCommand " + command + ! " added to batch list"); currentBatchSize++; if (currentBatchSize == batchSize) { stmt.executeBatch(); ! LogService.getInstance().logDebug("Executed " + ! currentBatchSize + " statements in batch"); } } else { ! LogService.getInstance().logDebug("Executing statement: " + ! command); stmt.execute(command); } --- 289,306 ---- if (batchSupported) { stmt.addBatch(command); ! if(log.isDebugEnabled()) ! log.logDebug("LightConfigCommand " + command + ! " added to batch list"); currentBatchSize++; if (currentBatchSize == batchSize) { stmt.executeBatch(); ! if(log.isDebugEnabled()) ! log.logDebug("Executed " + ! currentBatchSize + " statements in batch"); } } else { ! if(log.isDebugEnabled()) ! log.logDebug("Executing statement: " + command); stmt.execute(command); } *************** *** 313,317 **** } ! LogService.getInstance().logWarn(I18n.get("sql.196", currentMessage)); if (failOnFirst) { --- 320,324 ---- } ! log.logWarn(I18n.get("sql.196", currentMessage)); if (failOnFirst) { *************** *** 332,336 **** if (shouldCommit) { conn.commit(); ! LogService.getInstance().logDebug("committed"); } else { conn.rollback(); --- 339,344 ---- if (shouldCommit) { conn.commit(); ! if(log.isDebugEnabled()) ! log.logDebug("committed"); } else { conn.rollback(); *************** *** 342,346 **** return shouldCommit; } catch (SQLException ex) { ! LogService.getInstance().logError(I18n.get("sql.197"), ex); throw new PipelineException(I18n.get("sql.198"), ex); } finally { --- 350,354 ---- return shouldCommit; } catch (SQLException ex) { ! log.logError(I18n.get("sql.197"), ex); throw new PipelineException(I18n.get("sql.198"), ex); } finally { Index: SqlQueryPipelineStage.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/pipeline/stage/SqlQueryPipelineStage.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SqlQueryPipelineStage.java 23 Oct 2003 00:20:05 -0000 1.6 --- SqlQueryPipelineStage.java 24 Jul 2004 00:18:54 -0000 1.7 *************** *** 198,202 **** sql = queries[i].getValue(); stmt = conn.createStatement(); ! LogService.getInstance().logDebug("Executing " + sql); rs = stmt.executeQuery(sql); handleRows(rs, queryElement); --- 198,203 ---- sql = queries[i].getValue(); stmt = conn.createStatement(); ! if(LogService.getInstance().isDebugEnabled()) ! LogService.getInstance().logDebug("Executing " + sql); rs = stmt.executeQuery(sql); handleRows(rs, queryElement); Index: SqlEnrichPipelineStage.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/pipeline/stage/SqlEnrichPipelineStage.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** SqlEnrichPipelineStage.java 15 Aug 2003 21:19:57 -0000 1.16 --- SqlEnrichPipelineStage.java 24 Jul 2004 00:18:54 -0000 1.17 *************** *** 110,113 **** --- 110,116 ---- //Connection pool private IResource resource = null; + + /** logging instance */ + private LogService log = LogService.getInstance(this.getClass().getName()); /** *************** *** 168,172 **** conn = getConnection(); stmt = conn.createStatement(); ! LogService.getInstance().logDebug("Executing statement: " + sqlStatement); rs = stmt.executeQuery(sqlStatement); --- 171,176 ---- conn = getConnection(); stmt = conn.createStatement(); ! if(log.isDebugEnabled()) ! log.logDebug("Executing statement: " + sqlStatement); rs = stmt.executeQuery(sqlStatement); *************** *** 253,258 **** getDocument().put(name, value); ! LogService.getInstance().logDebug("Adding new attribute: " + name + ! "=" + value); } } --- 257,263 ---- getDocument().put(name, value); ! if(log.isDebugEnabled()) ! log.logDebug("Adding new attribute: " + name + ! "=" + value); } } *************** *** 279,284 **** getDocument().put(varname, value); ! LogService.getInstance().logDebug("Adding new attribute: " + varname + ! "=" + value); } } --- 284,290 ---- getDocument().put(varname, value); ! if(log.isDebugEnabled()) ! log.logDebug("Adding new attribute: " + varname + ! "=" + value); } } *************** *** 326,330 **** conn = getConnection(); stmt = conn.createStatement(); ! LogService.getInstance().logDebug("Executing " + sqlStatement); rs = stmt.executeQuery(sqlStatement); result = null; --- 332,337 ---- conn = getConnection(); stmt = conn.createStatement(); ! if(log.isDebugEnabled()) ! log.logDebug("Executing " + sqlStatement); rs = stmt.executeQuery(sqlStatement); result = null; |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:03
|
Update of /cvsroot/babeldoc/babeldoc/modules/web/src/com/babeldoc/web/pipeline/servlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/web/src/com/babeldoc/web/pipeline/servlet Modified Files: HttpPostPipelineFeeder.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: HttpPostPipelineFeeder.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/web/src/com/babeldoc/web/pipeline/servlet/HttpPostPipelineFeeder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** HttpPostPipelineFeeder.java 27 Jun 2003 02:09:21 -0000 1.5 --- HttpPostPipelineFeeder.java 24 Jul 2004 00:18:54 -0000 1.6 *************** *** 100,103 **** --- 100,106 ---- public static final String BOTTOM_FORM = "bottom-form.html"; + /** logging for this class */ + private LogService log = LogService.getInstance(this.getClass().getName()); + /** * doGet - this is illegal - must only accept posts. *************** *** 139,143 **** //debugHeader(request); String pipeline = getPipeline(request); ! LogService.getInstance().logDebug("pipeline: " + pipeline); if (pipeline != null) { --- 142,147 ---- //debugHeader(request); String pipeline = getPipeline(request); ! if(log.isDebugEnabled()) ! log.logDebug("pipeline: " + pipeline); if (pipeline != null) { *************** *** 147,151 **** if (docbytes == null) { // Error occured ! LogService.getInstance().logError(I18n.get("web.101"), null); } else { IJournalTicket ticket = processPipelineDocument(request, docbytes, --- 151,155 ---- if (docbytes == null) { // Error occured ! log.logError(I18n.get("web.101"), null); } else { IJournalTicket ticket = processPipelineDocument(request, docbytes, *************** *** 156,160 **** } } catch (Exception e) { ! LogService.getInstance().logError(e); response.setContentType("text/html"); response.getWriter().write("<html><body>" + I18n.get("web.102") + --- 160,164 ---- } } catch (Exception e) { ! log.logError(e); response.setContentType("text/html"); response.getWriter().write("<html><body>" + I18n.get("web.102") + *************** *** 162,166 **** } } else { ! LogService.getInstance().logError("[HttpPostPipelineFeeder] " + I18n.get("web.103"), null); response.setContentType("text/html"); --- 166,170 ---- } } else { ! log.logError("[HttpPostPipelineFeeder] " + I18n.get("web.103"), null); response.setContentType("text/html"); *************** *** 215,221 **** */ private void debugHeader(HttpServletRequest request) { ! LogService.getInstance().logDebug("____________________________"); ! LogService.getInstance().logDebug("Received request."); ! LogService.getInstance().logDebug("-----------------------"); // Traverse the HTTP headers and show them on the screen --- 219,224 ---- */ private void debugHeader(HttpServletRequest request) { ! if(log.isDebugEnabled()) ! log.logDebug("----------------\nReceived request\n----------------"); // Traverse the HTTP headers and show them on the screen *************** *** 223,231 **** String header = (String) enum.nextElement(); String value = request.getHeader(header); ! ! LogService.getInstance().logDebug(" " + header + " = " + value); } - - System.out.println("-----------------------"); } --- 226,233 ---- String header = (String) enum.nextElement(); String value = request.getHeader(header); ! ! if(log.isDebugEnabled()) ! log.logDebug(" " + header + " = " + value); } } |
|
From: bruce m. <tr...@us...> - 2004-07-24 00:19:02
|
Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/scanner/src/com/babeldoc/scanner/worker Modified Files: DirectoryScanner.java FtpScanner.java HttpScanner.java Log Message: Logging cleanups... 1. Created log instance variable instead of calling LogService.getInstance(). 2. All logs to debug check if debug level is set. Index: HttpScanner.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker/HttpScanner.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** HttpScanner.java 3 Oct 2003 13:08:40 -0000 1.7 --- HttpScanner.java 24 Jul 2004 00:18:52 -0000 1.8 *************** *** 117,120 **** --- 117,123 ---- public static final int DEFAULT_PROXYPORT = 80; public static final int DEFAULT_TIMEOUT = 15000; + + /** logging for this class */ + private LogService log = LogService.getInstance(this.getClass().getName()); // Instance fields *************** *** 195,199 **** new UsernamePasswordCredentials(user, password)); } catch (MalformedURLException e) { ! LogService.getInstance().logError( I18n.get("scanner.HttpScanner.error.badurl", url), e); --- 198,202 ---- new UsernamePasswordCredentials(user, password)); } catch (MalformedURLException e) { ! log.logError( I18n.get("scanner.HttpScanner.error.badurl", url), e); *************** *** 223,232 **** try { // execute the method. ! LogService.getInstance().logDebug("Scanning: " + url); statusCode = httpClient.executeMethod(method); } catch (HttpRecoverableException e) { ! LogService.getInstance().logWarn( ! I18n.get( ! "scanner.HttpScanner.error.recoverable", e.getMessage())); } catch (IOException e) { --- 226,234 ---- try { // execute the method. ! if(log.isDebugEnabled()) ! log.logDebug("Scanning: " + url); statusCode = httpClient.executeMethod(method); } catch (HttpRecoverableException e) { ! log.logWarn(I18n.get("scanner.HttpScanner.error.recoverable", e.getMessage())); } catch (IOException e) { *************** *** 239,243 **** // Check that we didn't run out of retries. if (statusCode == -1) { ! LogService.getInstance().logError( I18n.get("scanner.HttpScanner.error.failed", url), null); --- 241,245 ---- // Check that we didn't run out of retries. if (statusCode == -1) { ! log.logError( I18n.get("scanner.HttpScanner.error.failed", url), null); Index: DirectoryScanner.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker/DirectoryScanner.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** DirectoryScanner.java 13 Jan 2004 11:50:23 -0000 1.26 --- DirectoryScanner.java 24 Jul 2004 00:18:52 -0000 1.27 *************** *** 99,103 **** public static final String INCLUDE_SUB_DIRS = "includeSubfolders"; public static final String FILTER_FILENAME = "filter"; ! public static final String MINIMUM_FILE_AGE = "minimumFileAge"; /** --- 99,105 ---- public static final String INCLUDE_SUB_DIRS = "includeSubfolders"; public static final String FILTER_FILENAME = "filter"; ! public static final String MINIMUM_FILE_AGE = "minimumFileAge"; ! ! private LogService log = LogService.getInstance(this.getClass().getName()); /** *************** *** 281,285 **** moveFile(files[i]); } catch (Exception ex) { ! LogService.getInstance().logError( "Error getting document from file " + files[i], ex); --- 283,287 ---- moveFile(files[i]); } catch (Exception ex) { ! log.logError( "Error getting document from file " + files[i], ex); *************** *** 345,349 **** return true; } else { ! LogService.getInstance().logDebug( "Ignoring " + file.getName() + " (age " + getFileAge(file) + " < " + getMinimumFileAge() + ")"); --- 347,352 ---- return true; } else { ! if(log.isDebugEnabled()) ! log.logDebug( "Ignoring " + file.getName() + " (age " + getFileAge(file) + " < " + getMinimumFileAge() + ")"); Index: FtpScanner.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker/FtpScanner.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** FtpScanner.java 3 Oct 2003 13:08:40 -0000 1.23 --- FtpScanner.java 24 Jul 2004 00:18:52 -0000 1.24 *************** *** 125,128 **** --- 125,131 ---- private boolean useDefaultParser = true; + /** logging for this class */ + private LogService log = LogService.getInstance(this.getClass().getName()); + public FtpScanner() { super(new FtpScannerInfo()); *************** *** 293,311 **** //check status try { ! LogService.getInstance().logDebug( ! "Checking connection status..."); ftpClient.getStatus(); } catch (Exception e) { //try to reconect ! LogService.getInstance().logDebug("Reconnecting..."); connectToHost(); } baos = new ByteArrayOutputStream(); ! LogService.getInstance().logDebug( ! "Trying to retrieve file " + fileName); boolean success = ftpClient.retrieveFile(fileName, baos); ! LogService.getInstance().logDebug("Retrieved file " + fileName); String scanFileName = fileName.substring(ftpClient.printWorkingDirectory().length()+1); //if file was retrieved without errors feed it! --- 296,315 ---- //check status try { ! if(log.isDebugEnabled()) ! log.logDebug("Checking connection status..."); ftpClient.getStatus(); } catch (Exception e) { //try to reconect ! log.logDebug("Reconnecting..."); connectToHost(); } baos = new ByteArrayOutputStream(); ! if(log.isDebugEnabled()) ! log.logDebug("Trying to retrieve file " + fileName); boolean success = ftpClient.retrieveFile(fileName, baos); ! if(log.isDebugEnabled()) ! log.logDebug("Retrieved file " + fileName); String scanFileName = fileName.substring(ftpClient.printWorkingDirectory().length()+1); //if file was retrieved without errors feed it! *************** *** 454,460 **** //This is where method begins try { ! if (LogService.getInstance().isDebugEnabled()) { ! LogService.getInstance().logDebug( ! "Scanning " + ftpClient.printWorkingDirectory()); } --- 458,464 ---- //This is where method begins try { ! if (log.isDebugEnabled()) { ! if(log.isDebugEnabled()) ! log.logDebug("Scanning " + ftpClient.printWorkingDirectory()); } *************** *** 505,509 **** String path = ftpClient.printWorkingDirectory(); path = path + "/" + ftpFiles[i].getName(); ! LogService.getInstance().logDebug("found " + path); processFile(path); } --- 509,514 ---- String path = ftpClient.printWorkingDirectory(); path = path + "/" + ftpFiles[i].getName(); ! if(log.isDebugEnabled()) ! log.logDebug("found " + path); processFile(path); } |
2 messages has been excluded from this view by a project administrator.
