babeldoc-devel — Babeldoc developer list

[Babeldoc-devel] babeldoc/modules/crypto .cvsignore,NONE,1.1 build.xml,1.8,1.9

[Vincent H. <vh...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/crypto
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21336/modules/crypto

Modified Files:
	build.xml 
Added Files:
	.cvsignore 
Log Message:
.cvsignore to avoid CVS diff
build change to use ant from eclipse
compatibility Java 5.0

--- NEW FILE: .cvsignore ---
build

Index: build.xml
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/crypto/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** build.xml	27 Jun 2003 02:43:18 -0000	1.8
--- build.xml	10 Mar 2006 13:07:43 -0000	1.9
***************
*** 25,29 ****
  		  <classpath>
  				<fileset dir="${base_dir}/build/lib">
! 				  <include name="*"/>
  			  </fileset>
  			  <pathelement location="${base_dir}/support/ant/lib/junit.jar"/>
--- 25,29 ----
  		  <classpath>
  				<fileset dir="${base_dir}/build/lib">
! 				  <include name="*.jar"/>
  			  </fileset>
  			  <pathelement location="${base_dir}/support/ant/lib/junit.jar"/>

[Babeldoc-devel] babeldoc/modules/core .cvsignore,NONE,1.1 build.xml,1.12,1.13

[Vincent H. <vh...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21336/modules/core

Modified Files:
	build.xml 
Added Files:
	.cvsignore 
Log Message:
.cvsignore to avoid CVS diff
build change to use ant from eclipse
compatibility Java 5.0

--- NEW FILE: .cvsignore ---
build

Index: build.xml
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** build.xml	12 Sep 2003 00:44:09 -0000	1.12
--- build.xml	10 Mar 2006 13:07:41 -0000	1.13
***************
*** 25,29 ****
  		  <classpath>
  			  <fileset dir="lib">
! 				  <include name="*"/>
  			  </fileset>
  			  <pathelement location="${base_dir}/support/ant/lib/junit.jar"/>
--- 25,29 ----
  		  <classpath>
  			  <fileset dir="lib">
! 				  <include name="*.jar"/>
  			  </fileset>
  			  <pathelement location="${base_dir}/support/ant/lib/junit.jar"/>

[Babeldoc-devel] babeldoc/modules/babelfish .cvsignore,NONE,1.1

[Vincent H. <vh...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/babelfish
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21336/modules/babelfish

Added Files:
	.cvsignore 
Log Message:
.cvsignore to avoid CVS diff
build change to use ant from eclipse
compatibility Java 5.0

--- NEW FILE: .cvsignore ---
build

[Babeldoc-devel] babeldoc/modules/conversion .cvsignore,NONE,1.1 build.xml,1.9,1.10

[Vincent H. <vh...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/conversion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21336/modules/conversion

Modified Files:
	build.xml 
Added Files:
	.cvsignore 
Log Message:
.cvsignore to avoid CVS diff
build change to use ant from eclipse
compatibility Java 5.0

--- NEW FILE: .cvsignore ---
build

Index: build.xml
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** build.xml	17 Jul 2003 14:49:45 -0000	1.9
--- build.xml	10 Mar 2006 13:07:41 -0000	1.10
***************
*** 25,32 ****
  		  <classpath>
  				<fileset dir="${base_dir}/build/lib">
! 				  <include name="*"/>
  			  </fileset>
  			  <fileset dir="lib">
! 				  <include name="*"/>
  			  	</fileset>
  			  <pathelement location="${base_dir}/support/ant/lib/junit.jar"/>
--- 25,32 ----
  		  <classpath>
  				<fileset dir="${base_dir}/build/lib">
! 				  <include name="*.jar"/>
  			  </fileset>
  			  <fileset dir="lib">
! 				  <include name="*.jar"/>
  			  	</fileset>
  			  <pathelement location="${base_dir}/support/ant/lib/junit.jar"/>

[Babeldoc-devel] babeldoc/modules/soap/src/com/babeldoc/soap/pipeline/servlet SoapPipelineFeeder.java,1.10,1.11

[Vincent H. <vh...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/soap/src/com/babeldoc/soap/pipeline/servlet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11451/modules/soap/src/com/babeldoc/soap/pipeline/servlet

Modified Files:
	SoapPipelineFeeder.java 
Log Message:
Java 5 compilation

Index: SoapPipelineFeeder.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/soap/src/com/babeldoc/soap/pipeline/servlet/SoapPipelineFeeder.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SoapPipelineFeeder.java	10 Mar 2006 12:57:12 -0000	1.10
--- SoapPipelineFeeder.java	10 Mar 2006 12:58:06 -0000	1.11
***************
*** 205,213 ****
  
    static MimeHeaders getHeaders(HttpServletRequest req) {
!     Enumeration enum = req.getHeaderNames();
      MimeHeaders headers = new MimeHeaders();
  
!     while (enum.hasMoreElements()) {
!       String headerName = (String) enum.nextElement();
        String headerValue = req.getHeader(headerName);
  
--- 205,213 ----
  
    static MimeHeaders getHeaders(HttpServletRequest req) {
!     Enumeration en = req.getHeaderNames();
      MimeHeaders headers = new MimeHeaders();
  
!     while (en.hasMoreElements()) {
!       String headerName = (String) en.nextElement();
        String headerValue = req.getHeader(headerName);
  

[Babeldoc-devel] babeldoc/modules/soap/src/com/babeldoc/soap/pipeline/servlet SoapPipelineFeeder.java,1.9,1.10

[Vincent H. <vh...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/soap/src/com/babeldoc/soap/pipeline/servlet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11012/modules/soap/src/com/babeldoc/soap/pipeline/servlet

Modified Files:
	SoapPipelineFeeder.java 
Log Message:
Java 5 compilation

Index: SoapPipelineFeeder.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/soap/src/com/babeldoc/soap/pipeline/servlet/SoapPipelineFeeder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SoapPipelineFeeder.java	24 Jul 2004 00:18:53 -0000	1.9
--- SoapPipelineFeeder.java	10 Mar 2006 12:57:12 -0000	1.10
***************
*** 281,286 ****
  
      // Traverse the HTTP headers and show them on the screen
!     for (Enumeration enum = request.getHeaderNames(); enum.hasMoreElements();) {
!       String header = (String) enum.nextElement();
        String value = request.getHeader(header);
  
--- 281,286 ----
  
      // Traverse the HTTP headers and show them on the screen
!     for (Enumeration en = request.getHeaderNames(); en.hasMoreElements();) {
!       String header = (String) en.nextElement();
        String value = request.getHeader(header);
  

[Babeldoc-devel] babeldoc/modules/gui/src/com/babeldoc/gui/journal/browser JournalTree.java,1.5,1.6

[Vincent H. <vh...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/journal/browser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8428/modules/gui/src/com/babeldoc/gui/journal/browser

Modified Files:
	JournalTree.java 
Log Message:
Java 5 compilation

Index: JournalTree.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/journal/browser/JournalTree.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JournalTree.java	20 Dec 2004 18:02:51 -0000	1.5
--- JournalTree.java	10 Mar 2006 12:54:15 -0000	1.6
***************
*** 241,247 ****
  					// any children are in journalUpdate state, use journal color
  					JournalTreeTicketStep step = null;
! 					Enumeration enum = node.children();
! 					while (enum.hasMoreElements()) {
! 						DefaultMutableTreeNode elem = (DefaultMutableTreeNode)enum.nextElement();
  						if (elem.getUserObject() instanceof JournalTreeTicketStep) {
  							JournalTreeTicketStep tStep = (JournalTreeTicketStep)elem.getUserObject();
--- 241,247 ----
  					// any children are in journalUpdate state, use journal color
  					JournalTreeTicketStep step = null;
! 					Enumeration en = node.children();
! 					while (en.hasMoreElements()) {
! 						DefaultMutableTreeNode elem = (DefaultMutableTreeNode)en.nextElement();
  						if (elem.getUserObject() instanceof JournalTreeTicketStep) {
  							JournalTreeTicketStep tStep = (JournalTreeTicketStep)elem.getUserObject();

[Babeldoc-devel] babeldoc/modules/web/src/com/babeldoc/web/pipeline/servlet HttpPostPipelineFeeder.java,1.6,1.7

[Vincent H. <vh...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/web/src/com/babeldoc/web/pipeline/servlet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4623/modules/web/src/com/babeldoc/web/pipeline/servlet

Modified Files:
	HttpPostPipelineFeeder.java 
Log Message:
Java 5 compilation

Index: HttpPostPipelineFeeder.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/web/src/com/babeldoc/web/pipeline/servlet/HttpPostPipelineFeeder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** HttpPostPipelineFeeder.java	24 Jul 2004 00:18:54 -0000	1.6
--- HttpPostPipelineFeeder.java	10 Mar 2006 12:49:41 -0000	1.7
***************
*** 223,228 ****
  
      // Traverse the HTTP headers and show them on the screen
!     for (Enumeration enum = request.getHeaderNames(); enum.hasMoreElements();) {
!       String header = (String) enum.nextElement();
        String value = request.getHeader(header);
  	
--- 223,228 ----
  
      // Traverse the HTTP headers and show them on the screen
!     for (Enumeration en = request.getHeaderNames(); en.hasMoreElements();) {
!       String header = (String) en.nextElement();
        String value = request.getHeader(header);
  	

[Babeldoc-devel] babeldoc/.settings org.eclipse.jdt.ui.prefs,NONE,1.1 org.eclipse.jdt.core.prefs,NONE,1.1

[Vincent H. <vh...@us...>]

Update of /cvsroot/babeldoc/babeldoc/.settings
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29774/.settings

Added Files:
	org.eclipse.jdt.ui.prefs org.eclipse.jdt.core.prefs 
Log Message:
Eclipse setup

--- NEW FILE: org.eclipse.jdt.core.prefs ---
#Fri Mar 10 13:33:22 CET 2006
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
org.eclipse.jdt.core.compiler.problem.suppressWarnings=disabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
org.eclipse.jdt.core.compiler.source=1.3

--- NEW FILE: org.eclipse.jdt.ui.prefs ---
#Fri Mar 10 13:33:22 CET 2006
eclipse.preferences.version=1
internal.default.compliance=default

[Babeldoc-devel] babeldoc .cvsignore,NONE,1.1 .classpath,NONE,1.1 .project,NONE,1.1

[Vincent H. <vh...@us...>]

Update of /cvsroot/babeldoc/babeldoc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29774

Added Files:
	.cvsignore .classpath .project 
Log Message:
Eclipse setup

--- NEW FILE: .cvsignore ---
bin

--- NEW FILE: .project ---
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>babeldoc</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.jdt.core.javabuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>

--- NEW FILE: .classpath ---
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="modules/core/src"/>
	<classpathentry kind="src" path="modules/conversion/src"/>
	<classpathentry kind="src" path="modules/crypto/src"/>
	<classpathentry kind="src" path="modules/gui/src"/>
	<classpathentry kind="src" path="modules/init/src"/>
	<classpathentry kind="src" path="modules/j2ee/src"/>
	<classpathentry kind="src" path="modules/scanner/src"/>
	<classpathentry kind="src" path="modules/soap/src"/>
	<classpathentry kind="src" path="modules/sql/src"/>
	<classpathentry kind="src" path="modules/web/src"/>
	<classpathentry kind="src" path="modules/xslfo/src"/>
	<classpathentry kind="src" path="support/src"/>
	<classpathentry kind="src" path="modules/babelfish/src"/>
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
	<classpathentry kind="lib" path="modules/core/lib/commons-cli.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/log4j.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/avalon-framework.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/commons-lang.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/commons-logging.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/velocity.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/commons-collections.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/xerces.jar"/>
	<classpathentry kind="lib" path="support/ant/lib/junit.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/csv19.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/commons-discovery.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/activation.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/ostermiller-utils.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/commons-pool.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/concurrent.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/dom4j-full.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/commons-net.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/commons-digester.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/JTidy.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/mail.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/bsf.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/xml-apis.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/xmlsec.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/commons-beanutils.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/commons-dbcp.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/commons-httpclient.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/docbook-xalan.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/js.jar"/>
	<classpathentry kind="lib" path="modules/core/lib/xalan.jar"/>
	<classpathentry kind="lib" path="modules/web/lib/servlet.jar"/>
	<classpathentry kind="lib" path="modules/conversion/lib/poi.jar"/>
	<classpathentry kind="lib" path="modules/j2ee/lib/j2ee.jar"/>
	<classpathentry kind="lib" path="modules/soap/lib/jaxm-api.jar"/>
	<classpathentry kind="lib" path="modules/soap/lib/saaj-api.jar"/>
	<classpathentry kind="lib" path="modules/sql/lib/classes12.jar"/>
	<classpathentry kind="lib" path="modules/xslfo/lib/batik.jar"/>
	<classpathentry kind="lib" path="modules/xslfo/lib/fop.jar"/>
	<classpathentry kind="lib" path="support/ant/lib/ant.jar"/>
	<classpathentry kind="output" path="bin"/>
</classpath>

[Babeldoc-devel] babeldoc/.settings - New directory

[Vincent H. <vh...@us...>]

Update of /cvsroot/babeldoc/babeldoc/.settings
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29706/.settings

Log Message:
Directory /cvsroot/babeldoc/babeldoc/.settings added to the repository

[Babeldoc-devel] babeldoc/modules/j2ee/src/com/babeldoc/j2ee/scanner/worker JmsScanner.java,1.3,1.4

[Vincent H. <vh...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/j2ee/src/com/babeldoc/j2ee/scanner/worker
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28806/modules/j2ee/src/com/babeldoc/j2ee/scanner/worker

Modified Files:
	JmsScanner.java 
Log Message:
Java 5 compilation

Index: JmsScanner.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/j2ee/src/com/babeldoc/j2ee/scanner/worker/JmsScanner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JmsScanner.java	17 Sep 2003 17:07:15 -0000	1.3
--- JmsScanner.java	10 Mar 2006 12:39:23 -0000	1.4
***************
*** 76,79 ****
--- 76,80 ----
  
  import javax.jms.*;
+ import javax.jms.Queue;
  import javax.naming.Context;
  import javax.naming.InitialContext;

[Babeldoc-devel] JournalCommand bug fixed

[Albert A. <ap...@em...>]

Method getDate(String arg) had the following bugs:
- incorrect parsing of argument string
- returned date was offset by 1 month

ciao
apa


*** JournalCommand.java	Fri Nov 18 14:03:59 2005
--- modules/core/src/com/babeldoc/core/journal/command/JournalCommand.java	=
Fri Nov 18 14:01:51 2005
***************
*** 59,63 ****
   * Babeldoc:  The Universal Document Processor
   *
!  * $Header: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core=
/journal/command/JournalCommand.java,v 1.8 2004/07/30 01:33:00 triphop Exp $
   * $DateTime$
   * $Author: triphop $
--- 59,63 ----
   * Babeldoc:  The Universal Document Processor
   *
!  * $Header: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core=
/journal/command/JournalCommand.java,v 1.6 2003/09/16 05:19:00 triphop Exp $
   * $DateTime$
   * $Author: triphop $
***************
*** 66,70 ****
  package com.babeldoc.core.journal.command;
=20=20
- import com.babeldoc.core.BabeldocCommand;
  import com.babeldoc.core.I18n;
  import com.babeldoc.core.LogService;
--- 66,69 ----
***************
*** 76,80 ****
  import com.babeldoc.core.journal.query.QueryOption;
  import com.babeldoc.core.journal.query.QueryTicket;
- import com.babeldoc.core.pipeline.PipelineDocument;
  import com.mindprod.csv.CSVWriter;
=20=20
--- 75,78 ----
***************
*** 101,120 ****
   * @version 1.0
   */
! public class JournalCommand extends BabeldocCommand {
!   /** constants:  display xml. */
    private static final int XML_DISP =3D 1;
=20=20
!   /** constants:  display csv. */
    private static final int CSV_DISP =3D 2;
=20=20
!   /** instance:  display mode. */
    private int dispMode =3D 0;
-=20=20=20
-   private LogService log =3D LogService.getInstance(this.getClass().getNa=
me());
=20=20
    /**
!    * process the commandline arguments.
     *
!    * @param args command line arguments.
     */
    public JournalCommand(String[] args) {
--- 99,116 ----
   * @version 1.0
   */
! public class JournalCommand extends com.babeldoc.core.BabeldocCommand {
!   /** constants:  display xml */
    private static final int XML_DISP =3D 1;
=20=20
!   /** constants:  display csv */
    private static final int CSV_DISP =3D 2;
=20=20
!   /** instance:  display mode */
    private int dispMode =3D 0;
=20=20
    /**
!    * process the commandline arguments
     *
!    * @param args
     */
    public JournalCommand(String[] args) {
***************
*** 123,127 ****
=20=20
    /**
!    * handle displaying of a document.
     *
     * @param cmdLine the command line
--- 119,123 ----
=20=20
    /**
!    * handle displaying of a document
     *
     * @param cmdLine the command line
***************
*** 139,144 ****
=20=20
      try {
!       PipelineDocument doc =3D JournalFactory.
!       		getJournal().getDocumentAtTicketStep(ticket, step);
=20=20
        if (doc !=3D null) {
--- 135,141 ----
=20=20
      try {
!       com.babeldoc.core.pipeline.PipelineDocument doc =3D JournalFactory.=
getJournal()
!                                                                       .ge=
tDocumentAtTicketStep(ticket,
!           step);
=20=20
        if (doc !=3D null) {
***************
*** 151,158 ****
          }
        } else {
!         log.logWarn(I18n.get("012004"));
        }
      } catch (Exception e) {
!       log.logWarn(I18n.get("000051", e));
      }
=20=20
--- 148,155 ----
          }
        } else {
!         System.out.println(com.babeldoc.core.I18n.get("012004"));
        }
      } catch (Exception e) {
!       System.err.println(I18n.get("000051", e));
      }
=20=20
***************
*** 161,165 ****
=20=20
    /**
!    * Listing ticket information.
     *
     * @param cmdLine the command line
--- 158,162 ----
=20=20
    /**
!    * Listing ticket information
     *
     * @param cmdLine the command line
***************
*** 189,193 ****
          max =3D Integer.parseInt(cmdLine.getOptionValue('n'));
        } catch (Exception e) {
!         log.logError(I18n.get("012002"), e);
        }
      }
--- 186,191 ----
          max =3D Integer.parseInt(cmdLine.getOptionValue('n'));
        } catch (Exception e) {
!         com.babeldoc.core.LogService.getInstance().logError(I18n.get("012=
002"),
!           null);
        }
      }
***************
*** 197,201 ****
          index =3D Integer.parseInt(cmdLine.getOptionValue('i'));
        } catch (Exception e) {
!         LogService.getInstance().logError(I18n.get("012003"),
            null);
        }
--- 195,199 ----
          index =3D Integer.parseInt(cmdLine.getOptionValue('i'));
        } catch (Exception e) {
!         com.babeldoc.core.LogService.getInstance().logError(I18n.get("012=
003"),
            null);
        }
***************
*** 229,233 ****
        renderQueryTickets(qts);
      } catch (Exception e) {
!       log.logWarn(I18n.get("000051", e));
      }
=20=20
--- 227,231 ----
        renderQueryTickets(qts);
      } catch (Exception e) {
!       System.err.println(com.babeldoc.core.I18n.get("000051", e));
      }
=20=20
***************
*** 236,240 ****
=20=20
    /**
!    * handle replaying of a ticket.
     *
     * @param cmdLine the command line
--- 234,238 ----
=20=20
    /**
!    * handle replaying of a ticket
     *
     * @param cmdLine the command line
***************
*** 254,258 ****
        JournalFactory.getJournal().replayTicket(ticket, step);
      } catch (Exception e) {
!       log.logWarn(I18n.get("000051", e));
      }
=20=20
--- 252,256 ----
        JournalFactory.getJournal().replayTicket(ticket, step);
      } catch (Exception e) {
!       System.err.println(I18n.get("000051", e));
      }
=20=20
***************
*** 261,265 ****
=20=20
    /**
!    * handle listing the steps for a ticket.
     *
     * @param cmdLine the command line
--- 259,263 ----
=20=20
    /**
!    * handle listing the steps for a ticket
     *
     * @param cmdLine the command line
***************
*** 278,282 ****
        renderQueryTickets(qts);
      } catch (Exception e) {
! 			log.logWarn(I18n.get("000051", e));
      }
=20=20
--- 276,280 ----
        renderQueryTickets(qts);
      } catch (Exception e) {
!       System.err.println(I18n.get("000051", e));
      }
=20=20
***************
*** 285,291 ****
=20=20
    /**
!    * Execute the command line.
     *
!    * @param commandLine command line
     */
    public void execute(CommandLine commandLine) {
--- 283,289 ----
=20=20
    /**
!    * Execute the command line
     *
!    * @param commandLine
     */
    public void execute(CommandLine commandLine) {
***************
*** 304,310 ****
=20=20
    /**
!    * Main routine.
     *
!    * @param args commandline.
     */
    public static void main(String[] args) {
--- 302,308 ----
=20=20
    /**
!    * Main routine
     *
!    * @param args
     */
    public static void main(String[] args) {
***************
*** 358,362 ****
=20=20
    /**
!    * Convert a string date into a java date.
     *
     * @param arg the date string
--- 356,360 ----
=20=20
    /**
!    * Convert a string date into a java date
     *
     * @param arg the date string
***************
*** 366,378 ****
    protected Date getDate(String arg) {
      if (arg.length() =3D=3D "CCYYMMDDhhmmss".length()) {
!       int YY =3D Integer.parseInt(arg.substring(0, 3));
!       int MM =3D Integer.parseInt(arg.substring(4, 5));
!       int DD =3D Integer.parseInt(arg.substring(6, 7));
!       int hh =3D Integer.parseInt(arg.substring(8, 9));
!       int mm =3D Integer.parseInt(arg.substring(10, 11));
!       int ss =3D Integer.parseInt(arg.substring(12, 13));
!=20
        Calendar cal =3D Calendar.getInstance();
!       cal.set(YY, MM, DD, hh, mm, ss);
=20=20
        return cal.getTime();
--- 364,376 ----
    protected Date getDate(String arg) {
      if (arg.length() =3D=3D "CCYYMMDDhhmmss".length()) {
!       int YY =3D Integer.parseInt(arg.substring(0, 4));
!       int MM =3D Integer.parseInt(arg.substring(4, 6));
!       int DD =3D Integer.parseInt(arg.substring(6, 8));
!       int hh =3D Integer.parseInt(arg.substring(8, 10));
!       int mm =3D Integer.parseInt(arg.substring(10, 12));
!       int ss =3D Integer.parseInt(arg.substring(12, 14));
        Calendar cal =3D Calendar.getInstance();
!       //Month parameter of cal expects 0 based month value (Jan =3D 0)
!       cal.set(YY, MM-1, DD, hh, mm, ss);
=20=20
        return cal.getTime();
***************
*** 383,387 ****
=20=20
    /**
!    * Determine if the argument at the position is a valid display mode mo=
difier.
     *
     * @param commandline the command line
--- 381,385 ----
=20=20
    /**
!    * Determine if the argument at the position is a valid display mode mo=
difier
     *
     * @param commandline the command line
***************
*** 400,404 ****
=20=20
    /**
!    * Query the journal and render the results.
     *
     * @param qts The tickets to query
--- 398,402 ----
=20=20
    /**
!    * Query the journal and render the results
     *
     * @param qts The tickets to query
***************
*** 457,459 ****
    }
  }
-=20
--- 455,456 ----


--=20
___________________________________________________
Play 100s of games for FREE! http://games.mail.com/

RE: [Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner/worker FtpScanner.java,1.24,1.25

[McDonald, B. <Bru...@ba...>]

Thanks Mike!

-----Original Message-----
From: bab...@li...
[mailto:bab...@li...] On Behalf Of Michael
Ansley
Sent: Sunday, November 06, 2005 8:52 PM
To: bab...@li...
Subject: [Babeldoc-devel]
babeldoc/modules/scanner/src/com/babeldoc/scanner/worker
FtpScanner.java,1.24,1.25

Update of
/cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/work
er
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8501/modules/scanner/src/com/ba
beldoc/scanner/worker

Modified Files:
	FtpScanner.java 
Log Message:
Patch provided by Albert Apolloner <ap...@em...> to fix the
following
issues:
1) If includeSubfolder=true the scanner only walked down the first line
of the directory tree
2) A permanent connect/disconnect activity (> 1/sec) despite the period
property was set to 60000ms
3) Problem with FTP server timeouts



Index: FtpScanner.java
===================================================================
RCS file:
/cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/work
er/FtpScanner.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** FtpScanner.java	24 Jul 2004 00:18:52 -0000	1.24
--- FtpScanner.java	7 Nov 2005 01:51:33 -0000	1.25
***************
*** 110,113 ****
--- 110,114 ----
  	public static final String SCAN_SUBFOLDERS =
"includeSubfolders";
  	public static final String FILTER_FILENAME = "filter";
+ 	public static final String MAX_DEPTH = "maxDepth";
  
  	//private final static int rertyCount = 3;
***************
*** 118,122 ****
  	private String ftpPassword = "";
  	private String ftpUsername = "";
!   private int ftpFileType = FTPClient.ASCII_FILE_TYPE;
  	private String localBackupFolder = "";
  	private boolean scanSubfolders = false;
--- 119,125 ----
  	private String ftpPassword = "";
  	private String ftpUsername = "";
!   	private int ftpFileType = FTPClient.ASCII_FILE_TYPE;
! 	private int maxDepth = 0;
! 	private int curDepth = 0;
  	private String localBackupFolder = "";
  	private boolean scanSubfolders = false;
***************
*** 191,194 ****
--- 194,198 ----
 
.equalsIgnoreCase(this.getInfo().getStrValue(SCAN_SUBFOLDERS)))) {
  			scanSubfolders = true;
+ 			maxDepth =
Integer.parseInt(this.getInfo().getStrValue(MAX_DEPTH));
  		}
  
***************
*** 238,249 ****
  				if (ftpClient.login(ftpUsername,
ftpPassword)) {
  					if
(ftpClient.changeWorkingDirectory(ftpFolder)) {
!             if(ftpClient.setFileType(ftpFileType)) {
!               //
!             } else {
!               ftpClient.disconnect();
!               throw new ScannerException(
!                 I18n.get("scanner.FtpScanner.error.filetype"));
!             }
!           } else {
  						ftpClient.disconnect();
  						throw new
ScannerException(
--- 242,253 ----
  				if (ftpClient.login(ftpUsername,
ftpPassword)) {
  					if
(ftpClient.changeWorkingDirectory(ftpFolder)) {
!
if(ftpClient.setFileType(ftpFileType)) {
!               					//
!             					} else {
!
ftpClient.disconnect();
!               						throw
new ScannerException(
!
I18n.get("scanner.FtpScanner.error.filetype"));
!             					}
!           				} else {
  						ftpClient.disconnect();
  						throw new
ScannerException(
***************
*** 462,474 ****
  					log.logDebug("Scanning " +
ftpClient.printWorkingDirectory());
  			}
! 
! 			if ((ftpClient.getReplyCode() ==
FTPReply.CLOSING_DATA_CONNECTION)
! 				|| (ftpClient.getReplyCode() ==
FTPReply.SERVICE_NOT_AVAILABLE)) {
! 				ftpClient.disconnect();
! 				connectToHost();
! 			}
  
  			//first change working dir!
  			ftpClient.changeWorkingDirectory(folder);
  
  			FTPFile[] ftpFiles = null;
--- 466,481 ----
  					log.logDebug("Scanning " +
ftpClient.printWorkingDirectory());
  			}
! 			
! 			/* the following code creates unnecessary
reconnects - if you think it is necessary uncoment it
! 			*  if ((ftpClient.getReplyCode() ==
FTPReply.CLOSING_DATA_CONNECTION)
! 			*	|| (ftpClient.getReplyCode() ==
FTPReply.SERVICE_NOT_AVAILABLE)) {
! 			*	//ftpClient.disconnect();
! 			*	//connectToHost();
! 			* }
! 			*/
  
  			//first change working dir!
  			ftpClient.changeWorkingDirectory(folder);
+ 			curDepth++;
  
  			FTPFile[] ftpFiles = null;
***************
*** 499,502 ****
--- 506,512 ----
  
  			if (ftpFiles == null) {
+ 				// no files found in this dir - so
return to parent
+
ftpClient.changeWorkingDirectory( ".." );
+ 				curDepth--;
  				return;
  			}
***************
*** 515,521 ****
  				} else if (ftpFiles[i].isDirectory() &&
scanSubfolders) {
  					//Get files from new current
diretory by executing this method recurs.
!
processFtpFolder(ftpFiles[i].getName());
  				}
  			}
  		} catch (Exception e) {
  			throw new ScannerException(
--- 525,539 ----
  				} else if (ftpFiles[i].isDirectory() &&
scanSubfolders) {
  					//Get files from new current
diretory by executing this method recurs.
! 					if (curDepth <= maxDepth){
! 						//Walk down the tree
until max depth limit is reached
!
processFtpFolder(ftpFiles[i].getName());
! 					}
  				}
  			}
+ 			// return to parent, otherwise you get stuck at
the end of the first branch
+ 			// when walking down subdirs
+ 		      	ftpClient.changeWorkingDirectory( ".." );
+ 			curDepth--;
+ 
  		} catch (Exception e) {
  			throw new ScannerException(
***************
*** 618,622 ****
--- 636,649 ----
 
I18n.get("scanner.FtpScannerInfo.option.filter")));
  
+ 		options.add(
+ 			new ConfigOption(
+ 				FtpScanner.MAX_DEPTH,
+ 				IConfigOptionType.STRING,
+ 				"0",
+ 				false,
+
"scanner.FtpScannerInfo.option.maxDepth"));
+ 
  		return options;
  	}
  }
+ 



-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server.
Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Babeldoc-devel mailing list
Bab...@li...
https://lists.sourceforge.net/lists/listinfo/babeldoc-devel

Re: [Babeldoc-devel] RE: FTPScanner fixes 2

[Michael A. <mic...@ze...>]

Thanks Albert.

Patch applied, build passed, and new revision committed.

Cheers...


Mike

On Saturday 05 November 2005 09:26, Albert Apolloner wrote:
> You only need to apply the second patch since it contains all previous
> fixes i've done.
>
> ciao
> apa
>
> >From: Michael Ansley <michael@ze...>
> >Re: FtpScanner fixes 2
> >2005-11-04 13:05
> >
> >Has somebody applied this patch?  Can I apply it?  And the previous one?

[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner/worker FtpScanner.java,1.24,1.25

[Michael A. <mic...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8501/modules/scanner/src/com/babeldoc/scanner/worker

Modified Files:
	FtpScanner.java 
Log Message:
Patch provided by Albert Apolloner <ap...@em...> to fix the following
issues:
1) If includeSubfolder=true the scanner only walked down the first line of the directory tree
2) A permanent connect/disconnect activity (> 1/sec) despite the period property was set to 60000ms
3) Problem with FTP server timeouts



Index: FtpScanner.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker/FtpScanner.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** FtpScanner.java	24 Jul 2004 00:18:52 -0000	1.24
--- FtpScanner.java	7 Nov 2005 01:51:33 -0000	1.25
***************
*** 110,113 ****
--- 110,114 ----
  	public static final String SCAN_SUBFOLDERS = "includeSubfolders";
  	public static final String FILTER_FILENAME = "filter";
+ 	public static final String MAX_DEPTH = "maxDepth";
  
  	//private final static int rertyCount = 3;
***************
*** 118,122 ****
  	private String ftpPassword = "";
  	private String ftpUsername = "";
!   private int ftpFileType = FTPClient.ASCII_FILE_TYPE;
  	private String localBackupFolder = "";
  	private boolean scanSubfolders = false;
--- 119,125 ----
  	private String ftpPassword = "";
  	private String ftpUsername = "";
!   	private int ftpFileType = FTPClient.ASCII_FILE_TYPE;
! 	private int maxDepth = 0;
! 	private int curDepth = 0;
  	private String localBackupFolder = "";
  	private boolean scanSubfolders = false;
***************
*** 191,194 ****
--- 194,198 ----
  			.equalsIgnoreCase(this.getInfo().getStrValue(SCAN_SUBFOLDERS)))) {
  			scanSubfolders = true;
+ 			maxDepth = Integer.parseInt(this.getInfo().getStrValue(MAX_DEPTH));
  		}
  
***************
*** 238,249 ****
  				if (ftpClient.login(ftpUsername, ftpPassword)) {
  					if (ftpClient.changeWorkingDirectory(ftpFolder)) {
!             if(ftpClient.setFileType(ftpFileType)) {
!               //
!             } else {
!               ftpClient.disconnect();
!               throw new ScannerException(
!                 I18n.get("scanner.FtpScanner.error.filetype"));
!             }
!           } else {
  						ftpClient.disconnect();
  						throw new ScannerException(
--- 242,253 ----
  				if (ftpClient.login(ftpUsername, ftpPassword)) {
  					if (ftpClient.changeWorkingDirectory(ftpFolder)) {
!             					if(ftpClient.setFileType(ftpFileType)) {
!               					//
!             					} else {
!               						ftpClient.disconnect();
!               						throw new ScannerException(
!                 						I18n.get("scanner.FtpScanner.error.filetype"));
!             					}
!           				} else {
  						ftpClient.disconnect();
  						throw new ScannerException(
***************
*** 462,474 ****
  					log.logDebug("Scanning " + ftpClient.printWorkingDirectory());
  			}
! 
! 			if ((ftpClient.getReplyCode() == FTPReply.CLOSING_DATA_CONNECTION)
! 				|| (ftpClient.getReplyCode() == FTPReply.SERVICE_NOT_AVAILABLE)) {
! 				ftpClient.disconnect();
! 				connectToHost();
! 			}
  
  			//first change working dir!
  			ftpClient.changeWorkingDirectory(folder);
  
  			FTPFile[] ftpFiles = null;
--- 466,481 ----
  					log.logDebug("Scanning " + ftpClient.printWorkingDirectory());
  			}
! 			
! 			/* the following code creates unnecessary reconnects - if you think it is necessary uncoment it
! 			*  if ((ftpClient.getReplyCode() == FTPReply.CLOSING_DATA_CONNECTION)
! 			*	|| (ftpClient.getReplyCode() == FTPReply.SERVICE_NOT_AVAILABLE)) {
! 			*	//ftpClient.disconnect();
! 			*	//connectToHost();
! 			* }
! 			*/
  
  			//first change working dir!
  			ftpClient.changeWorkingDirectory(folder);
+ 			curDepth++;
  
  			FTPFile[] ftpFiles = null;
***************
*** 499,502 ****
--- 506,512 ----
  
  			if (ftpFiles == null) {
+ 				// no files found in this dir - so return to parent
+       				ftpClient.changeWorkingDirectory( ".." );
+ 				curDepth--;
  				return;
  			}
***************
*** 515,521 ****
  				} else if (ftpFiles[i].isDirectory() && scanSubfolders) {
  					//Get files from new current diretory by executing this method recurs.
! 					processFtpFolder(ftpFiles[i].getName());
  				}
  			}
  		} catch (Exception e) {
  			throw new ScannerException(
--- 525,539 ----
  				} else if (ftpFiles[i].isDirectory() && scanSubfolders) {
  					//Get files from new current diretory by executing this method recurs.
! 					if (curDepth <= maxDepth){
! 						//Walk down the tree until max depth limit is reached
! 						processFtpFolder(ftpFiles[i].getName());
! 					}
  				}
  			}
+ 			// return to parent, otherwise you get stuck at the end of the first branch
+ 			// when walking down subdirs
+ 		      	ftpClient.changeWorkingDirectory( ".." );
+ 			curDepth--;
+ 
  		} catch (Exception e) {
  			throw new ScannerException(
***************
*** 618,622 ****
--- 636,649 ----
  				I18n.get("scanner.FtpScannerInfo.option.filter")));
  
+ 		options.add(
+ 			new ConfigOption(
+ 				FtpScanner.MAX_DEPTH,
+ 				IConfigOptionType.STRING,
+ 				"0",
+ 				false,
+ 				"scanner.FtpScannerInfo.option.maxDepth"));
+ 
  		return options;
  	}
  }
+ 

[Babeldoc-devel] RE: FTPScanner fixes 2

[Albert A. <ap...@em...>]

You only need to apply the second patch since it contains all previous fixe=
s i've done.

ciao
apa

>From: Michael Ansley <michael@ze...>
>Re: FtpScanner fixes 2=20=20
>2005-11-04 13:05
>
>Has somebody applied this patch?  Can I apply it?  And the previous one?



--=20
___________________________________________________
Play 100s of games for FREE! http://games.mail.com/

RE: [Babeldoc-devel] FtpScanner fixes 2

[McDonald, B. <Bru...@ba...>]

Do it.

-----Original Message-----
From: bab...@li...
[mailto:bab...@li...] On Behalf Of Michael
Ansley
Sent: Friday, November 04, 2005 4:05 PM
To: bab...@li...
Subject: Re: [Babeldoc-devel] FtpScanner fixes 2

Has somebody applied this patch?  Can I apply it?  And the previous one?

On Friday 04 November 2005 15:21, Albert Apolloner wrote:
> New diff against v1.24.
> Fixes problem with FTP server timeouts,
> directory tree iteration (see previous msg)
>
> ciao
> apa
>
> *** FtpScanner.java	Mon Oct 31 11:27:07 2005
> --- modules/scanner/src/com/babeldoc/scanner/worker/FtpScanner.java
Fri Nov
>  4 10:29:31 2005 ***************
> *** 81,84 ****
> --- 81,85 ----
>   import org.apache.commons.net.ftp.FTPFileListParser;
>   import org.apache.commons.net.ftp.FTPReply;
> + import org.apache.commons.net.ftp.FTPConnectionClosedException;
>
>   import com.babeldoc.core.I18n;
> ***************
> *** 110,113 ****
> --- 111,115 ----
>   	public static final String SCAN_SUBFOLDERS =
"includeSubfolders";
>   	public static final String FILTER_FILENAME = "filter";
> + 	public static final String MAX_DEPTH = "maxDepth";
>
>   	//private final static int rertyCount = 3;
> ***************
> *** 118,122 ****
>   	private String ftpPassword = "";
>   	private String ftpUsername = "";
> !   private int ftpFileType = FTPClient.ASCII_FILE_TYPE;
>   	private String localBackupFolder = "";
>   	private boolean scanSubfolders = false;
> --- 120,126 ----
>   	private String ftpPassword = "";
>   	private String ftpUsername = "";
> !   	private int ftpFileType = FTPClient.ASCII_FILE_TYPE;
> ! 	private int maxDepth = 0;
> ! 	private int curDepth = 0;
>   	private String localBackupFolder = "";
>   	private boolean scanSubfolders = false;
> ***************
> *** 166,176 ****
>   	 */
>   	public void doScan() throws ScannerException {
>   		try {
> ! 			processFtpFolder(ftpFolder);
>   		} catch (Exception e) {
> ! 			throw new ScannerException(
>
I18n.get("scanner.FtpScanner.error.general"),
>   				e);
> ! 		}
>   	}
>
> --- 170,199 ----
>   	 */
>   	public void doScan() throws ScannerException {
> +                 boolean err = false;
>   		try {
> !                         processFtpFolder(ftpFolder);
> !                 } catch (FTPConnectionClosedException cl){
> !                         err = true;
> ! 			if(log.isDebugEnabled())
> ! 				log.logDebug("Connection to FTP server
was terminated");
>   		} catch (Exception e) {
> !                         err = true;
> !                         throw new ScannerException(
>
I18n.get("scanner.FtpScanner.error.general"),
>   				e);
> ! 		} finally {
> !                     try {
> !                         if (err){
> !                             if(log.isDebugEnabled())
> ! 				log.logDebug("Need to reconnect before
scanning ...");
> !
> !                             ftpClient.disconnect();
> !                             connectToHost();
> !                             processFtpFolder(ftpFolder);
> !                         }
> !                     }catch (Exception re){
> !                         throw new ScannerException("Reconnection to
> FTPServer failed"); !                     }
> !                 }
>   	}
>
> ***************
> *** 191,194 ****
> --- 214,218 ----
>
.equalsIgnoreCase(this.getInfo().getStrValue(SCAN_SUBFOLDERS)))) {
>   			scanSubfolders = true;
> + 			maxDepth =
Integer.parseInt(this.getInfo().getStrValue(MAX_DEPTH));
>   		}
>
> ***************
> *** 238,249 ****
>   				if (ftpClient.login(ftpUsername,
ftpPassword)) {
>   					if
(ftpClient.changeWorkingDirectory(ftpFolder)) {
> !             if(ftpClient.setFileType(ftpFileType)) {
> !               //
> !             } else {
> !               ftpClient.disconnect();
> !               throw new ScannerException(
> !                 I18n.get("scanner.FtpScanner.error.filetype"));
> !             }
> !           } else {
>   						ftpClient.disconnect();
>   						throw new
ScannerException(
> --- 262,273 ----
>   				if (ftpClient.login(ftpUsername,
ftpPassword)) {
>   					if
(ftpClient.changeWorkingDirectory(ftpFolder)) {
> !
if(ftpClient.setFileType(ftpFileType)) {
> !               					//
> !             					} else {
> !
ftpClient.disconnect();
> !               						throw
new ScannerException(
> !
I18n.get("scanner.FtpScanner.error.filetype"));
> !             					}
> !           				} else {
>   						ftpClient.disconnect();
>   						throw new
ScannerException(
> ***************
> *** 347,352 ****
>
>   			if ((ftpOutFolder != null) &&
(!ftpOutFolder.equals(""))) {
> ! 				String ftpOutPath =
> ! 					ftpOutFolder +
fileName.substring(ftpFolder.length());
>   				ftpClient.rename(fileName, ftpOutPath);
>   			}
> --- 371,387 ----
>
>   			if ((ftpOutFolder != null) &&
(!ftpOutFolder.equals(""))) {
> !                                 StringBuffer sbOutPath = new
> StringBuffer(); !                                 if
> (ftpOutFolder.endsWith("/")){ !                                    
> sbOutPath.append(
> ! 					ftpOutFolder +
fileName.substring(fileName.indexOf(scanFileName))
> !                                         );
> !                                 }else{
> !                                     sbOutPath.append(
> ! 					ftpOutFolder + "/"
> !                                         +
> fileName.substring(fileName.indexOf(scanFileName)) !

>               );
> !                                 }
> !                                 String ftpOutPath =
sbOutPath.toString();
> !
>   				ftpClient.rename(fileName, ftpOutPath);
>   			}
> ***************
> *** 375,379 ****
>   	 * @throws ScannerException
>   	 */
> ! 	private void processFtpFolder(String folder) throws
ScannerException {
>   		//This is inner class that implements FileListParser
interface
>   		//It is used for parsing files returned from MS ftp
server
> --- 410,414 ----
>   	 * @throws ScannerException
>   	 */
> ! 	private void processFtpFolder(String folder) throws
ScannerException,
> FTPConnectionClosedException { //This is inner class that implements
> FileListParser interface //It is used for parsing files returned from
MS
> ftp server
> ***************
> *** 462,474 ****
>   					log.logDebug("Scanning " +
ftpClient.printWorkingDirectory());
>   			}
> !
> ! 			if ((ftpClient.getReplyCode() ==
FTPReply.CLOSING_DATA_CONNECTION)
> ! 				|| (ftpClient.getReplyCode() ==
FTPReply.SERVICE_NOT_AVAILABLE)) {
> ! 				ftpClient.disconnect();
> ! 				connectToHost();
> ! 			}
> !
>   			//first change working dir!
>   			ftpClient.changeWorkingDirectory(folder);
>
>   			FTPFile[] ftpFiles = null;
> --- 497,504 ----
>   					log.logDebug("Scanning " +
ftpClient.printWorkingDirectory());
>   			}
> !
>   			//first change working dir!
>   			ftpClient.changeWorkingDirectory(folder);
> + 			curDepth++;
>
>   			FTPFile[] ftpFiles = null;
> ***************
> *** 499,502 ****
> --- 529,535 ----
>
>   			if (ftpFiles == null) {
> + 				// no files found in this dir - so
return to parent
> +
ftpClient.changeToParentDirectory();
> + 				curDepth--;
>   				return;
>   			}
> ***************
> *** 515,521 ****
>   				} else if (ftpFiles[i].isDirectory() &&
scanSubfolders) {
>   					//Get files from new current
diretory by executing this method
> recurs. !
processFtpFolder(ftpFiles[i].getName());
>   				}
>   			}
>   		} catch (Exception e) {
>   			throw new ScannerException(
> --- 548,564 ----
>   				} else if (ftpFiles[i].isDirectory() &&
scanSubfolders) {
>   					//Get files from new current
diretory by executing this method
> recurs. ! 					if (curDepth <=
maxDepth){
> ! 						//Walk down the tree
until max depth limit is reached
> !
processFtpFolder(ftpFiles[i].getName());
> ! 					}
>   				}
>   			}
> + 			// return to parent, otherwise you get stuck at
the end of the first
> branch + 			// when walking down subdirs
> + 		      	ftpClient.changeToParentDirectory();
> + 			curDepth--;
> + 		} catch (FTPConnectionClosedException ce) {
> +                         // The FTP Server has probably terminated
the
> connection due to some timeout + 			throw new
> FTPConnectionClosedException("Oops, disconnected!"); } catch
(Exception e)
> {
>   			throw new ScannerException(
> ***************
> *** 618,622 ****
> --- 661,674 ----
>
I18n.get("scanner.FtpScannerInfo.option.filter")));
>
> + 		options.add(
> + 			new ConfigOption(
> + 				FtpScanner.MAX_DEPTH,
> + 				IConfigOptionType.STRING,
> + 				"0",
> + 				false,
> +
"scanner.FtpScannerInfo.option.maxDepth"));
> +
>   		return options;
>   	}
>   }
> +


-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server.
Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Babeldoc-devel mailing list
Bab...@li...
https://lists.sourceforge.net/lists/listinfo/babeldoc-devel

Re: [Babeldoc-devel] FtpScanner fixes 2

[Michael A. <mic...@ze...>]

Has somebody applied this patch?  Can I apply it?  And the previous one?

On Friday 04 November 2005 15:21, Albert Apolloner wrote:
> New diff against v1.24.
> Fixes problem with FTP server timeouts,
> directory tree iteration (see previous msg)
>
> ciao
> apa
>
> *** FtpScanner.java	Mon Oct 31 11:27:07 2005
> --- modules/scanner/src/com/babeldoc/scanner/worker/FtpScanner.java	Fri Nov
>  4 10:29:31 2005 ***************
> *** 81,84 ****
> --- 81,85 ----
>   import org.apache.commons.net.ftp.FTPFileListParser;
>   import org.apache.commons.net.ftp.FTPReply;
> + import org.apache.commons.net.ftp.FTPConnectionClosedException;
>
>   import com.babeldoc.core.I18n;
> ***************
> *** 110,113 ****
> --- 111,115 ----
>   	public static final String SCAN_SUBFOLDERS = "includeSubfolders";
>   	public static final String FILTER_FILENAME = "filter";
> + 	public static final String MAX_DEPTH = "maxDepth";
>
>   	//private final static int rertyCount = 3;
> ***************
> *** 118,122 ****
>   	private String ftpPassword = "";
>   	private String ftpUsername = "";
> !   private int ftpFileType = FTPClient.ASCII_FILE_TYPE;
>   	private String localBackupFolder = "";
>   	private boolean scanSubfolders = false;
> --- 120,126 ----
>   	private String ftpPassword = "";
>   	private String ftpUsername = "";
> !   	private int ftpFileType = FTPClient.ASCII_FILE_TYPE;
> ! 	private int maxDepth = 0;
> ! 	private int curDepth = 0;
>   	private String localBackupFolder = "";
>   	private boolean scanSubfolders = false;
> ***************
> *** 166,176 ****
>   	 */
>   	public void doScan() throws ScannerException {
>   		try {
> ! 			processFtpFolder(ftpFolder);
>   		} catch (Exception e) {
> ! 			throw new ScannerException(
>   				I18n.get("scanner.FtpScanner.error.general"),
>   				e);
> ! 		}
>   	}
>
> --- 170,199 ----
>   	 */
>   	public void doScan() throws ScannerException {
> +                 boolean err = false;
>   		try {
> !                         processFtpFolder(ftpFolder);
> !                 } catch (FTPConnectionClosedException cl){
> !                         err = true;
> ! 			if(log.isDebugEnabled())
> ! 				log.logDebug("Connection to FTP server was terminated");
>   		} catch (Exception e) {
> !                         err = true;
> !                         throw new ScannerException(
>   				I18n.get("scanner.FtpScanner.error.general"),
>   				e);
> ! 		} finally {
> !                     try {
> !                         if (err){
> !                             if(log.isDebugEnabled())
> ! 				log.logDebug("Need to reconnect before scanning ...");
> !
> !                             ftpClient.disconnect();
> !                             connectToHost();
> !                             processFtpFolder(ftpFolder);
> !                         }
> !                     }catch (Exception re){
> !                         throw new ScannerException("Reconnection to
> FTPServer failed"); !                     }
> !                 }
>   	}
>
> ***************
> *** 191,194 ****
> --- 214,218 ----
>   			.equalsIgnoreCase(this.getInfo().getStrValue(SCAN_SUBFOLDERS)))) {
>   			scanSubfolders = true;
> + 			maxDepth = Integer.parseInt(this.getInfo().getStrValue(MAX_DEPTH));
>   		}
>
> ***************
> *** 238,249 ****
>   				if (ftpClient.login(ftpUsername, ftpPassword)) {
>   					if (ftpClient.changeWorkingDirectory(ftpFolder)) {
> !             if(ftpClient.setFileType(ftpFileType)) {
> !               //
> !             } else {
> !               ftpClient.disconnect();
> !               throw new ScannerException(
> !                 I18n.get("scanner.FtpScanner.error.filetype"));
> !             }
> !           } else {
>   						ftpClient.disconnect();
>   						throw new ScannerException(
> --- 262,273 ----
>   				if (ftpClient.login(ftpUsername, ftpPassword)) {
>   					if (ftpClient.changeWorkingDirectory(ftpFolder)) {
> !             					if(ftpClient.setFileType(ftpFileType)) {
> !               					//
> !             					} else {
> !               						ftpClient.disconnect();
> !               						throw new ScannerException(
> !                 						I18n.get("scanner.FtpScanner.error.filetype"));
> !             					}
> !           				} else {
>   						ftpClient.disconnect();
>   						throw new ScannerException(
> ***************
> *** 347,352 ****
>
>   			if ((ftpOutFolder != null) && (!ftpOutFolder.equals(""))) {
> ! 				String ftpOutPath =
> ! 					ftpOutFolder + fileName.substring(ftpFolder.length());
>   				ftpClient.rename(fileName, ftpOutPath);
>   			}
> --- 371,387 ----
>
>   			if ((ftpOutFolder != null) && (!ftpOutFolder.equals(""))) {
> !                                 StringBuffer sbOutPath = new
> StringBuffer(); !                                 if
> (ftpOutFolder.endsWith("/")){ !                                    
> sbOutPath.append(
> ! 					ftpOutFolder + fileName.substring(fileName.indexOf(scanFileName))
> !                                         );
> !                                 }else{
> !                                     sbOutPath.append(
> ! 					ftpOutFolder + "/"
> !                                         +
> fileName.substring(fileName.indexOf(scanFileName)) !                       
>               );
> !                                 }
> !                                 String ftpOutPath = sbOutPath.toString();
> !
>   				ftpClient.rename(fileName, ftpOutPath);
>   			}
> ***************
> *** 375,379 ****
>   	 * @throws ScannerException
>   	 */
> ! 	private void processFtpFolder(String folder) throws ScannerException {
>   		//This is inner class that implements FileListParser interface
>   		//It is used for parsing files returned from MS ftp server
> --- 410,414 ----
>   	 * @throws ScannerException
>   	 */
> ! 	private void processFtpFolder(String folder) throws ScannerException,
> FTPConnectionClosedException { //This is inner class that implements
> FileListParser interface //It is used for parsing files returned from MS
> ftp server
> ***************
> *** 462,474 ****
>   					log.logDebug("Scanning " + ftpClient.printWorkingDirectory());
>   			}
> !
> ! 			if ((ftpClient.getReplyCode() == FTPReply.CLOSING_DATA_CONNECTION)
> ! 				|| (ftpClient.getReplyCode() == FTPReply.SERVICE_NOT_AVAILABLE)) {
> ! 				ftpClient.disconnect();
> ! 				connectToHost();
> ! 			}
> !
>   			//first change working dir!
>   			ftpClient.changeWorkingDirectory(folder);
>
>   			FTPFile[] ftpFiles = null;
> --- 497,504 ----
>   					log.logDebug("Scanning " + ftpClient.printWorkingDirectory());
>   			}
> !
>   			//first change working dir!
>   			ftpClient.changeWorkingDirectory(folder);
> + 			curDepth++;
>
>   			FTPFile[] ftpFiles = null;
> ***************
> *** 499,502 ****
> --- 529,535 ----
>
>   			if (ftpFiles == null) {
> + 				// no files found in this dir - so return to parent
> +       				ftpClient.changeToParentDirectory();
> + 				curDepth--;
>   				return;
>   			}
> ***************
> *** 515,521 ****
>   				} else if (ftpFiles[i].isDirectory() && scanSubfolders) {
>   					//Get files from new current diretory by executing this method
> recurs. ! 					processFtpFolder(ftpFiles[i].getName());
>   				}
>   			}
>   		} catch (Exception e) {
>   			throw new ScannerException(
> --- 548,564 ----
>   				} else if (ftpFiles[i].isDirectory() && scanSubfolders) {
>   					//Get files from new current diretory by executing this method
> recurs. ! 					if (curDepth <= maxDepth){
> ! 						//Walk down the tree until max depth limit is reached
> ! 						processFtpFolder(ftpFiles[i].getName());
> ! 					}
>   				}
>   			}
> + 			// return to parent, otherwise you get stuck at the end of the first
> branch + 			// when walking down subdirs
> + 		      	ftpClient.changeToParentDirectory();
> + 			curDepth--;
> + 		} catch (FTPConnectionClosedException ce) {
> +                         // The FTP Server has probably terminated the
> connection due to some timeout + 			throw new
> FTPConnectionClosedException("Oops, disconnected!"); } catch (Exception e)
> {
>   			throw new ScannerException(
> ***************
> *** 618,622 ****
> --- 661,674 ----
>   				I18n.get("scanner.FtpScannerInfo.option.filter")));
>
> + 		options.add(
> + 			new ConfigOption(
> + 				FtpScanner.MAX_DEPTH,
> + 				IConfigOptionType.STRING,
> + 				"0",
> + 				false,
> + 				"scanner.FtpScannerInfo.option.maxDepth"));
> +
>   		return options;
>   	}
>   }
> +

[Babeldoc-devel] FtpScanner fixes 2

[Albert A. <ap...@em...>]

New diff against v1.24.
Fixes problem with FTP server timeouts,
directory tree iteration (see previous msg)

ciao
apa

*** FtpScanner.java	Mon Oct 31 11:27:07 2005
--- modules/scanner/src/com/babeldoc/scanner/worker/FtpScanner.java	Fri Nov=
  4 10:29:31 2005
***************
*** 81,84 ****
--- 81,85 ----
  import org.apache.commons.net.ftp.FTPFileListParser;
  import org.apache.commons.net.ftp.FTPReply;
+ import org.apache.commons.net.ftp.FTPConnectionClosedException;
=20=20
  import com.babeldoc.core.I18n;
***************
*** 110,113 ****
--- 111,115 ----
  	public static final String SCAN_SUBFOLDERS =3D "includeSubfolders";
  	public static final String FILTER_FILENAME =3D "filter";
+ 	public static final String MAX_DEPTH =3D "maxDepth";
=20=20
  	//private final static int rertyCount =3D 3;
***************
*** 118,122 ****
  	private String ftpPassword =3D "";
  	private String ftpUsername =3D "";
!   private int ftpFileType =3D FTPClient.ASCII_FILE_TYPE;
  	private String localBackupFolder =3D "";
  	private boolean scanSubfolders =3D false;
--- 120,126 ----
  	private String ftpPassword =3D "";
  	private String ftpUsername =3D "";
!   	private int ftpFileType =3D FTPClient.ASCII_FILE_TYPE;
! 	private int maxDepth =3D 0;
! 	private int curDepth =3D 0;
  	private String localBackupFolder =3D "";
  	private boolean scanSubfolders =3D false;
***************
*** 166,176 ****
  	 */
  	public void doScan() throws ScannerException {
  		try {
! 			processFtpFolder(ftpFolder);
  		} catch (Exception e) {
! 			throw new ScannerException(
  				I18n.get("scanner.FtpScanner.error.general"),
  				e);
! 		}
  	}
=20=20
--- 170,199 ----
  	 */
  	public void doScan() throws ScannerException {
+                 boolean err =3D false;
  		try {
!                         processFtpFolder(ftpFolder);
!                 } catch (FTPConnectionClosedException cl){
!                         err =3D true;
! 			if(log.isDebugEnabled())
! 				log.logDebug("Connection to FTP server was terminated");
  		} catch (Exception e) {
!                         err =3D true;
!                         throw new ScannerException(
  				I18n.get("scanner.FtpScanner.error.general"),
  				e);
! 		} finally {
!                     try {
!                         if (err){
!                             if(log.isDebugEnabled())
! 				log.logDebug("Need to reconnect before scanning ...");
!=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20
!                             ftpClient.disconnect();
!                             connectToHost();
!                             processFtpFolder(ftpFolder);
!                         }
!                     }catch (Exception re){
!                         throw new ScannerException("Reconnection to FTPSe=
rver failed");
!                     }
!                 }
  	}
=20=20
***************
*** 191,194 ****
--- 214,218 ----
  			.equalsIgnoreCase(this.getInfo().getStrValue(SCAN_SUBFOLDERS)))) {
  			scanSubfolders =3D true;
+ 			maxDepth =3D Integer.parseInt(this.getInfo().getStrValue(MAX_DEPTH));
  		}
=20=20
***************
*** 238,249 ****
  				if (ftpClient.login(ftpUsername, ftpPassword)) {
  					if (ftpClient.changeWorkingDirectory(ftpFolder)) {
!             if(ftpClient.setFileType(ftpFileType)) {
!               //
!             } else {
!               ftpClient.disconnect();
!               throw new ScannerException(
!                 I18n.get("scanner.FtpScanner.error.filetype"));
!             }
!           } else {
  						ftpClient.disconnect();
  						throw new ScannerException(
--- 262,273 ----
  				if (ftpClient.login(ftpUsername, ftpPassword)) {
  					if (ftpClient.changeWorkingDirectory(ftpFolder)) {
!             					if(ftpClient.setFileType(ftpFileType)) {
!               					//
!             					} else {
!               						ftpClient.disconnect();
!               						throw new ScannerException(
!                 						I18n.get("scanner.FtpScanner.error.filetype"));
!             					}
!           				} else {
  						ftpClient.disconnect();
  						throw new ScannerException(
***************
*** 347,352 ****
=20=20
  			if ((ftpOutFolder !=3D null) && (!ftpOutFolder.equals(""))) {
! 				String ftpOutPath =3D
! 					ftpOutFolder + fileName.substring(ftpFolder.length());
  				ftpClient.rename(fileName, ftpOutPath);
  			}
--- 371,387 ----
=20=20
  			if ((ftpOutFolder !=3D null) && (!ftpOutFolder.equals(""))) {
!                                 StringBuffer sbOutPath =3D new StringBuff=
er();
!                                 if (ftpOutFolder.endsWith("/")){
!                                     sbOutPath.append(
! 					ftpOutFolder + fileName.substring(fileName.indexOf(scanFileName))
!                                         );
!                                 }else{
!                                     sbOutPath.append(
! 					ftpOutFolder + "/"=20
!                                         + fileName.substring(fileName.ind=
exOf(scanFileName))
!                                      );=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20
!                                 }
!                                 String ftpOutPath =3D sbOutPath.toString(=
);
!=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20
  				ftpClient.rename(fileName, ftpOutPath);
  			}
***************
*** 375,379 ****
  	 * @throws ScannerException
  	 */
! 	private void processFtpFolder(String folder) throws ScannerException {
  		//This is inner class that implements FileListParser interface
  		//It is used for parsing files returned from MS ftp server
--- 410,414 ----
  	 * @throws ScannerException
  	 */
! 	private void processFtpFolder(String folder) throws ScannerException, FT=
PConnectionClosedException {
  		//This is inner class that implements FileListParser interface
  		//It is used for parsing files returned from MS ftp server
***************
*** 462,474 ****
  					log.logDebug("Scanning " + ftpClient.printWorkingDirectory());
  			}
!=20
! 			if ((ftpClient.getReplyCode() =3D=3D FTPReply.CLOSING_DATA_CONNECTION)
! 				|| (ftpClient.getReplyCode() =3D=3D FTPReply.SERVICE_NOT_AVAILABLE)) {
! 				ftpClient.disconnect();
! 				connectToHost();
! 			}
!=20
  			//first change working dir!
  			ftpClient.changeWorkingDirectory(folder);
=20=20
  			FTPFile[] ftpFiles =3D null;
--- 497,504 ----
  					log.logDebug("Scanning " + ftpClient.printWorkingDirectory());
  			}
!=20=09=09=09
  			//first change working dir!
  			ftpClient.changeWorkingDirectory(folder);
+ 			curDepth++;
=20=20
  			FTPFile[] ftpFiles =3D null;
***************
*** 499,502 ****
--- 529,535 ----
=20=20
  			if (ftpFiles =3D=3D null) {
+ 				// no files found in this dir - so return to parent
+       				ftpClient.changeToParentDirectory();
+ 				curDepth--;
  				return;
  			}
***************
*** 515,521 ****
  				} else if (ftpFiles[i].isDirectory() && scanSubfolders) {
  					//Get files from new current diretory by executing this method recur=
s.
! 					processFtpFolder(ftpFiles[i].getName());
  				}
  			}
  		} catch (Exception e) {
  			throw new ScannerException(
--- 548,564 ----
  				} else if (ftpFiles[i].isDirectory() && scanSubfolders) {
  					//Get files from new current diretory by executing this method recur=
s.
! 					if (curDepth <=3D maxDepth){
! 						//Walk down the tree until max depth limit is reached
! 						processFtpFolder(ftpFiles[i].getName());
! 					}
  				}
  			}
+ 			// return to parent, otherwise you get stuck at the end of the first b=
ranch
+ 			// when walking down subdirs
+ 		      	ftpClient.changeToParentDirectory();
+ 			curDepth--;
+ 		} catch (FTPConnectionClosedException ce) {
+                         // The FTP Server has probably terminated the con=
nection due to some timeout
+ 			throw new FTPConnectionClosedException("Oops, disconnected!");
  		} catch (Exception e) {
  			throw new ScannerException(
***************
*** 618,622 ****
--- 661,674 ----
  				I18n.get("scanner.FtpScannerInfo.option.filter")));
=20=20
+ 		options.add(
+ 			new ConfigOption(
+ 				FtpScanner.MAX_DEPTH,
+ 				IConfigOptionType.STRING,
+ 				"0",
+ 				false,
+ 				"scanner.FtpScannerInfo.option.maxDepth"));
+=20
  		return options;
  	}
  }
+=20


--=20
___________________________________________________
Play 100s of games for FREE! http://games.mail.com/

[Babeldoc-devel] FtpScanner fixes (diff included now)

[Albert A. <ap...@em...>]

I ran into the following problems with FtpScanner:
- if includeSubfolder=3Dtrue the scanner only walked down the first=20
line of the directory tree
- I noticed a permanent connect/disconnect activity (> 1/sec)=20
despite the period property was set to 60000ms

The included patch (diff against 1.24) fixes these problems and
- adds an additional property maxDepth that you can use to limit=20
the number of levels that the scanner walks down the directory tree=20
(beginning from ftpFolder).
The default value for maxDepth, if omitted, is 0 which is=20
equivalent to setting includeSubfolders=3Dfalse.

ciao
apa

*** FtpScanner.java	Mon Oct 31 11:27:07 2005
--- modules/scanner/src/com/babeldoc/scanner/worker/FtpScanner.java	Mon Oct=
 31 10:52:36 2005
***************
*** 110,113 ****
--- 110,114 ----
  	public static final String SCAN_SUBFOLDERS =3D "includeSubfolders";
  	public static final String FILTER_FILENAME =3D "filter";
+ 	public static final String MAX_DEPTH =3D "maxDepth";
=20=20
  	//private final static int rertyCount =3D 3;
***************
*** 118,122 ****
  	private String ftpPassword =3D "";
  	private String ftpUsername =3D "";
!   private int ftpFileType =3D FTPClient.ASCII_FILE_TYPE;
  	private String localBackupFolder =3D "";
  	private boolean scanSubfolders =3D false;
--- 119,125 ----
  	private String ftpPassword =3D "";
  	private String ftpUsername =3D "";
!   	private int ftpFileType =3D FTPClient.ASCII_FILE_TYPE;
! 	private int maxDepth =3D 0;
! 	private int curDepth =3D 0;
  	private String localBackupFolder =3D "";
  	private boolean scanSubfolders =3D false;
***************
*** 191,194 ****
--- 194,198 ----
  			.equalsIgnoreCase(this.getInfo().getStrValue(SCAN_SUBFOLDERS)))) {
  			scanSubfolders =3D true;
+ 			maxDepth =3D Integer.parseInt(this.getInfo().getStrValue(MAX_DEPTH));
  		}
=20=20
***************
*** 238,249 ****
  				if (ftpClient.login(ftpUsername, ftpPassword)) {
  					if (ftpClient.changeWorkingDirectory(ftpFolder)) {
!             if(ftpClient.setFileType(ftpFileType)) {
!               //
!             } else {
!               ftpClient.disconnect();
!               throw new ScannerException(
!                 I18n.get("scanner.FtpScanner.error.filetype"));
!             }
!           } else {
  						ftpClient.disconnect();
  						throw new ScannerException(
--- 242,253 ----
  				if (ftpClient.login(ftpUsername, ftpPassword)) {
  					if (ftpClient.changeWorkingDirectory(ftpFolder)) {
!             					if(ftpClient.setFileType(ftpFileType)) {
!               					//
!             					} else {
!               						ftpClient.disconnect();
!               						throw new ScannerException(
!                 						I18n.get("scanner.FtpScanner.error.filetype"));
!             					}
!           				} else {
  						ftpClient.disconnect();
  						throw new ScannerException(
***************
*** 462,474 ****
  					log.logDebug("Scanning " + ftpClient.printWorkingDirectory());
  			}
!=20
! 			if ((ftpClient.getReplyCode() =3D=3D FTPReply.CLOSING_DATA_CONNECTION)
! 				|| (ftpClient.getReplyCode() =3D=3D FTPReply.SERVICE_NOT_AVAILABLE)) {
! 				ftpClient.disconnect();
! 				connectToHost();
! 			}
=20=20
  			//first change working dir!
  			ftpClient.changeWorkingDirectory(folder);
=20=20
  			FTPFile[] ftpFiles =3D null;
--- 466,481 ----
  					log.logDebug("Scanning " + ftpClient.printWorkingDirectory());
  			}
!=20=09=09=09
! 			/* the following code creates unnecessary reconnects - if you think it=
 is necessary uncoment it
! 			*  if ((ftpClient.getReplyCode() =3D=3D FTPReply.CLOSING_DATA_CONNECTI=
ON)
! 			*	|| (ftpClient.getReplyCode() =3D=3D FTPReply.SERVICE_NOT_AVAILABLE))=
 {
! 			*	//ftpClient.disconnect();
! 			*	//connectToHost();
! 			* }
! 			*/
=20=20
  			//first change working dir!
  			ftpClient.changeWorkingDirectory(folder);
+ 			curDepth++;
=20=20
  			FTPFile[] ftpFiles =3D null;
***************
*** 499,502 ****
--- 506,512 ----
=20=20
  			if (ftpFiles =3D=3D null) {
+ 				// no files found in this dir - so return to parent
+       				ftpClient.changeWorkingDirectory( ".." );
+ 				curDepth--;
  				return;
  			}
***************
*** 515,521 ****
  				} else if (ftpFiles[i].isDirectory() && scanSubfolders) {
  					//Get files from new current diretory by executing this method recur=
s.
! 					processFtpFolder(ftpFiles[i].getName());
  				}
  			}
  		} catch (Exception e) {
  			throw new ScannerException(
--- 525,539 ----
  				} else if (ftpFiles[i].isDirectory() && scanSubfolders) {
  					//Get files from new current diretory by executing this method recur=
s.
! 					if (curDepth <=3D maxDepth){
! 						//Walk down the tree until max depth limit is reached
! 						processFtpFolder(ftpFiles[i].getName());
! 					}
  				}
  			}
+ 			// return to parent, otherwise you get stuck at the end of the first b=
ranch
+ 			// when walking down subdirs
+ 		      	ftpClient.changeWorkingDirectory( ".." );
+ 			curDepth--;
+=20
  		} catch (Exception e) {
  			throw new ScannerException(
***************
*** 618,622 ****
--- 636,649 ----
  				I18n.get("scanner.FtpScannerInfo.option.filter")));
=20=20
+ 		options.add(
+ 			new ConfigOption(
+ 				FtpScanner.MAX_DEPTH,
+ 				IConfigOptionType.STRING,
+ 				"0",
+ 				false,
+ 				"scanner.FtpScannerInfo.option.maxDepth"));
+=20
  		return options;
  	}
  }
+=20

--=20
___________________________________________________
Play 100s of games for FREE! http://games.mail.com/

[Babeldoc-devel] FtpScanner fixes

[Albert A. <ap...@em...>]

I ran into the following problems with FtpScanner:
- if includeSubfolder=3Dtrue the scanner only walked down the first=20
line of the directory tree
- I noticed a permanent connect/disconnect activity (> 1/sec)=20
despite the period property was set to 60000ms

The included patch (diff against 1.24) fixes these problems and
- adds an additional property maxDepth that you can use to limit=20
the number of levels that the scanner walks down the directory tree=20
(beginning from ftpFolder).
The default value for maxDepth, if omitted, is 0 which is=20
equivalent to setting includeSubfolders=3Dfalse.

ciao
apa

--=20
___________________________________________________
Play 100s of games for FREE! http://games.mail.com/

[Babeldoc-devel] Adapting journal

[Ed Y. <ey...@vs...>]

Hi,

I've discovered a bug with the journal.  When the starting point for a
file is the FTPscanner, the journal information seems to be incomplete,
as if it isn't logging all the stages.

To diagnose I have compared the same pipeline with FTPscanner and
directoryScanner.

I've not got much further as I've been unable to find exactly where
babeldoc writes to the journal.
Can someone give me some pointers?

I'm also trying to adapt the journal slightly so that it stores the
originating filename in the 'additional information' field.

Completely baffled here.

Thanks in advance.
   Ed




This message has been scanned for viruses by BlackSpider MailControl - www.=
blackspider.com

[Babeldoc-devel] Java 1.5 Modifications

[Albert A. <ap...@em...>]

I had to do the following modifications to have Babeldoc compiled with Java=
1.5:

1) changed Enum to myEnum in=20
gui/src/com/babeldoc/gui/journal/browser/JournalTree.java:240:
Enumeration myEnum =3D node.children();

gui/src/com/babeldoc/gui/journal/browser/JournalTree.java:241:
while (myEnum.hasMoreElements()) {

gui/src/com/babeldoc/gui/journal/browser/JournalTree.java:242:
DefaultMutableTreeNode elem =3D (DefaultMutableTreeNode)myEnum.nextElement(=
);

soap/src/com/babeldoc/soap/pipeline/servlet/SoapPipelineFeeder.java:203:
Enumeration myEnum =3D req.getHeaderNames();

soap/src/com/babeldoc/soap/pipeline/servlet/SoapPipelineFeeder.java:206:
while (myEnum.hasMoreElements()) {

soap/src/com/babeldoc/soap/pipeline/servlet/SoapPipelineFeeder.java:207:
String headerName =3D (String) myEnum.nextElement();

soap/src/com/babeldoc/soap/pipeline/servlet/SoapPipelineFeeder.java:280:
for (Enumeration myEnum =3D request.getHeaderNames(); myEnum.hasMoreElement=
s();) {

soap/src/com/babeldoc/soap/pipeline/servlet/SoapPipelineFeeder.java:281:
String header =3D (String) myEnum.nextElement();

web/src/com/babeldoc/web/pipeline/servlet/HttpPostPipelineFeeder.java:222:
for (Enumeration myEnum =3D request.getHeaderNames(); myEnum.hasMoreElement=
s();) {

web/src/com/babeldoc/web/pipeline/servlet/HttpPostPipelineFeeder.java:223:
String header =3D (String) myEnum.nextElement();

2) removed ambiguity by specifying javax.jms.Queue instead of Queue

j2ee/src/com/babeldoc/j2ee/scanner/worker/JmsScanner.java:95:
private javax.jms.Queue queue;

j2ee/src/com/babeldoc/j2ee/scanner/worker/JmsScanner.java:141:
queue =3D (javax.jms.Queue) context.lookup(Queue);

ciao
apa
--=20
___________________________________________________________
Sign-up for Ads Free at Mail.com
http://promo.mail.com/adsfreejump.htm

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage ExternalApplicationPipelineStage.java,1.7,1.8

[Dejan K. <de...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3395/babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage

Modified Files:
	ExternalApplicationPipelineStage.java 
Log Message:
Fixing some problems when running some kind of applications. Implementing tips explained in http://www.javaworld.com/javaworld/jw-12-2000/jw-1229-traps_p.html

Index: ExternalApplicationPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage/ExternalApplicationPipelineStage.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ExternalApplicationPipelineStage.java	30 Jul 2004 01:33:04 -0000	1.7
--- ExternalApplicationPipelineStage.java	23 Dec 2004 09:47:20 -0000	1.8
***************
*** 67,70 ****
--- 67,71 ----
  
  import com.babeldoc.core.I18n;
+ import com.babeldoc.core.LogService;
  import com.babeldoc.core.option.ConfigOption;
  import com.babeldoc.core.option.IConfigOptionType;
***************
*** 73,76 ****
--- 74,78 ----
  import java.io.BufferedReader;
  import java.io.IOException;
+ import java.io.InputStream;
  import java.io.InputStreamReader;
  import java.io.OutputStream;
***************
*** 168,182 ****
          os.close();
        }
! 
!       if (pipeIn) {
! 	    StringBuffer response = new StringBuffer();
! 	    String line;
! 	    BufferedReader in = new BufferedReader(new InputStreamReader(process.getInputStream()));
! 		while ((line = in.readLine()) != null) {
! 			System.out.println(line);
! 		    response.append(line);
! 		    response.append("\n");
! 		}
! 		this.getDocument().put("ExternalApplicationResponse", new String(response));
        }
      } catch (IOException e) {
--- 170,189 ----
          os.close();
        }
!       StreamHandler stdout = new StreamHandler(process.getInputStream());
!       StreamHandler stderr = new StreamHandler(process.getInputStream());
!       try {
!       stdout.start();
!       stderr.start();      
!       int status = process.waitFor(); //we should wait for process completition      
!       while (! stdout.isFinished() || !stderr.isFinished()) {
!           Thread.sleep(50);
!       }
!       } catch (InterruptedException e) {
!           e.printStackTrace(); //TODO: handle this
!       }
!       
!       if (pipeIn) {	     
! 		this.getDocument().put("ExternalApplicationResponse", stdout.getOutput());
! 		this.getDocument().put("ExternalApplicationError", stderr.getOutput());		
        }
      } catch (IOException e) {
***************
*** 187,188 ****
--- 194,229 ----
    }
  }
+ 
+ class StreamHandler extends Thread {
+     InputStream is;
+ 
+     
+     private volatile boolean  finished = false;
+     private StringBuffer output;
+     StreamHandler(InputStream is) {
+         this.is = is;
+         this.output = new StringBuffer();
+     }
+ 
+     public void run() {
+         try {
+             InputStreamReader isr = new InputStreamReader(is);
+             BufferedReader br = new BufferedReader(isr);
+             String line = null;
+             while ((line = br.readLine()) != null) {
+                output.append(line).append("\n");
+             }
+         } catch (IOException ioe) {
+             ioe.printStackTrace();
+         }
+         finished = true;
+     }
+     
+     public boolean isFinished() {
+         return finished;
+     }
+     public String getOutput() {
+         return output.toString();
+     }
+     
+ }
\ No newline at end of file