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-08-06 18:46:06
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/config/pipeline/documentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24050/modules/core/config/pipeline/documentation Modified Files: documentation.properties Log Message: documentation, javadoc and formatting here. Index: documentation.properties =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/config/pipeline/documentation/documentation.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** documentation.properties 17 Sep 2003 16:44:12 -0000 1.7 --- documentation.properties 6 Aug 2004 18:45:56 -0000 1.8 *************** *** 110,114 **** stagewriter.stageType=FileWriter stagewriter.nextStage=null ! stagewriter.outputFile=readme/userguide/pipelinestages.xml # --- 110,114 ---- stagewriter.stageType=FileWriter stagewriter.nextStage=null ! stagewriter.outputFile=${system.get("babeldoc.home")}/readme/userguide/pipelinestages.xml # *************** *** 127,131 **** scannerwriter.stageType=FileWriter scannerwriter.nextStage=null ! scannerwriter.outputFile=readme/userguide/scanners.xml # --- 127,131 ---- scannerwriter.stageType=FileWriter scannerwriter.nextStage=null ! scannerwriter.outputFile=${system.get("babeldoc.home")}/readme/userguide/scanners.xml # *************** *** 145,148 **** processorwriter.stageType=FileWriter processorwriter.nextStage=null ! processorwriter.outputFile=readme/userguide/processors.xml --- 145,148 ---- processorwriter.stageType=FileWriter processorwriter.nextStage=null ! processorwriter.outputFile=${system.get("babeldoc.home")}/readme/userguide/processors.xml |
|
From: bruce m. <tr...@us...> - 2004-08-06 18:46:05
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/config/i18n In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24050/modules/core/config/i18n Modified Files: messages.properties Log Message: documentation, javadoc and formatting here. Index: messages.properties =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/config/i18n/messages.properties,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** messages.properties 28 Jul 2004 21:44:18 -0000 1.29 --- messages.properties 6 Aug 2004 18:45:56 -0000 1.30 *************** *** 231,235 **** 100032=Could not login into ftp server 100033=Using the java.beans.XMLDecoder object to unpersist the document contents in Java objects ! 100034=Format the document using JTidy 100035=default indentation 100036=default wrap margin --- 231,235 ---- 100032=Could not login into ftp server 100033=Using the java.beans.XMLDecoder object to unpersist the document contents in Java objects ! 100034=Format the pipeline document using JTidy. This is used to "clean-up" HTML documents into well-formed documents. 100035=default indentation 100036=default wrap margin *************** *** 319,328 **** 100150=Error setting attachments 100151=The mail format - text/plain or text/html - Deafult is text/plain ! 100170=Send this document to a tcp/ip socket 100171=The name of the host 100172=The ip address of the host 100173=The port number 100174=Neither host ip or host name provided ! 100210=Velocity templatize the document 100211=Error templatizing the document 100220=Use XPath expressions to extract nodes from the document and store them as attributes on the document. This pipeline stage is widely use when data needs to be extracted from XML documents for router or calculation steps. The extracted attributes can be quickly and easily obtained using velocity $document.get and from the scripting stages. Routing decisions based on the document contents are also possible using this technique. --- 319,328 ---- 100150=Error setting attachments 100151=The mail format - text/plain or text/html - Deafult is text/plain ! 100170=Send the pipeline document contents to a tcp/ip socket. This is useful for low-level operations. 100171=The name of the host 100172=The ip address of the host 100173=The port number 100174=Neither host ip or host name provided ! 100210=This stage uses Velocity to templatize the document. The results of the operation will replace the original template. 100211=Error templatizing the document 100220=Use XPath expressions to extract nodes from the document and store them as attributes on the document. This pipeline stage is widely use when data needs to be extracted from XML documents for router or calculation steps. The extracted attributes can be quickly and easily obtained using velocity $document.get and from the scripting stages. Routing decisions based on the document contents are also possible using this technique. *************** *** 335,343 **** 100250=Transform the document using XSL 100251=The name of the XSL to convert the document ! 100260=Compress the document 100261=Compression type (zip or gzip) 100262=Error during compression 100263=Invalid compression type: {0} ! 100270=Compress the document 100271=Error during decompression 100289=Execute a user supplied script. This pipeline stage enables pipeline developers to create and manipulate documents in novel and unforeseen ways. --- 335,343 ---- 100250=Transform the document using XSL 100251=The name of the XSL to convert the document ! 100260=Compress the document using either zip or gzip compression. **EXPERIMENTAL** 100261=Compression type (zip or gzip) 100262=Error during compression 100263=Invalid compression type: {0} ! 100270=Decompress the document using either zip or gzip compression **EXPERIMENTAL** 100271=Error during decompression 100289=Execute a user supplied script. This pipeline stage enables pipeline developers to create and manipulate documents in novel and unforeseen ways. *************** *** 369,373 **** 100315=mail subject not specified ! core.pipeline.stage.domify.desc=Domify the document and save as an attribute core.pipeline.stage.domify.validate=Validate the XML. Default is false. core.pipeline.stage.domify.schema=The schema file to validate against --- 369,373 ---- 100315=mail subject not specified ! core.pipeline.stage.domify.desc=Domify the document contents (assumed to be XML) and save as an attribute on the pipeline document. core.pipeline.stage.domify.validate=Validate the XML. Default is false. core.pipeline.stage.domify.schema=The schema file to validate against *************** *** 378,383 **** core.pipeline.stage.callstage.discard=Discard the pipeline document from the called stage. ! core.pipeline.stage.enrich.desc=Adds attributes to the document. The value can be a velocity script. ! core.pipeline.stage.filewriter.desc=Writes the document to a disk file. The contents are written as binary or text data depending on the binary flag on the document. core.pipeline.stage.xslTransform.desc=Transform the document (has to be XML) using this XSL script. The script can access all of the babeldoc internals via a number of parameters. The parameters (accessed through the xsl:param element) which are always placed in the transformer are: pipelinestage and document. Other parameters may be placed on the transformer using the param option. --- 378,383 ---- core.pipeline.stage.callstage.discard=Discard the pipeline document from the called stage. ! core.pipeline.stage.enrich.desc=Adds attributes to the document. The value of the attribute can be a constant value or a velocity script. ! core.pipeline.stage.filewriter.desc=Writes the document to a disk file. The contents are written as binary or text data depending on the binary flag on the document. When the pipeline document has been written to disk, this stage can optionally create a 'done' file which could act as a flag file for external processes indicating that the output file is completely written. core.pipeline.stage.xslTransform.desc=Transform the document (has to be XML) using this XSL script. The script can access all of the babeldoc internals via a number of parameters. The parameters (accessed through the xsl:param element) which are always placed in the transformer are: pipelinestage and document. Other parameters may be placed on the transformer using the param option. *************** *** 387,391 **** core.pipeline.stage.xslTransform.nodoc=The input document to this pipeline stage has zero length. The pipeline stage requires a valid XML document for processing. ! core.pipeline.stage.externalapplication.description=This pipeline stage allows for external applications to be run. Optionally the pipeline document is piped to the application. core.pipeline.stage.externalapplication.opt.application=Full path to the application to run core.pipeline.stage.externalapplication.opt.pipeout=Pipe the current document to the script - the script must fully accept the stardard input otherwise an exception is thrown. Boolean default is false. --- 387,391 ---- core.pipeline.stage.xslTransform.nodoc=The input document to this pipeline stage has zero length. The pipeline stage requires a valid XML document for processing. ! core.pipeline.stage.externalapplication.description=This pipeline stage allows for external applications to be run. Optionally the pipeline document contents is piped to the application as standard input or the output of the application can be read as a new pipeline document. core.pipeline.stage.externalapplication.opt.application=Full path to the application to run core.pipeline.stage.externalapplication.opt.pipeout=Pipe the current document to the script - the script must fully accept the stardard input otherwise an exception is thrown. Boolean default is false. *************** *** 401,406 **** 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 --- 401,406 ---- 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 - the pipeline document is simply passed, unprocessed, to the next stage. Useful to quickly disable parts of a pipeline. ! core.pipeline.stageinfo.tracked=If this is set then this stage is tracked - the pipeline document is written to the journal. 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-08-06 18:46:05
|
Update of /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/excel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24050/modules/conversion/src/com/babeldoc/conversion/excel Modified Files: ExcelConverter.java Log Message: documentation, javadoc and formatting here. Index: ExcelConverter.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/excel/ExcelConverter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExcelConverter.java 2 Jul 2004 14:49:55 -0000 1.4 --- ExcelConverter.java 6 Aug 2004 18:45:56 -0000 1.5 *************** *** 68,78 **** import com.babeldoc.conversion.ConversionException; import com.babeldoc.core.LogService; ! ! import org.apache.poi.hssf.model.Workbook; ! import org.apache.poi.hssf.usermodel.HSSFCell; ! import org.apache.poi.hssf.usermodel.HSSFDataFormat; ! import org.apache.poi.hssf.usermodel.HSSFRow; ! import org.apache.poi.hssf.usermodel.HSSFSheet; ! import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.dom4j.Document; --- 68,72 ---- import com.babeldoc.conversion.ConversionException; import com.babeldoc.core.LogService; ! import org.apache.poi.hssf.usermodel.*; import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.dom4j.Document; *************** *** 83,90 **** import java.io.InputStream; import java.text.DecimalFormat; - import java.text.DecimalFormatSymbols; import java.text.NumberFormat; - import java.text.SimpleDateFormat; - import java.util.Date; import java.util.HashMap; import java.util.Iterator; --- 77,81 ---- *************** *** 99,112 **** public class ExcelConverter { - /** - * Convert a input stream of excel file as input to an xml document. - * - * @param in excel file stream - * @return the document - * @throws com.babeldoc.conversion.ConversionException - */ private HashMap workBookAttributes = new HashMap(); private String locale = null; ! public Document toXml(InputStream in) throws ConversionException { --- 90,103 ---- public class ExcelConverter { private HashMap workBookAttributes = new HashMap(); private String locale = null; ! ! /** ! * Convert a input stream of excel file as input to an xml document. ! * ! * @param in excel file stream ! * @return the document ! * @throws com.babeldoc.conversion.ConversionException ! */ public Document toXml(InputStream in) throws ConversionException { |
|
From: easter <ea...@fr...> - 2004-08-05 08:24:44
|
All, It's difficult to predict all the funny ways we can use build files in our various development environments (via Eclipse, Netbeans, XEmacs etc) so I can only test my changes for my particular config (following Ant standard guidelines for build files). Although it's unlikely, unless you are doing something strange, please let me know if this change breaks something for you, so I can help debug it. Hopefully we can now remove these .bat and .sh scripts which we don't seem to have any real need for other than limiting our compile platforms. ea >Update of /cvsroot/babeldoc/babeldoc >In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9583 > >Modified Files: > build.xml >Log Message: >No longer need the silly batch/.sh files to build the workspace. >Targets properly modified to handle the various dependancies, such as the missing "setup" dependancy from the "build" target. > >Index: build.xml >=================================================================== >RCS file: /cvsroot/babeldoc/babeldoc/build.xml,v >retrieving revision 1.19 >retrieving revision 1.20 >diff -C2 -d -r1.19 -r1.20 >*** build.xml 23 Jul 2004 22:12:50 -0000 1.19 >--- build.xml 5 Aug 2004 08:14:17 -0000 1.20 >*************** >*** 10,14 **** > <property file="build.properties"/> > >! <!-- Load the local customizations --> > <property file="local.properties"/> > >--- 10,14 ---- > <property file="build.properties"/> > >! <!-- Load the local customizations --> > <property file="local.properties"/> > >*************** >*** 16,19 **** >--- 16,22 ---- > <property name="base_dir" value="${basedir}"/> > >+ <property name="babeldoc.bootstrap.jar" value="${basedir}/support/ant/lib/babeldoc_bootstrap.jar" /> >+ <property name="jalopy.jar" value="${basedir}/support/jalopy/lib/jalopy-ant-0.6.1.jar" /> >+ > <!-- > Build the source distribution package >*************** >*** 89,93 **** > </javac> > <jar >! jarfile="support/ant/lib/babeldoc_bootstrap.jar" > basedir="support/build"/> > </target> >--- 92,96 ---- > </javac> > <jar >! jarfile="${babeldoc.bootstrap.jar}" > basedir="support/build"/> > </target> >*************** >*** 98,110 **** > <target > name="declare" >! description="Declare the babeldoc tasks"> > <taskdef name="modulefinder" >! classname="com.babeldoc.bootstrap.ant.ModuleFinder"/> > <taskdef name="pathtrimmer" >! classname="com.babeldoc.bootstrap.ant.PathTrimmer"/> > <taskdef name="moduleRunner" >! classname="com.babeldoc.bootstrap.ant.ModuleRunnerTask"/> > <taskdef name="jalopy" >! classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"/> > </target> > >--- 101,133 ---- > <target > name="declare" >! description="Declare the babeldoc tasks" >! depends="bootstrap"> > <taskdef name="modulefinder" >! classname="com.babeldoc.bootstrap.ant.ModuleFinder"> >! <classpath> >! <pathelement location="${babeldoc.bootstrap.jar}"/> >! </classpath> >! </taskdef> >! > <taskdef name="pathtrimmer" >! classname="com.babeldoc.bootstrap.ant.PathTrimmer"> >! <classpath> >! <pathelement location="${babeldoc.bootstrap.jar}"/> >! </classpath> >! </taskdef> >! > <taskdef name="moduleRunner" >! classname="com.babeldoc.bootstrap.ant.ModuleRunnerTask"> >! <classpath> >! <pathelement location="${babeldoc.bootstrap.jar}"/> >! </classpath> >! </taskdef> >! > <taskdef name="jalopy" >! classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"> >! <classpath> >! <pathelement location="${jalopy.jar}"/> >! </classpath> >! </taskdef> > </target> > >*************** >*** 172,180 **** > name="setup" > depends="depends"> >! <mkdir dir="./build"/> >! <mkdir dir="./build/lib"/> >! <mkdir dir="./build/examples"/> >! <mkdir dir="./build/readme"/> >! <mkdir dir="./build/support"/> > <moduleRunner target="setup" modules="${babeldoc_modules}"/> > </target> >--- 195,203 ---- > name="setup" > depends="depends"> >! <mkdir dir="${basedir}/build"/> >! <mkdir dir="${basedir}/build/lib"/> >! <mkdir dir="${basedir}/build/examples"/> >! <mkdir dir="${basedir}/build/readme"/> >! <mkdir dir="${basedir}/build/support"/> > <moduleRunner target="setup" modules="${babeldoc_modules}"/> > </target> >*************** >*** 185,191 **** > <target > name="build" >! depends="depends"> > <!--<echo message="${build.compiler}"/>--> >! <available file="./build" type="dir" property="setup.done"/> > <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> > >--- 208,214 ---- > <target > name="build" >! depends="setup"> > <!--<echo message="${build.compiler}"/>--> >! <available file="${basedir}/build" type="dir" property="setup.done"/> > <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> > >*************** >*** 202,206 **** > name="deploy" > depends="depends"> >! <available file="./build" type="dir" property="setup.done"/> > <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> > <moduleRunner target="deploy" modules="${babeldoc_modules}"/> >--- 225,229 ---- > name="deploy" > depends="depends"> >! <available file="${basedir}/build" type="dir" property="setup.done"/> > <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> > <moduleRunner target="deploy" modules="${babeldoc_modules}"/> >*************** >*** 214,218 **** > name="test" > depends="depends"> >! <available file="./build" type="dir" property="setup.done"/> > <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> > <moduleRunner target="test" modules="${babeldoc_modules}"/> >--- 237,241 ---- > name="test" > depends="depends"> >! <available file="${basedir}/build" type="dir" property="setup.done"/> > <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> > <moduleRunner target="test" modules="${babeldoc_modules}"/> > > > >------------------------------------------------------- >This SF.Net email is sponsored by OSTG. Have you noticed the changes on >Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now, >one more big change to announce. We are now OSTG- Open Source Technology >Group. Come see the changes on the new OSTG site. www.ostg.com >_______________________________________________ >Babeldoc-devel mailing list >Bab...@li... >https://lists.sourceforge.net/lists/listinfo/babeldoc-devel > > > > |
|
From: Web H. <web...@us...> - 2004-08-05 08:14:34
|
Update of /cvsroot/babeldoc/babeldoc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9583 Modified Files: build.xml Log Message: No longer need the silly batch/.sh files to build the workspace. Targets properly modified to handle the various dependancies, such as the missing "setup" dependancy from the "build" target. Index: build.xml =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/build.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** build.xml 23 Jul 2004 22:12:50 -0000 1.19 --- build.xml 5 Aug 2004 08:14:17 -0000 1.20 *************** *** 10,14 **** <property file="build.properties"/> ! <!-- Load the local customizations --> <property file="local.properties"/> --- 10,14 ---- <property file="build.properties"/> ! <!-- Load the local customizations --> <property file="local.properties"/> *************** *** 16,19 **** --- 16,22 ---- <property name="base_dir" value="${basedir}"/> + <property name="babeldoc.bootstrap.jar" value="${basedir}/support/ant/lib/babeldoc_bootstrap.jar" /> + <property name="jalopy.jar" value="${basedir}/support/jalopy/lib/jalopy-ant-0.6.1.jar" /> + <!-- Build the source distribution package *************** *** 89,93 **** </javac> <jar ! jarfile="support/ant/lib/babeldoc_bootstrap.jar" basedir="support/build"/> </target> --- 92,96 ---- </javac> <jar ! jarfile="${babeldoc.bootstrap.jar}" basedir="support/build"/> </target> *************** *** 98,110 **** <target name="declare" ! description="Declare the babeldoc tasks"> <taskdef name="modulefinder" ! classname="com.babeldoc.bootstrap.ant.ModuleFinder"/> <taskdef name="pathtrimmer" ! classname="com.babeldoc.bootstrap.ant.PathTrimmer"/> <taskdef name="moduleRunner" ! classname="com.babeldoc.bootstrap.ant.ModuleRunnerTask"/> <taskdef name="jalopy" ! classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"/> </target> --- 101,133 ---- <target name="declare" ! description="Declare the babeldoc tasks" ! depends="bootstrap"> <taskdef name="modulefinder" ! classname="com.babeldoc.bootstrap.ant.ModuleFinder"> ! <classpath> ! <pathelement location="${babeldoc.bootstrap.jar}"/> ! </classpath> ! </taskdef> ! <taskdef name="pathtrimmer" ! classname="com.babeldoc.bootstrap.ant.PathTrimmer"> ! <classpath> ! <pathelement location="${babeldoc.bootstrap.jar}"/> ! </classpath> ! </taskdef> ! <taskdef name="moduleRunner" ! classname="com.babeldoc.bootstrap.ant.ModuleRunnerTask"> ! <classpath> ! <pathelement location="${babeldoc.bootstrap.jar}"/> ! </classpath> ! </taskdef> ! <taskdef name="jalopy" ! classname="de.hunsicker.jalopy.plugin.ant.AntPlugin"> ! <classpath> ! <pathelement location="${jalopy.jar}"/> ! </classpath> ! </taskdef> </target> *************** *** 172,180 **** name="setup" depends="depends"> ! <mkdir dir="./build"/> ! <mkdir dir="./build/lib"/> ! <mkdir dir="./build/examples"/> ! <mkdir dir="./build/readme"/> ! <mkdir dir="./build/support"/> <moduleRunner target="setup" modules="${babeldoc_modules}"/> </target> --- 195,203 ---- name="setup" depends="depends"> ! <mkdir dir="${basedir}/build"/> ! <mkdir dir="${basedir}/build/lib"/> ! <mkdir dir="${basedir}/build/examples"/> ! <mkdir dir="${basedir}/build/readme"/> ! <mkdir dir="${basedir}/build/support"/> <moduleRunner target="setup" modules="${babeldoc_modules}"/> </target> *************** *** 185,191 **** <target name="build" ! depends="depends"> <!--<echo message="${build.compiler}"/>--> ! <available file="./build" type="dir" property="setup.done"/> <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> --- 208,214 ---- <target name="build" ! depends="setup"> <!--<echo message="${build.compiler}"/>--> ! <available file="${basedir}/build" type="dir" property="setup.done"/> <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> *************** *** 202,206 **** name="deploy" depends="depends"> ! <available file="./build" type="dir" property="setup.done"/> <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> <moduleRunner target="deploy" modules="${babeldoc_modules}"/> --- 225,229 ---- name="deploy" depends="depends"> ! <available file="${basedir}/build" type="dir" property="setup.done"/> <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> <moduleRunner target="deploy" modules="${babeldoc_modules}"/> *************** *** 214,218 **** name="test" depends="depends"> ! <available file="./build" type="dir" property="setup.done"/> <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> <moduleRunner target="test" modules="${babeldoc_modules}"/> --- 237,241 ---- name="test" depends="depends"> ! <available file="${basedir}/build" type="dir" property="setup.done"/> <fail message="Setup has not been run - run 'build setup' first" unless="setup.done"/> <moduleRunner target="test" modules="${babeldoc_modules}"/> |
|
From: easter <ea...@fr...> - 2004-08-02 12:32:14
|
easter wrote: > No, it's not Mike. > > I have instrumented a Babeldoc core using Java Management Extensions > (JMX, part of JDK1.5) > This allows me to connect to it and manipulate it's exposed management > interface remotely. > So I have a little bootstrap class which correctly sets all the > babeldoc variables such as babeldoc.user etc, and then I run the > > com.babeldoc.init.Main.main(args) to get the babeldoc portion started. > > I then connect from another machine to the running Babeldoc scenario > via the JMX remote interface, and I can inject documents into, and > manipulate all the managed objects from the remote management console. > Two things I need to do are : > 1)Reset the Babeldoc I started by calling the methond > "com.babeldoc.init.Main.main(args)", e.g. stop it, reset > babeldoc.user, and then start it again so it can load a new pipeline > configuration, without exiting the JVM. > 2)Be able to configure a running pipeline configuration to for > example, insert a stage, or remove a stage, without exiting the JVM. > > So for example, how do you stop the thread started by > com.babeldoc.init.Main.main(args)? > > Thanks > s > > > > > McDonald, Bruce wrote: > >> Mike (it is mike?!) >> >> Can you explain about what you want to do? It appears that you are not >> starting babeldoc from the babeldoc script. So you are starting it >> from some kind of development environment? Also, since your pipeline >> is "always on" you must be running a scanner or someother kind of >> feeder... >> >> Can you provide some more details. >> >> But as to changing the pipeline, this should be possible - you might >> need to flush some caches, etc, but this should be doable. >> >> regards, >> Bruce. >> >> -----Original Message----- >> From: bab...@li... >> [mailto:bab...@li...]On Behalf Of easter >> Sent: Monday, August 02, 2004 3:32 AM >> To: bab...@li... >> Subject: [Babeldoc-devel] How to control Babeldoc programmatically? >> >> >> Hi, >> >> I am currently launching Babeldoc using the call : >> com.babeldoc.init.Main.main(args); >> >> But I need to do a bit more advanced maniplation now. Is it possible >> to now do the following : >> 1)Load a new Pipeline, ie. stop the old one (as started above) and >> set a new Babeldoc home and have this new scenario started >> >> 2)Modify the current pipeline, for example inserting or removing >> stages once it's been loaded as above. >> >> Any pointers or hints would be greatly appreciated. >> >> e. >> >> >> ------------------------------------------------------- >> This SF.Net email is sponsored by OSTG. Have you noticed the changes on >> Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now, >> one more big change to announce. We are now OSTG- Open Source Technology >> Group. Come see the changes on the new OSTG site. www.ostg.com >> _______________________________________________ >> Babeldoc-devel mailing list >> Bab...@li... >> https://lists.sourceforge.net/lists/listinfo/babeldoc-devel >> >> >> >> > > |
|
From: McDonald, B. <Bru...@ba...> - 2004-08-02 12:13:21
|
Mike (it is mike?!)
Can you explain about what you want to do? It appears that you are not
starting babeldoc from the babeldoc script. So you are starting it from some kind of development environment? Also, since your pipeline is "always on" you must be running a scanner or someother kind of feeder...
Can you provide some more details.
But as to changing the pipeline, this should be possible - you might need to flush some caches, etc, but this should be doable.
regards,
Bruce.
-----Original Message-----
From: bab...@li...
[mailto:bab...@li...]On Behalf Of easter
Sent: Monday, August 02, 2004 3:32 AM
To: bab...@li...
Subject: [Babeldoc-devel] How to control Babeldoc programmatically?
Hi,
I am currently launching Babeldoc using the call :
com.babeldoc.init.Main.main(args);
But I need to do a bit more advanced maniplation now. Is it possible to
now do the following :
1)Load a new Pipeline, ie. stop the old one (as started above) and set a
new Babeldoc home and have this new scenario started
2)Modify the current pipeline, for example inserting or removing stages
once it's been loaded as above.
Any pointers or hints would be greatly appreciated.
e.
-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
_______________________________________________
Babeldoc-devel mailing list
Bab...@li...
https://lists.sourceforge.net/lists/listinfo/babeldoc-devel
|
|
From: easter <ea...@fr...> - 2004-08-02 07:30:12
|
Hi,
I am currently launching Babeldoc using the call :
com.babeldoc.init.Main.main(args);
But I need to do a bit more advanced maniplation now. Is it possible to
now do the following :
1)Load a new Pipeline, ie. stop the old one (as started above) and set a
new Babeldoc home and have this new scenario started
2)Modify the current pipeline, for example inserting or removing stages
once it's been loaded as above.
Any pointers or hints would be greatly appreciated.
e.
|
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:43
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/journal/simple Modified Files: SimpleJournal.java Log Message: javadoc and formatting here. Index: SimpleJournal.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/simple/SimpleJournal.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SimpleJournal.java 24 Jul 2004 00:18:50 -0000 1.12 --- SimpleJournal.java 30 Jul 2004 01:33:01 -0000 1.13 *************** *** 115,157 **** */ public class SimpleJournal extends Journal { ! /** constants: configuration name */ public static final String CONFIG_NAME = "journal/simple/config"; ! /** constants: journal directory */ public static final String JOURNAL_DIR = "simpleJournalDir"; ! /** constants: journal log file */ public static final String JOURNAL_LOGFILE = "simpleJournalLog"; ! /** constants: max log file before it is rolled */ public static final String JOURNAL_MAXSIZE = "logMaxSize"; ! /** constants: configuration name */ public static final String JOURNAL_DUMMY = "dummy"; ! /** constants: default max log size */ public static final int DEFAULT_LOGSIZE = 1024 * 1024; ! /** constants: configuration name */ public static final String NULL = "null"; ! /** Message for the log */ public static final String LOG_SEP = ","; public static final String EOL = System.getProperty("line.separator"); public static final String DELTA_SUFFIX = ".delta"; public static final String ATTR_SUFFIX = ".attr"; ! /** Configuration stuff */ private FileWriter logWriter; private CSVWriter logPrinter; private String logFile; private int logMaxSize; ! /** Locals */ private String trackerDir; private static long lastTicketVal; private IConfigInfo info; ! /** log setup */ private LogService log = LogService.getInstance(SimpleJournal.class.getName()); --- 115,165 ---- */ public class SimpleJournal extends Journal { ! /** constants: configuration name. */ public static final String CONFIG_NAME = "journal/simple/config"; ! /** constants: journal directory. */ public static final String JOURNAL_DIR = "simpleJournalDir"; ! /** constants: journal log file. */ public static final String JOURNAL_LOGFILE = "simpleJournalLog"; ! /** constants: max log file before it is rolled. */ public static final String JOURNAL_MAXSIZE = "logMaxSize"; ! /** constants: configuration name. */ public static final String JOURNAL_DUMMY = "dummy"; ! /** constants: default max log size. */ public static final int DEFAULT_LOGSIZE = 1024 * 1024; ! /** constants: configuration name. */ public static final String NULL = "null"; ! /** Column separator. */ public static final String LOG_SEP = ","; + /** line separator. */ public static final String EOL = System.getProperty("line.separator"); + /** delta file marker. */ public static final String DELTA_SUFFIX = ".delta"; + /** attribute file marker. */ public static final String ATTR_SUFFIX = ".attr"; ! /** file writer for logging. */ private FileWriter logWriter; + /** csv writer for logging (built from logWriter). */ private CSVWriter logPrinter; + /** name of the log file. */ private String logFile; + /** max size of the log file. */ private int logMaxSize; ! /** directory of the journal files. */ private String trackerDir; + /** the last ticket value. */ private static long lastTicketVal; + /** stored configuration information. */ private IConfigInfo info; ! /** log setup. */ private LogService log = LogService.getInstance(SimpleJournal.class.getName()); *************** *** 161,168 **** * * @param parent - * * @return array of child tickets. ! * ! * @throws JournalException DOCUMENT ME! */ public synchronized IJournalTicket[] getAllChildTickets(IJournalTicket parent) --- 169,174 ---- * * @param parent * @return array of child tickets. ! * @throws JournalException */ public synchronized IJournalTicket[] getAllChildTickets(IJournalTicket parent) *************** *** 194,201 **** * * @param ticket number - * * @return array of querytickets ! * ! * @throws JournalException DOCUMENT ME! */ public synchronized QueryTicket[] getAllTicketSteps(IJournalTicket ticket) --- 200,205 ---- * * @param ticket number * @return array of querytickets ! * @throws JournalException */ public synchronized QueryTicket[] getAllTicketSteps(IJournalTicket ticket) *************** *** 238,242 **** * @param step - the step to replay from * ! * @return * * @throws JournalException --- 242,246 ---- * @param step - the step to replay from * ! * @return pipeline document * * @throws JournalException *************** *** 286,293 **** * * @param ticketId the ticket identifier - * * @return IJournalTicket for this string ! * ! * @throws JournalException DOCUMENT ME! */ public synchronized IJournalTicket getTicket(String ticketId) --- 290,295 ---- * * @param ticketId the ticket identifier * @return IJournalTicket for this string ! * @throws JournalException */ public synchronized IJournalTicket getTicket(String ticketId) *************** *** 377,381 **** * Make a dummy ticket. * ! * @return * * @throws JournalException --- 379,383 ---- * Make a dummy ticket. * ! * @return dummy ticket * * @throws JournalException *************** *** 391,398 **** * * @param parentTicket the ticket to be forked - * * @return the forked child ticket ! * ! * @throws JournalException DOCUMENT ME! */ public synchronized IJournalTicket forkTicket(IJournalTicket parentTicket) --- 393,398 ---- * * @param parentTicket the ticket to be forked * @return the forked child ticket ! * @throws JournalException */ public synchronized IJournalTicket forkTicket(IJournalTicket parentTicket) *************** *** 421,426 **** * * @return the journal ticket ! * ! * @throws JournalException DOCUMENT ME! */ public synchronized IJournalTicket newTicket() throws JournalException { --- 421,425 ---- * * @return the journal ticket ! * @throws JournalException */ public synchronized IJournalTicket newTicket() throws JournalException { *************** *** 438,450 **** /** ! * Log string to the log file * ! * @param ticket ! * @param operation ! * @param other ! * @param stage ! * @param data * ! * @throws JournalException DOCUMENT ME! */ protected synchronized void log(IJournalTicket ticket, --- 437,449 ---- /** ! * Log string to the log file. * ! * @param ticket ticket to log ! * @param operation operation to log ! * @param other other data to log ! * @param stage stage name to log ! * @param data additional data to log * ! * @throws JournalException journal exception */ protected synchronized void log(IJournalTicket ticket, *************** *** 492,498 **** /** ! * Roll the log file if necessary * ! * @throws IOException DOCUMENT ME! */ protected void rollLogFile() throws IOException { --- 491,497 ---- /** ! * Roll the log file if necessary. * ! * @throws IOException exception */ protected void rollLogFile() throws IOException { *************** *** 512,519 **** /** ! * Make a file object for the ticket ! * ! * @param ticket * * @return the log director for the ticket */ --- 511,517 ---- /** ! * Make a file object for the ticket. * + * @param ticket ticket object. * @return the log director for the ticket */ *************** *** 545,549 **** /** ! * Make a file name for the attributes at the step * * @param ticket - the ticket file --- 543,547 ---- /** ! * Make a file name for the attributes at the step. * * @param ticket - the ticket file *************** *** 558,562 **** /** ! * Make a file name for the ticket at the step * * @param ticket - the ticket file --- 556,560 ---- /** ! * Make a file name for the ticket at the step. * * @param ticket - the ticket file *************** *** 591,602 **** /** ! * write a new logged operation ! * ! * @param ticket ! * @param data * * @return the ticket step ! * ! * @throws JournalException DOCUMENT ME! */ private int writeNewLoggedOperation(IJournalTicket ticket, Object data) --- 589,598 ---- /** ! * write a new logged operation. * + * @param ticket ticket to write + * @param data data to write * @return the ticket step ! * @throws JournalException */ private int writeNewLoggedOperation(IJournalTicket ticket, Object data) *************** *** 628,632 **** /** ! * Get the configuration iformation for this class * * @return IConfigInfo object --- 624,628 ---- /** ! * Get the configuration iformation for this class. * * @return IConfigInfo object *************** *** 677,683 **** /** ! * Setup the log printer * ! * @return */ protected CSVWriter getLogPrinter() { --- 673,679 ---- /** ! * Setup the log printer. * ! * @return printer object. */ protected CSVWriter getLogPrinter() { *************** *** 689,695 **** /** ! * Get the log writer * ! * @return */ protected FileWriter getLogWriter() { --- 685,691 ---- /** ! * Get the log writer. * ! * @return log writer */ protected FileWriter getLogWriter() { *************** *** 705,711 **** /** ! * Get the log file configuration * ! * @return */ protected String getLogFile() { --- 701,707 ---- /** ! * Get the log file configuration. * ! * @return log file name */ protected String getLogFile() { *************** *** 722,726 **** * Get the maximum size of the log file before it is rolled. * ! * @return */ protected int getLogMaxSize() { --- 718,722 ---- * Get the maximum size of the log file before it is rolled. * ! * @return max log size. */ protected int getLogMaxSize() { *************** *** 734,740 **** /** ! * Get the tracker dir * ! * @return */ protected String getTrackerDir() { --- 730,736 ---- /** ! * Get the tracker directory. * ! * @return tracker directory. */ protected String getTrackerDir() { *************** *** 751,754 **** --- 747,755 ---- } + /** + * get the last ticket value. + * + * @return last ticket value. + */ protected static long getLastTicketVal() { return lastTicketVal; |
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:42
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/compiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/pipeline/compiler Modified Files: PipelineClassLoader.java PipelineStageCompiler.java Log Message: javadoc and formatting here. Index: PipelineStageCompiler.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/compiler/PipelineStageCompiler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PipelineStageCompiler.java 27 Jun 2003 02:19:59 -0000 1.2 --- PipelineStageCompiler.java 30 Jul 2004 01:33:02 -0000 1.3 *************** *** 98,117 **** */ public class PipelineStageCompiler { ! /** constant: the name of the configuration */ public static final String CONFIG_NAME = "pipeline/compiler"; ! /** constant: the name of the namespace property key */ public static final String NAMESPACE = "namespace"; ! /** constant: the name of the namespace property key */ public static final String COMPILER = "compile"; ! /** static: the singleton reference */ private static PipelineStageCompiler pipelineStageCompiler = null; ! /** instance: hashmap of the class loaders out there */ HashMap loaders = null; ! /** instance: temporary measure - single class loader for all pipelines */ PipelineClassLoader loader = null; --- 98,117 ---- */ public class PipelineStageCompiler { ! /** constant: the name of the configuration. */ public static final String CONFIG_NAME = "pipeline/compiler"; ! /** constant: the name of the namespace property key. */ public static final String NAMESPACE = "namespace"; ! /** constant: the name of the namespace property key. */ public static final String COMPILER = "compile"; ! /** static: the singleton reference. */ private static PipelineStageCompiler pipelineStageCompiler = null; ! /** instance: hashmap of the class loaders out there. */ HashMap loaders = null; ! /** instance: temporary measure - single class loader for all pipelines. */ PipelineClassLoader loader = null; *************** *** 131,135 **** } ! LogService.getInstance().logDebug("[PipelineStageCompiler.PipelineStageCompiler] creating class loader \"" + namespace + "\""); loader = new PipelineClassLoader(namespace); --- 131,136 ---- } ! if(LogService.getInstance().isDebugEnabled()) ! LogService.getInstance().logDebug("Creating class loader \"" + namespace + "\""); loader = new PipelineClassLoader(namespace); *************** *** 138,144 **** /** ! * Get the pipeline stage factory * ! * @return DOCUMENT ME! */ public static PipelineStageCompiler getInstance() { --- 139,145 ---- /** ! * Get the pipeline stage factory. * ! * @return instance of the pipeline stage compiler */ public static PipelineStageCompiler getInstance() { *************** *** 151,160 **** /** ! * Get the pipeline stage factory this pipeline stage factory name * * @param pFactory the factory of the pipeline * @param name the name of pipelinestage factory * ! * @return */ public IPipelineStageFactory getPipelineStageFactory( --- 152,161 ---- /** ! * Get the pipeline stage factory this pipeline stage factory name. * * @param pFactory the factory of the pipeline * @param name the name of pipelinestage factory * ! * @return pipeline stage factory. */ public IPipelineStageFactory getPipelineStageFactory( Index: PipelineClassLoader.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/compiler/PipelineClassLoader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PipelineClassLoader.java 27 Jun 2003 02:19:59 -0000 1.2 --- PipelineClassLoader.java 30 Jul 2004 01:33:02 -0000 1.3 *************** *** 66,93 **** package com.babeldoc.core.pipeline.compiler; /** ! * <strong>PipelineClassLoader</strong> ! * ! * <p> ! * This is pipeline classloader for getting the created classes. Now if the * class does not exist, then this will delegate (to where?) to create the ! * classes using bcel ! * </p> ! * ! * <p> ! * Title: Babel ! * </p> ! * ! * <p> ! * Description: Universal Document Processor ! * </p> ! * ! * <p> ! * Copyright: Copyright (c) 2002 ! * </p> ! * ! * <p> ! * Company: ! * </p> * * @author Bmcdonald --- 66,76 ---- package com.babeldoc.core.pipeline.compiler; + import com.babeldoc.core.pipeline.PipelineFactory; + import com.babeldoc.core.pipeline.IPipelineStageFactory; + /** ! * This is pipeline classloader for getting the compiled/created classes. Now if the * class does not exist, then this will delegate (to where?) to create the ! * classes using bcel or javaassist. * * @author Bmcdonald *************** *** 95,104 **** */ public class PipelineClassLoader extends ClassLoader { ! /** instance: the name of the pipeline "package" */ private String namespace; /** * Package level security for this classloader (not to be created out of this ! * package - just to be safe!) * * @param namespace the namespace to look for the pipelines --- 78,87 ---- */ public class PipelineClassLoader extends ClassLoader { ! /** instance: the name of the pipeline "package". */ private String namespace; /** * Package level security for this classloader (not to be created out of this ! * package - just to be safe!). * * @param namespace the namespace to look for the pipelines *************** *** 117,126 **** * of it. * ! * @param pFactory DOCUMENT ME! ! * @param name * ! * @return */ ! public com.babeldoc.core.pipeline.IPipelineStageFactory getCompiledPipelineStageFactory( com.babeldoc.core.pipeline.PipelineFactory pFactory, String name) { name += getNamespace(); --- 100,109 ---- * of it. * ! * @param pFactory pipeline factory ! * @param name nameof something * ! * @return compiled pipeline factory */ ! public IPipelineStageFactory getCompiledPipelineStageFactory( com.babeldoc.core.pipeline.PipelineFactory pFactory, String name) { name += getNamespace(); *************** *** 149,155 **** /** ! * Get the namespace * ! * @return */ public String getNamespace() { --- 132,138 ---- /** ! * Get the namespace. * ! * @return name space */ public String getNamespace() { *************** *** 158,165 **** /** ! * Load the class * * @param name the name of the pipeline to load. - * * @return the class */ --- 141,147 ---- /** ! * Load the class. * * @param name the name of the pipeline to load. * @return the class */ *************** *** 175,187 **** /** ! * Make the class using bcel for the name, factory * ! * @param pFactory DOCUMENT ME! ! * @param name DOCUMENT ME! * ! * @return DOCUMENT ME! */ ! protected byte[] compileFactory( ! com.babeldoc.core.pipeline.PipelineFactory pFactory, String name) { /* LogService.getInstance().logDebug("[PipelineClassLoader.compileFactory] Creating synthetic class"); --- 157,168 ---- /** ! * Make the class using bcel for the name, factory. * ! * @param pFactory pipeline factory ! * @param name name of something. * ! * @return byte array of compiled class */ ! protected byte[] compileFactory(PipelineFactory pFactory, String name) { /* LogService.getInstance().logDebug("[PipelineClassLoader.compileFactory] Creating synthetic class"); |
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:42
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/pipeline/command Modified Files: PipelineCommand.java PipelineCommandTest.java PipelineFeeder.java Log Message: javadoc and formatting here. Index: PipelineFeeder.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/command/PipelineFeeder.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PipelineFeeder.java 23 Jul 2004 22:38:08 -0000 1.11 --- PipelineFeeder.java 30 Jul 2004 01:33:02 -0000 1.12 *************** *** 85,89 **** /** ! * Introduce a document with attributes into the pipeline. See the usage * instructions for more help. This is a very useful command that is the main * front end for pipeline processing in babeldoc. It has a number of static --- 85,89 ---- /** ! * Feed a document (with attributes) into the pipeline. See the usage * instructions for more help. This is a very useful command that is the main * front end for pipeline processing in babeldoc. It has a number of static *************** *** 95,99 **** */ public class PipelineFeeder extends BabeldocCommand { ! /** constant attribute name for the filename */ public static final String FILE_NAME = "file_name"; --- 95,99 ---- */ public class PipelineFeeder extends BabeldocCommand { ! /** constant attribute name for the filename. */ public static final String FILE_NAME = "file_name"; *************** *** 101,107 **** /** ! * process the class * ! * @param args DOCUMENT ME! */ public PipelineFeeder(String[] args) { --- 101,107 ---- /** ! * process the class. * ! * @param args command line arguments */ public PipelineFeeder(String[] args) { *************** *** 111,115 **** /** * Extract a set of properties from the command line arguments skipping the ! * first argument which is the pipeline stage name * * @param args the array of command line arguments --- 111,115 ---- /** * Extract a set of properties from the command line arguments skipping the ! * first argument which is the pipeline stage name. * * @param args the array of command line arguments *************** *** 137,141 **** /** ! * Execute the command * * @param commandLine The command line. --- 137,141 ---- /** ! * Execute the command. * * @param commandLine The command line. *************** *** 172,176 **** /** ! * Main entry point * * @param args the name of the stage and the name=value pairs --- 172,176 ---- /** ! * Main entry point. * * @param args the name of the stage and the name=value pairs Index: PipelineCommandTest.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/command/PipelineCommandTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PipelineCommandTest.java 16 Sep 2003 05:19:01 -0000 1.4 --- PipelineCommandTest.java 30 Jul 2004 01:33:02 -0000 1.5 *************** *** 82,86 **** * Creates a new PipelineCommandTest object. * ! * @param testName DOCUMENT ME! */ public PipelineCommandTest(String testName) { --- 82,86 ---- * Creates a new PipelineCommandTest object. * ! * @param testName junit test name */ public PipelineCommandTest(String testName) { *************** *** 91,95 **** * Run all the test methods in this class. * ! * @param args DOCUMENT ME! */ public static void main(String[] args) { --- 91,95 ---- * Run all the test methods in this class. * ! * @param args command line arguments */ public static void main(String[] args) { *************** *** 98,102 **** /** ! * Make a test suite * * @return get the test suite --- 98,102 ---- /** ! * Make a test suite. * * @return get the test suite *************** *** 109,113 **** /** ! * setup the test pipeline and stage */ public void testPipelineAndStage() { --- 109,113 ---- /** ! * setup the test pipeline and stage. */ public void testPipelineAndStage() { *************** *** 119,123 **** /** ! * Setup the test * * @throws Exception --- 119,123 ---- /** ! * Setup the test. * * @throws Exception *************** *** 128,132 **** /** ! * Teardown the test * * @throws Exception --- 128,132 ---- /** ! * Teardown the test. * * @throws Exception Index: PipelineCommand.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/command/PipelineCommand.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PipelineCommand.java 16 Sep 2003 05:19:01 -0000 1.11 --- PipelineCommand.java 30 Jul 2004 01:33:02 -0000 1.12 *************** *** 90,94 **** public class PipelineCommand extends BabeldocCommand { /** ! * Process the commands on the command line * * @param args the command line --- 90,94 ---- public class PipelineCommand extends BabeldocCommand { /** ! * Process the commands on the command line. * * @param args the command line *************** *** 99,105 **** /** ! * Process - list all the pipelines in the system * ! * @throws Exception DOCUMENT ME! */ public void doPipelineList() throws Exception { --- 99,105 ---- /** ! * Process - list all the pipelines in the system. * ! * @throws Exception */ public void doPipelineList() throws Exception { *************** *** 115,119 **** /** ! * Execute the command line * * @param commandLine to be executed --- 115,119 ---- /** ! * Execute the command line. * * @param commandLine to be executed *************** *** 143,149 **** /** ! * Main routine * ! * @param args */ public static void main(String[] args) { --- 143,149 ---- /** ! * Main routine. * ! * @param args command line arguments. */ public static void main(String[] args) { *************** *** 153,157 **** /** ! * Setup the command line arguments * * @param options the commandline options to look for --- 153,157 ---- /** ! * Setup the command line arguments. * * @param options the commandline options to look for *************** *** 195,203 **** /** ! * do configuration listing. ! * ! * @param pipelineStage * ! * @throws Exception DOCUMENT ME! */ protected void doConfig(String pipelineStage) throws Exception { --- 195,202 ---- /** ! * List all the configuratiooptions for the named pipeline stage. * ! * @param pipelineStage pipeline stage name to list ! * @throws Exception */ protected void doConfig(String pipelineStage) throws Exception { *************** *** 222,230 **** /** ! * do connectivity listing. ! * ! * @param pipelineRange * ! * @throws Exception DOCUMENT ME! */ protected void doConnectivity(String pipelineRange) throws Exception { --- 221,228 ---- /** ! * do connectivity listing of a range of pipeline stages. * ! * @param pipelineRange range of stages ! * @throws Exception */ protected void doConnectivity(String pipelineRange) throws Exception { *************** *** 264,272 **** /** ! * do type listing. ! * ! * @param pipelineStage * ! * @throws Exception DOCUMENT ME! */ protected void doType(String pipelineStage) throws Exception { --- 262,269 ---- /** ! * Get the type information for the pipeline stage name. * ! * @param pipelineStage name of the pipeline stage ! * @throws Exception */ protected void doType(String pipelineStage) throws Exception { *************** *** 285,293 **** /** ! * do xml listing. ! * ! * @param pipelineStage * ! * @throws Exception DOCUMENT ME! */ protected void doXml(String pipelineStage) throws Exception { --- 282,289 ---- /** ! * List the pipeline stage in XML format. * ! * @param pipelineStage pipeline stage name ! * @throws Exception */ protected void doXml(String pipelineStage) throws Exception { *************** *** 313,317 **** /** ! * Output the configuration information * * @param indent - indent spacing. --- 309,313 ---- /** ! * Output the configuration information. * * @param indent - indent spacing. *************** *** 349,359 **** /** ! * Get the pipeline stage factory for the pair * * @param pair the pipeline name/stage name pair - * * @return the pipeline stage factory. ! * ! * @throws PipelineException DOCUMENT ME! */ IPipelineStageFactory getPipelineStageFactory(com.babeldoc.core.Pair pair) --- 345,353 ---- /** ! * Get the pipeline stage factory for the pair. * * @param pair the pipeline name/stage name pair * @return the pipeline stage factory. ! * @throws PipelineException */ IPipelineStageFactory getPipelineStageFactory(com.babeldoc.core.Pair pair) *************** *** 374,380 **** * Process the list command - See the print usage for usage instructions. * ! * @param commandLine ! * ! * @throws Exception DOCUMENT ME! */ void doList(CommandLine commandLine) throws Exception { --- 368,373 ---- * Process the list command - See the print usage for usage instructions. * ! * @param commandLine processed command line ! * @throws Exception */ void doList(CommandLine commandLine) throws Exception { |
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:42
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/journal Modified Files: IJournal.java IJournalStatus.java IJournalTicket.java Journal.java JournalConfigInfo.java JournalException.java JournalFactory.java JournalOperation.java JournalStatus.java JournalTest.java JournalTicket.java JournalType.java Log Message: javadoc and formatting here. Index: IJournal.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/IJournal.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** IJournal.java 3 Sep 2003 03:25:30 -0000 1.8 --- IJournal.java 30 Jul 2004 01:33:00 -0000 1.9 *************** *** 73,77 **** /** ! * Interface for the tracking subsystem. This is meant to provide a means to * track a document through the system as well as reprocessing opportunities. * --- 73,77 ---- /** ! * Interface for the journalling subsystem. This is meant to provide a means to * track a document through the system as well as reprocessing opportunities. * *************** *** 81,90 **** public interface IJournal extends IConfigurable { /** ! * getChildrenTickets. Get all the tickets which are children of this ticket ! * ! * @param parent * * @return array of child tickets. */ public IJournalTicket[] getAllChildTickets(IJournalTicket parent) --- 81,91 ---- public interface IJournal extends IConfigurable { + /** ! * getChildrenTickets. Get all the tickets which are children of this ticket. * + * @param parent journal ticket to find all the children. * @return array of child tickets. + * @throws JournalException exception */ public IJournalTicket[] getAllChildTickets(IJournalTicket parent) *************** *** 94,100 **** * getJournalForTicket. Get all the ticketsteps for the ticket. * ! * @param ticket number ! * * @return array of querytickets */ public QueryTicket[] getAllTicketSteps(IJournalTicket ticket) --- 95,101 ---- * getJournalForTicket. Get all the ticketsteps for the ticket. * ! * @param ticket number to query * @return array of querytickets + * @throws JournalException exception */ public QueryTicket[] getAllTicketSteps(IJournalTicket ticket) *************** *** 106,112 **** * @param ticket - the ticket to replay * @param step - the step to replay from ! * ! * @return ! * * @throws com.babeldoc.core.journal.JournalException */ --- 107,111 ---- * @param ticket - the ticket to replay * @param step - the step to replay from ! * @return pipeline document at the ticket and step. * @throws com.babeldoc.core.journal.JournalException */ *************** *** 117,123 **** * Get an existing ticket from the string identifier. * ! * @param identifier ; ! * * @return the created tracker ticket */ public IJournalTicket getTicket(String identifier) throws JournalException; --- 116,122 ---- * Get an existing ticket from the string identifier. * ! * @param identifier the identifier to use to search for the ticket * @return the created tracker ticket + * @throws JournalException exception */ public IJournalTicket getTicket(String identifier) throws JournalException; *************** *** 128,133 **** * * @param jQuery journal query object - * * @return the results. */ public QueryTicket[] getTickets(JournalQuery jQuery) --- 127,132 ---- * * @param jQuery journal query object * @return the results. + * @throws JournalException exception */ public QueryTicket[] getTickets(JournalQuery jQuery) *************** *** 138,141 **** --- 137,141 ---- * * @return the created tracker ticket + * @throws JournalException exception */ public IJournalTicket dummyTicket() throws JournalException; *************** *** 145,150 **** * * @param parentTicket the creating ticket - * * @return the created tracker ticket */ public IJournalTicket forkTicket(IJournalTicket parentTicket) --- 145,150 ---- * * @param parentTicket the creating ticket * @return the created tracker ticket + * @throws JournalException exception */ public IJournalTicket forkTicket(IJournalTicket parentTicket) *************** *** 155,163 **** * * @return the created tracker ticket */ public IJournalTicket newTicket() throws JournalException; /** ! * Log a message into the log file * * @param ticket track the document --- 155,164 ---- * * @return the created tracker ticket + * @throws JournalException exception */ public IJournalTicket newTicket() throws JournalException; /** ! * Log a message into the log file. * * @param ticket track the document *************** *** 170,177 **** /** ! * Replay this ticket from the step * * @param ticket - the ticket to replay * @param step - the step to replay from */ public void replayTicket(IJournalTicket ticket, int step) --- 171,179 ---- /** ! * Replay this ticket from the step. * * @param ticket - the ticket to replay * @param step - the step to replay from + * @throws JournalException exception */ public void replayTicket(IJournalTicket ticket, int step) *************** *** 179,187 **** /** ! * Update a document associated with this ticket * * @param ticket - the ticket to replay * @param document the document to update * @param stage the pipeline stage resulting in this status change */ public void updateDocument(IJournalTicket ticket, PipelineDocument document, --- 181,190 ---- /** ! * Update a document associated with this ticket. * * @param ticket - the ticket to replay * @param document the document to update * @param stage the pipeline stage resulting in this status change + * @throws JournalException exception */ public void updateDocument(IJournalTicket ticket, PipelineDocument document, *************** *** 189,197 **** /** ! * Update the status of this ticket * * @param ticket - the ticket for this status * @param status - the status of the ticket * @param stage the pipeline stage resulting in this status change */ public void updateStatus(IJournalTicket ticket, IJournalStatus status, --- 192,201 ---- /** ! * Update the status of this ticket. * * @param ticket - the ticket for this status * @param status - the status of the ticket * @param stage the pipeline stage resulting in this status change + * @throws JournalException exception */ public void updateStatus(IJournalTicket ticket, IJournalStatus status, Index: IJournalTicket.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/IJournalTicket.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IJournalTicket.java 27 Jun 2003 02:19:57 -0000 1.3 --- IJournalTicket.java 30 Jul 2004 01:33:00 -0000 1.4 *************** *** 84,102 **** * journal but not actually do anything. * ! * @return */ public boolean isDummy(); /** ! * Get the identifier * ! * @return */ public String getId(); /** ! * Basic equality operator for identifier * ! * @return DOCUMENT ME! */ public boolean equals(String ticketId); --- 84,103 ---- * journal but not actually do anything. * ! * @return is this a dummy ticket? */ public boolean isDummy(); /** ! * Get the identifier. * ! * @return identifier */ public String getId(); /** ! * Basic equality operator for identifier. * ! * @param ticketId ticket to compare. ! * @return equality operator. */ public boolean equals(String ticketId); Index: JournalConfigInfo.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/JournalConfigInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JournalConfigInfo.java 3 Sep 2003 03:25:30 -0000 1.1 --- JournalConfigInfo.java 30 Jul 2004 01:33:00 -0000 1.2 *************** *** 8,12 **** /** ! * Journal configuration information class * * @author bmcdonald --- 8,13 ---- /** ! * Journal configuration information class. This is the base clss ! * for journal implementations to represent configuuration infos. * * @author bmcdonald *************** *** 16,27 **** extends ConfigInfo { ! /** Service type for pipeline stages */ public static final ServiceTypeConfigOptionType JOURNAL_TYPE = new ServiceTypeConfigOptionType(JournalType.SERVICE_PREFIX); /** ! * This method returns options that are general to all components * ! * @return comments */ public Collection getGeneralOptions() { --- 17,28 ---- extends ConfigInfo { ! /** Service type for pipeline stages. */ public static final ServiceTypeConfigOptionType JOURNAL_TYPE = new ServiceTypeConfigOptionType(JournalType.SERVICE_PREFIX); /** ! * This method returns options that are general to all components. * ! * @return collection of general optins. */ public Collection getGeneralOptions() { *************** *** 30,34 **** /** ! * Return an xmlized version of the of the config info * * @return String of configuration information. --- 31,35 ---- /** ! * Return an xmlized version of the of the config info. * * @return String of configuration information. Index: JournalType.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/JournalType.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JournalType.java 23 Jul 2004 22:31:54 -0000 1.6 --- JournalType.java 30 Jul 2004 01:33:00 -0000 1.7 *************** *** 70,74 **** /** ! * Characterize the type of journal. This type maps to a name and a class to * actually provide a concrete implementation. * --- 70,74 ---- /** ! * Represent the type of the journal. This type maps to a name and a class to * actually provide a concrete implementation. * *************** *** 90,97 **** /** ! * Get the class of the factory that implements the named factory type * * @param journalType journal name! - * * @return class of the user factory */ --- 90,96 ---- /** ! * Get the class of the factory that implements the named factory type. * * @param journalType journal name! * @return class of the user factory */ *************** *** 101,105 **** /** ! * @return service prefix for this type */ public String getServicePrefix() { --- 100,105 ---- /** ! * Get service prefix. ! * @return service prefix for this type. */ public String getServicePrefix() { Index: JournalException.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/JournalException.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JournalException.java 27 Jun 2003 02:19:57 -0000 1.3 --- JournalException.java 30 Jul 2004 01:33:00 -0000 1.4 *************** *** 66,69 **** --- 66,71 ---- package com.babeldoc.core.journal; + import com.babeldoc.core.GeneralException; + /** * JournalException is a simple extension of the GeneralException as a marker *************** *** 73,82 **** * @version 1.0 */ ! public class JournalException extends com.babeldoc.core.GeneralException { /** ! * Constructor * ! * @param message DOCUMENT ME! ! * @param e DOCUMENT ME! */ public JournalException(String message, Throwable e) { --- 75,84 ---- * @version 1.0 */ ! public class JournalException extends GeneralException { /** ! * Constructor. * ! * @param message exception message/ ! * @param e parent exception */ public JournalException(String message, Throwable e) { *************** *** 85,91 **** /** ! * Constructor * ! * @param message DOCUMENT ME! */ public JournalException(String message) { --- 87,93 ---- /** ! * Constructor. * ! * @param message exception message */ public JournalException(String message) { *************** *** 94,98 **** /** ! * Constructor */ public JournalException() { --- 96,100 ---- /** ! * Constructor. */ public JournalException() { Index: Journal.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/Journal.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Journal.java 23 Jul 2004 22:31:54 -0000 1.9 --- Journal.java 30 Jul 2004 01:33:00 -0000 1.10 *************** *** 83,87 **** public abstract class Journal implements IJournal { /** ! * Default constructor */ public Journal() { --- 83,87 ---- public abstract class Journal implements IJournal { /** ! * Default constructor. */ public Journal() { *************** *** 89,98 **** /** ! * Replay this ticket from the step * * @param ticket - the ticket to replay * @param step - the step to replay from ! * ! * @throws JournalException DOCUMENT ME! */ public synchronized void replayTicket(IJournalTicket ticket, int step) --- 89,97 ---- /** ! * Replay this ticket from the step. * * @param ticket - the ticket to replay * @param step - the step to replay from ! * @throws JournalException journal exception */ public synchronized void replayTicket(IJournalTicket ticket, int step) *************** *** 127,132 **** * @param document the document to update * @param stage the pipeline stage resulting in this status change ! * ! * @throws JournalException DOCUMENT ME! */ public void updateDocument(IJournalTicket ticket, --- 126,130 ---- * @param document the document to update * @param stage the pipeline stage resulting in this status change ! * @throws JournalException */ public void updateDocument(IJournalTicket ticket, *************** *** 146,151 **** * @param status - the status of the ticket * @param stage the pipeline stage resulting in this status change ! * ! * @throws JournalException DOCUMENT ME! */ public void updateStatus(IJournalTicket ticket, IJournalStatus status, --- 144,148 ---- * @param status - the status of the ticket * @param stage the pipeline stage resulting in this status change ! * @throws JournalException */ public void updateStatus(IJournalTicket ticket, IJournalStatus status, *************** *** 160,164 **** /** ! * Log a message into the log file * * @param ticket track the document --- 157,161 ---- /** ! * Log a message into the log file. * * @param ticket track the document *************** *** 190,198 **** /** ! * replayJournalStep replay journal step * * @param queryTicket replay from here * ! * @throws JournalException DOCUMENT ME! */ protected void replayTicketStep(QueryTicket queryTicket) --- 187,195 ---- /** ! * replayJournalStep replay journal step . * * @param queryTicket replay from here * ! * @throws JournalException exception! */ protected void replayTicketStep(QueryTicket queryTicket) Index: JournalStatus.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/JournalStatus.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JournalStatus.java 23 Jul 2004 22:31:54 -0000 1.4 --- JournalStatus.java 30 Jul 2004 01:33:00 -0000 1.5 *************** *** 67,74 **** /** ! * <strong>JournalStatus</strong> represents a journal status document. ! * ! * <p>Description: universal document processor the more complicated stuff like ! * reading and writing the deltas are left to the children</p> * * @author bmcdonald --- 67,71 ---- /** ! * <strong>JournalStatus</strong> represents the status that a journal entry can take. * * @author bmcdonald *************** *** 76,89 **** */ public class JournalStatus implements IJournalStatus { ! /** Constants */ public static final JournalStatus SUCCESS = new JournalStatus("success"); public static final JournalStatus FAIL = new JournalStatus("fail"); public static final JournalStatus COMPLETED = new JournalStatus("completed"); public static final JournalStatus IGNORED = new JournalStatus("ignored"); ! /** the additional info */ private String additionalInfo; ! /** The status string */ private String status; --- 73,89 ---- */ public class JournalStatus implements IJournalStatus { ! /** Instance of status. */ public static final JournalStatus SUCCESS = new JournalStatus("success"); + /** Instance of status. */ public static final JournalStatus FAIL = new JournalStatus("fail"); + /** Instance of status. */ public static final JournalStatus COMPLETED = new JournalStatus("completed"); + /** Instance of status. */ public static final JournalStatus IGNORED = new JournalStatus("ignored"); ! /** the additional info. */ private String additionalInfo; ! /** The status string. */ private String status; *************** *** 99,103 **** /** ! * Set the additional information for this status * * @param additionalInfo extra information on this status --- 99,103 ---- /** ! * Set the additional information for this status. * * @param additionalInfo extra information on this status *************** *** 108,112 **** /** ! * Get the additional information for this status * * @return addition information --- 108,112 ---- /** ! * Get the additional information for this status. * * @return addition information *************** *** 121,125 **** /** ! * toString * * @return stringified object --- 121,125 ---- /** ! * toString. * * @return stringified object Index: IJournalStatus.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/IJournalStatus.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IJournalStatus.java 27 Jun 2003 02:19:57 -0000 1.3 --- IJournalStatus.java 30 Jul 2004 01:33:00 -0000 1.4 *************** *** 75,85 **** * @version 1.0 * ! * @see com.babeldoc.core.JournalStatus */ public interface IJournalStatus extends Serializable { /** ! * Return additional information for this status * ! * @return */ public String getAdditionalInfo(); --- 75,85 ---- * @version 1.0 * ! * @see com.babeldoc.core.journal.JournalStatus */ public interface IJournalStatus extends Serializable { /** ! * Return additional information for this status. * ! * @return additional information. */ public String getAdditionalInfo(); Index: JournalTicket.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/JournalTicket.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JournalTicket.java 12 Aug 2003 23:44:43 -0000 1.4 --- JournalTicket.java 30 Jul 2004 01:33:00 -0000 1.5 *************** *** 78,86 **** */ public class JournalTicket implements IJournalTicket { ! /** instance: the ticket value is stored as a long integer */ long value; /** ! * Construct a tracker ticket * * @param value the value of this ticket --- 78,86 ---- */ public class JournalTicket implements IJournalTicket { ! /** instance: the ticket value is stored as a long integer. */ long value; /** ! * Construct a tracker ticket. * * @param value the value of this ticket *************** *** 91,97 **** /** ! * Return dummy tickets - dummy tickets dont do anything * ! * @return */ public static IJournalTicket getDummy() { --- 91,97 ---- /** ! * Return dummy tickets - dummy tickets dont do anything. * ! * @return dummy ticket */ public static IJournalTicket getDummy() { *************** *** 100,106 **** /** ! * Return dummy tickets - dummy tickets dont do anything * ! * @return */ public boolean isDummy() { --- 100,106 ---- /** ! * Return dummy tickets - dummy tickets dont do anything. * ! * @return is this a dummy ticket? */ public boolean isDummy() { *************** *** 120,124 **** /** ! * getChild the value of this ticket * * @return the value of this ticket --- 120,124 ---- /** ! * getChild the value of this ticket. * * @return the value of this ticket *************** *** 129,133 **** /** ! * Equality * * @param id the value to compare --- 129,133 ---- /** ! * Equality. * * @param id the value to compare Index: JournalOperation.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/JournalOperation.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JournalOperation.java 23 Jul 2004 22:31:54 -0000 1.5 --- JournalOperation.java 30 Jul 2004 01:33:00 -0000 1.6 *************** *** 86,109 **** */ public class JournalOperation implements Serializable { public static final JournalOperation newTicket = new JournalOperation(0); public static final JournalOperation forkTicket = new JournalOperation(1); public static final JournalOperation updateStatus = new JournalOperation(2); public static final JournalOperation updateDocument = new JournalOperation(3); public static final JournalOperation updateJournal = new JournalOperation(4); ! /** private constants */ private static final String NEW_TICKET = "newTicket"; private static final String FORK_TICKET = "forkTicket"; private static final String UPDATE_STATUS = "updateStatus"; private static final String UPDATE_DOCUMENT = "updateDocument"; private static final String UPDATE_JOURNAL = "updateJournal"; ! /** instance variable */ private int operation; /** ! * Private constructor - please use the statics defined on this class * ! * @param operation */ private JournalOperation(int operation) { --- 86,118 ---- */ public class JournalOperation implements Serializable { + /** instance of operation. */ public static final JournalOperation newTicket = new JournalOperation(0); + /** instance of operation. */ public static final JournalOperation forkTicket = new JournalOperation(1); + /** instance of operation. */ public static final JournalOperation updateStatus = new JournalOperation(2); + /** instance of operation. */ public static final JournalOperation updateDocument = new JournalOperation(3); + /** instance of operation. */ public static final JournalOperation updateJournal = new JournalOperation(4); ! /** ticket operation. */ private static final String NEW_TICKET = "newTicket"; + /** ticket operation. */ private static final String FORK_TICKET = "forkTicket"; + /** ticket operation. */ private static final String UPDATE_STATUS = "updateStatus"; + /** ticket operation. */ private static final String UPDATE_DOCUMENT = "updateDocument"; + /** ticket operation. */ private static final String UPDATE_JOURNAL = "updateJournal"; ! /** instance variable. */ private int operation; /** ! * Private constructor - please use the statics defined on this class. * ! * @param operation operation identifier. */ private JournalOperation(int operation) { *************** *** 114,120 **** * return the journaloperation for the string. * ! * @param op * ! * @return */ public static JournalOperation getJournalOperation(String op) { --- 123,129 ---- * return the journaloperation for the string. * ! * @param op operation name * ! * @return journal operation */ public static JournalOperation getJournalOperation(String op) { *************** *** 135,143 **** /** ! * equality operation * * @param obj comparison object * ! * @return */ public boolean equals(Object obj) { --- 144,152 ---- /** ! * equality operation. * * @param obj comparison object * ! * @return equality. */ public boolean equals(Object obj) { *************** *** 146,152 **** /** ! * toString * ! * @return */ public String toString() { --- 155,161 ---- /** ! * toString. * ! * @return stringified object. */ public String toString() { Index: JournalTest.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/JournalTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JournalTest.java 17 Sep 2003 22:13:20 -0000 1.4 --- JournalTest.java 30 Jul 2004 01:33:00 -0000 1.5 *************** *** 72,94 **** /** ! * JournalTest. Test the journal. ! * ! * <p> ! * Title: babel ! * </p> ! * ! * <p> ! * Description: universal document processor ! * </p> * - * <p> - * Copyright: Copyright (c) 2002 - * </p> - * * @author bmcdonald * @version 1.0 */ public class JournalTest extends TestCase { ! /** Stuff */ IJournal journal; --- 72,82 ---- /** ! * A simple JUnit test for the Journal. * * @author bmcdonald * @version 1.0 */ public class JournalTest extends TestCase { ! /** Stuff. */ IJournal journal; *************** *** 96,100 **** * Creates a new JournalTest object. * ! * @param testName DOCUMENT ME! */ public JournalTest(String testName) { --- 84,88 ---- * Creates a new JournalTest object. * ! * @param testName junit needs this */ public JournalTest(String testName) { *************** *** 105,109 **** * Run all the test methods in this class. * ! * @param args DOCUMENT ME! */ public static void main(String[] args) { --- 93,97 ---- * Run all the test methods in this class. * ! * @param args Commandline */ public static void main(String[] args) { *************** *** 112,118 **** /** ! * Test suite * ! * @return DOCUMENT ME! */ public static Test suite() { --- 100,106 ---- /** ! * Test suite. * ! * @return test object */ public static Test suite() { *************** *** 123,127 **** /** ! * test forking tickets * * @throws Exception --- 111,115 ---- /** ! * test forking tickets. * * @throws Exception *************** *** 133,137 **** /** ! * test getting new ticket * * @throws Exception --- 121,125 ---- /** ! * test getting new ticket. * * @throws Exception *************** *** 142,146 **** /** ! * test updating document * * @throws Exception --- 130,134 ---- /** ! * test updating document. * * @throws Exception *************** *** 154,158 **** /** ! * testimg i[date statis * * @throws Exception --- 142,146 ---- /** ! * testimg i[date status. * * @throws Exception *************** *** 164,168 **** /** ! * Setup the test * * @throws Exception --- 152,156 ---- /** ! * Setup the test. * * @throws Exception *************** *** 174,178 **** /** ! * Teardown the test * * @throws Exception --- 162,166 ---- /** ! * Teardown the test. * * @throws Exception Index: JournalFactory.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/JournalFactory.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JournalFactory.java 23 Jul 2004 22:31:54 -0000 1.8 --- JournalFactory.java 30 Jul 2004 01:33:00 -0000 1.9 *************** *** 81,98 **** */ public class JournalFactory { ! /** constant: configuration name */ public static final String CONFIG_NAME = "journal/config"; ! /** constant: journal type */ public static final String JOURNAL_TYPE = "journalType"; ! /** static: holds singleton reference */ private static JournalFactory instance = null; ! /** instance: the singletons actual reference to the implementing journal */ private IJournal journal; /** ! * Constructor is private since this is a singleton */ private JournalFactory() { --- 81,98 ---- */ public class JournalFactory { ! /** constant: configuration name. */ public static final String CONFIG_NAME = "journal/config"; ! /** constant: journal type. */ public static final String JOURNAL_TYPE = "journalType"; ! /** static: holds singleton reference. */ private static JournalFactory instance = null; ! /** instance: the singletons actual reference to the implementing journal. */ private IJournal journal; /** ! * Constructor is private since this is a singleton. */ private JournalFactory() { *************** *** 115,119 **** /** ! * Get an instance of the singleton - make one if necessary * * @return trackerfactory object --- 115,119 ---- /** ! * Get an instance of the singleton - make one if necessary. * * @return trackerfactory object *************** *** 127,131 **** /** ! * Get a journal object * * @return the journal object --- 127,131 ---- /** ! * Get a journal object. * * @return the journal object |
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:41
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/dummy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/journal/dummy Modified Files: DummyJournal.java Log Message: javadoc and formatting here. Index: DummyJournal.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/dummy/DummyJournal.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DummyJournal.java 23 Jul 2004 22:31:55 -0000 1.4 --- DummyJournal.java 30 Jul 2004 01:33:00 -0000 1.5 *************** *** 21,29 **** implements IJournal { ! /** maintain the configuration information object */ private IConfigInfo info; /** ! * Get the configuration iformation for this class * * @return IConfigInfo object --- 21,29 ---- implements IJournal { ! /** maintain the configuration information object. */ private IConfigInfo info; /** ! * Get the configuration iformation for this class. * * @return IConfigInfo object *************** *** 64,72 **** /** ! * getChildrenTickets. Get all the tickets which are children of this ticket ! * ! * @param parent * * @return array of child tickets. */ public IJournalTicket[] getAllChildTickets(IJournalTicket parent) --- 64,72 ---- /** ! * getChildrenTickets. Get all the tickets which are children of this ticket. * + * @param parent parent ticket. * @return array of child tickets. + * @throws JournalException journal exception. */ public IJournalTicket[] getAllChildTickets(IJournalTicket parent) *************** *** 79,84 **** * * @param ticket number - * * @return array of querytickets */ public QueryTicket[] getAllTicketSteps(IJournalTicket ticket) --- 79,84 ---- * * @param ticket number * @return array of querytickets + * @throws JournalException journal exception. */ public QueryTicket[] getAllTicketSteps(IJournalTicket ticket) *************** *** 92,99 **** * @param ticket - the ticket to replay * @param step - the step to replay from ! * ! * @return ! * ! * @throws JournalException */ public PipelineDocument getDocumentAtTicketStep(IJournalTicket ticket, --- 92,97 ---- * @param ticket - the ticket to replay * @param step - the step to replay from ! * @return Get the dummy document. ! * @throws JournalException journal exception. */ public PipelineDocument getDocumentAtTicketStep(IJournalTicket ticket, *************** *** 105,111 **** * Get an existing ticket from the string identifier. * ! * @param identifier ; ! * * @return the created tracker ticket */ public IJournalTicket getTicket(String identifier) throws JournalException { --- 103,109 ---- * Get an existing ticket from the string identifier. * ! * @param identifier identifier to search for (this is a dummy remember) * @return the created tracker ticket + * @throws JournalException journal exception. */ public IJournalTicket getTicket(String identifier) throws JournalException { *************** *** 118,123 **** * * @param jQuery journal query object - * * @return the results. */ public QueryTicket[] getTickets(JournalQuery jQuery) --- 116,121 ---- * * @param jQuery journal query object * @return the results. + * @throws JournalException journal exception. */ public QueryTicket[] getTickets(JournalQuery jQuery) *************** *** 130,133 **** --- 128,132 ---- * * @return the created tracker ticket + * @throws JournalException exception */ public IJournalTicket dummyTicket() throws JournalException { *************** *** 139,144 **** * * @param parentTicket the creating ticket - * * @return the created tracker ticket */ public IJournalTicket forkTicket(IJournalTicket parentTicket) --- 138,143 ---- * * @param parentTicket the creating ticket * @return the created tracker ticket + * @throws JournalException exception */ public IJournalTicket forkTicket(IJournalTicket parentTicket) *************** *** 151,154 **** --- 150,154 ---- * * @return the created tracker ticket + * @throws JournalException exception */ public IJournalTicket newTicket() throws JournalException { *************** *** 157,161 **** /** ! * Log a message into the log file * * @param ticket track the document --- 157,161 ---- /** ! * Log a message into the log file. * * @param ticket track the document *************** *** 169,176 **** /** ! * Replay this ticket from the step * * @param ticket - the ticket to replay * @param step - the step to replay from */ public void replayTicket(IJournalTicket ticket, int step) --- 169,177 ---- /** ! * Replay this ticket from the step. * * @param ticket - the ticket to replay * @param step - the step to replay from + * @throws JournalException exception */ public void replayTicket(IJournalTicket ticket, int step) *************** *** 179,187 **** /** ! * Update a document associated with this ticket * * @param ticket - the ticket to replay * @param document the document to update * @param stage the pipeline stage resulting in this status change */ public void updateDocument(IJournalTicket ticket, PipelineDocument document, --- 180,189 ---- /** ! * Update a document associated with this ticket. * * @param ticket - the ticket to replay * @param document the document to update * @param stage the pipeline stage resulting in this status change + * @throws JournalException exception */ public void updateDocument(IJournalTicket ticket, PipelineDocument document, *************** *** 190,198 **** /** ! * Update the status of this ticket * * @param ticket - the ticket for this status * @param status - the status of the ticket * @param stage the pipeline stage resulting in this status change */ public void updateStatus(IJournalTicket ticket, IJournalStatus status, --- 192,201 ---- /** ! * Update the status of this ticket. * * @param ticket - the ticket for this status * @param status - the status of the ticket * @param stage the pipeline stage resulting in this status change + * @throws JournalException exception */ public void updateStatus(IJournalTicket ticket, IJournalStatus status, |
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/query In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/journal/query Modified Files: JournalQuery.java JournalQueryException.java JournalQueryTest.java QueryOption.java QueryTicket.java Log Message: javadoc and formatting here. Index: JournalQuery.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/query/JournalQuery.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JournalQuery.java 27 Jun 2003 02:19:58 -0000 1.4 --- JournalQuery.java 30 Jul 2004 01:33:00 -0000 1.5 *************** *** 91,95 **** /** ! * Null constructor */ public JournalQuery() { --- 91,95 ---- /** ! * Null constructor. */ public JournalQuery() { *************** *** 101,105 **** /** ! * Full constructor * * @param startIndex the start index of the result set --- 101,105 ---- /** ! * Full constructor. * * @param startIndex the start index of the result set *************** *** 125,129 **** * for the date. A Year 2037 problem here. * ! * @param endDate */ public void setEndDate(Date endDate) { --- 125,129 ---- * for the date. A Year 2037 problem here. * ! * @param endDate end date. */ public void setEndDate(Date endDate) { *************** *** 136,142 **** /** ! * get end date * ! * @return */ public Date getEndDate() { --- 136,142 ---- /** ! * get end date. * ! * @return end date */ public Date getEndDate() { *************** *** 145,151 **** /** ! * set the the journal operations * ! * @param journalOperations */ public void setJournalOperations(JournalOperation[] journalOperations) { --- 145,151 ---- /** ! * set the the journal operations. * ! * @param journalOperations array of journal operations. */ public void setJournalOperations(JournalOperation[] journalOperations) { *************** *** 156,160 **** * Get the journal operations. * ! * @return */ public JournalOperation[] getJournalOperations() { --- 156,160 ---- * Get the journal operations. * ! * @return journal operations. */ public JournalOperation[] getJournalOperations() { *************** *** 163,169 **** /** ! * set the number of rows to return * ! * @param numResults */ public void setNumResults(int numResults) { --- 163,169 ---- /** ! * set the number of rows to return. * ! * @param numResults only this number of results. */ public void setNumResults(int numResults) { *************** *** 172,178 **** /** ! * Get the number of rows to return * ! * @return */ public int getNumResults() { --- 172,178 ---- /** ! * Get the number of rows to return. * ! * @return the number of results to show. */ public int getNumResults() { *************** *** 181,187 **** /** ! * Set the query options * ! * @param queryOptions */ public void setQueryOptions(QueryOption[] queryOptions) { --- 181,187 ---- /** ! * Set the query options. * ! * @param queryOptions these query optins. */ public void setQueryOptions(QueryOption[] queryOptions) { *************** *** 190,196 **** /** ! * Get the query options * ! * @return */ public QueryOption[] getQueryOptions() { --- 190,196 ---- /** ! * Get the query options. * ! * @return array of query options. */ public QueryOption[] getQueryOptions() { *************** *** 200,206 **** /** * Set the start date. If a null is passed, the start date is set to the min ! * value for the date * ! * @param startDate */ public void setStartDate(Date startDate) { --- 200,206 ---- /** * Set the start date. If a null is passed, the start date is set to the min ! * value for the date. * ! * @param startDate only from this date */ public void setStartDate(Date startDate) { *************** *** 213,219 **** /** ! * get start date * ! * @return */ public Date getStartDate() { --- 213,219 ---- /** ! * get start date. * ! * @return start date */ public Date getStartDate() { *************** *** 222,228 **** /** ! * set the index * ! * @param startIndex */ public void setStartIndex(int startIndex) { --- 222,228 ---- /** ! * set the index. * ! * @param startIndex start from this index. */ public void setStartIndex(int startIndex) { *************** *** 231,237 **** /** ! * get the start index * ! * @return DOCUMENT ME! */ public int getStartIndex() { --- 231,237 ---- /** ! * get the start index. * ! * @return get the start index. */ public int getStartIndex() { *************** *** 240,248 **** /** ! * private int startIndex; private int numResults; private Date startDate; ! * private Date endDate; private QueryOption[] queryOptions; private ! * JournalOperation[] journalOperations; * ! * @return DOCUMENT ME! */ public String toString() { --- 240,246 ---- /** ! * string representation of the JournalQuery. * ! * @return stringified representation.! */ public String toString() { *************** *** 258,275 **** /** ! * JournalQueryComp: Class to encapsulate a query comparison ! * ! * <p> ! * Title: babel ! * </p> ! * ! * <p> ! * Description: universal document processor the more complicated stuff like ! * reading and writing the deltas are left to the children ! * </p> ! * ! * <p> ! * Copyright: Copyright (c) 2002 ! * </p> * * @author bmcdonald --- 256,260 ---- /** ! * JournalQueryComp: Class to encapsulate a query comparison. * * @author bmcdonald *************** *** 284,292 **** public static JournalQueryComp ne = new JournalQueryComp(5); ! /** Operation - flag */ private int operation; /** ! * Private constructor * * @param operation the operation flag --- 269,277 ---- public static JournalQueryComp ne = new JournalQueryComp(5); ! /** Operation - flag. */ private int operation; /** ! * Private constructor. * * @param operation the operation flag *************** *** 297,303 **** /** ! * equals * ! * @param jquery * * @return true if the operations are equal, else false. --- 282,288 ---- /** ! * equals. * ! * @param jquery is equals. * * @return true if the operations are equal, else false. *************** *** 308,312 **** /** ! * Resolve a string operator into an instance of JournalQueryComp * * @param query the string of the query --- 293,297 ---- /** ! * Resolve a string operator into an instance of JournalQueryComp. * * @param query the string of the query Index: JournalQueryException.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/query/JournalQueryException.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JournalQueryException.java 27 Jun 2003 02:19:58 -0000 1.3 --- JournalQueryException.java 30 Jul 2004 01:33:00 -0000 1.4 *************** *** 78,85 **** public class JournalQueryException extends JournalException { /** ! * Constructor * ! * @param e DOCUMENT ME! ! * @param message DOCUMENT ME! */ public JournalQueryException(Exception e, String message) { --- 78,85 ---- public class JournalQueryException extends JournalException { /** ! * Constructor. * ! * @param e parent exception ! * @param message message */ public JournalQueryException(Exception e, String message) { Index: QueryOption.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/query/QueryOption.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** QueryOption.java 27 Jun 2003 02:19:58 -0000 1.3 --- QueryOption.java 30 Jul 2004 01:33:00 -0000 1.4 *************** *** 77,94 **** */ public class QueryOption implements Serializable { public static final QueryOption oldestFirst = new QueryOption(0); public static final QueryOption newestFirst = new QueryOption(1); ! /** string representations */ public static final String OLDEST_FIRST = "oldestFirst"; public static final String NEWEST_FIRST = "newestFirst"; ! /** instance variable - just a marker */ private int option; /** ! * Private constructor * ! * @param operation */ private QueryOption(int operation) { --- 77,97 ---- */ public class QueryOption implements Serializable { + /** instantiated object. */ public static final QueryOption oldestFirst = new QueryOption(0); + /** instantiated object. */ public static final QueryOption newestFirst = new QueryOption(1); ! /** string representations. */ public static final String OLDEST_FIRST = "oldestFirst"; + /** string representations. */ public static final String NEWEST_FIRST = "newestFirst"; ! /** instance variable - just a marker. */ private int option; /** ! * Private constructor. * ! * @param operation operation identifier */ private QueryOption(int operation) { *************** *** 97,105 **** /** ! * Convert a string to a query option ! * ! * @param qopt * ! * @return */ public static QueryOption getQueryOption(String qopt) { --- 100,107 ---- /** ! * Convert a string to a query option. * ! * @param qopt identifier to find. ! * @return query option. */ public static QueryOption getQueryOption(String qopt) { *************** *** 114,122 **** /** ! * equality operator - important ! * ! * @param o DOCUMENT ME! * ! * @return DOCUMENT ME! */ public boolean equals(Object o) { --- 116,123 ---- /** ! * equality operator - important. * ! * @param o comparison object ! * @return equality flag */ public boolean equals(Object o) { *************** *** 125,131 **** /** ! * THIS WILL BE CHANGING * ! * @return */ public String toString() { --- 126,132 ---- /** ! * stringified representation. * ! * @return stringified representation. */ public String toString() { Index: JournalQueryTest.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/query/JournalQueryTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JournalQueryTest.java 16 Sep 2003 05:19:00 -0000 1.4 --- JournalQueryTest.java 30 Jul 2004 01:33:00 -0000 1.5 *************** *** 69,72 **** --- 69,73 ---- import com.babeldoc.core.journal.JournalFactory; import com.babeldoc.core.journal.JournalOperation; + import com.babeldoc.core.EnvironmentLoader; import junit.framework.Test; *************** *** 82,86 **** */ public class JournalQueryTest extends TestCase { - /** Stuff */ //EjbReferenceManager mgr; --- 83,86 ---- *************** *** 90,96 **** * Creates a new JournalQueryTest object. * ! * @param testName DOCUMENT ME! */ ! public JournalQueryTest(java.lang.String testName) { super(testName); } --- 90,96 ---- * Creates a new JournalQueryTest object. * ! * @param testName junit name */ ! public JournalQueryTest(String testName) { super(testName); } *************** *** 99,111 **** * Run all the test methods in this class. * ! * @param args DOCUMENT ME! */ public static void main(String[] args) { ! com.babeldoc.core.EnvironmentLoader.loadEnvironment(); junit.textui.TestRunner.run(suite()); } /** ! * @return make a test suite */ public static Test suite() { --- 99,112 ---- * Run all the test methods in this class. * ! * @param args command line arguments */ public static void main(String[] args) { ! EnvironmentLoader.loadEnvironment(); junit.textui.TestRunner.run(suite()); } /** ! * . ! * @return make a test suite. */ public static Test suite() { *************** *** 116,119 **** --- 117,121 ---- /** + * get all tickets. * @throws Exception */ *************** *** 136,140 **** /** ! * @throws Exception DOCUMENT ME! */ public void testGetForkedTickets() throws Exception { --- 138,143 ---- /** ! * get forked tickets. ! * @throws Exception */ public void testGetForkedTickets() throws Exception { *************** *** 145,149 **** /** ! * Test getting new tickets * * @throws Exception --- 148,152 ---- /** ! * Test getting new tickets. * * @throws Exception *************** *** 160,166 **** /** ! * Get new tickets newest first * ! * @throws Exception DOCUMENT ME! */ public void testGetNewTicketsNewestFirst() throws Exception { --- 163,169 ---- /** ! * Get new tickets newest first. * ! * @throws Exception */ public void testGetNewTicketsNewestFirst() throws Exception { *************** *** 177,183 **** /** ! * Get new tickets oldest first * ! * @throws Exception DOCUMENT ME! */ public void testGetNewTicketsOldestFirst() throws Exception { --- 180,186 ---- /** ! * Get new tickets oldest first. * ! * @throws Exception */ public void testGetNewTicketsOldestFirst() throws Exception { *************** *** 193,199 **** /** ! * Get the updated documents * ! * @throws Exception DOCUMENT ME! */ public void testGetUpdateDocumentTickets() throws Exception { --- 196,202 ---- /** ! * Get the updated documents. * ! * @throws Exception */ public void testGetUpdateDocumentTickets() throws Exception { *************** *** 204,210 **** /** ! * Get update status tickets * ! * @throws Exception DOCUMENT ME! */ public void testGetUpdateStatusTickets() throws Exception { --- 207,213 ---- /** ! * Get update status tickets. * ! * @throws Exception */ public void testGetUpdateStatusTickets() throws Exception { *************** *** 215,221 **** /** ! * Setup the journal * ! * @throws Exception DOCUMENT ME! */ protected void setUp() throws Exception { --- 218,224 ---- /** ! * Setup the journal. * ! * @throws Exception */ protected void setUp() throws Exception { *************** *** 225,231 **** /** ! * teardown the journal * ! * @throws Exception DOCUMENT ME! */ protected void tearDown() throws Exception { --- 228,234 ---- /** ! * teardown the journal. * ! * @throws Exception */ protected void tearDown() throws Exception { Index: QueryTicket.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/query/QueryTicket.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** QueryTicket.java 18 Aug 2003 19:21:07 -0000 1.5 --- QueryTicket.java 30 Jul 2004 01:33:00 -0000 1.6 *************** *** 116,124 **** * @param ticket the ticket to use * @param date the date associated with this ticket ! * @param operation * @param stage the pipeline stage name ! * @param other ! * @param step ! * @param additional */ public QueryTicket(IJournalTicket ticket, Date date, String operation, --- 116,124 ---- * @param ticket the ticket to use * @param date the date associated with this ticket ! * @param operation opeation name * @param stage the pipeline stage name ! * @param other other information ! * @param step step number ! * @param additional additional information. */ public QueryTicket(IJournalTicket ticket, Date date, String operation, *************** *** 135,139 **** * Get the additional information at this query step. * ! * @return */ public String getAdditional() { --- 135,139 ---- * Get the additional information at this query step. * ! * @return additional informaton */ public String getAdditional() { *************** *** 142,146 **** /** ! * Get the date of this ticket * * @return date --- 142,146 ---- /** ! * Get the date of this ticket. * * @return date *************** *** 151,155 **** /** ! * Get the operation of this ticket * * @return operation --- 151,155 ---- /** ! * Get the operation of this ticket. * * @return operation *************** *** 160,164 **** /** ! * Get the other data for the ticket (could be parent ticket, etc, etc) * * @return other --- 160,164 ---- /** ! * Get the other data for the ticket (could be parent ticket, etc, etc). * * @return other *************** *** 169,173 **** /** ! * Get the pipeline stage of this ticket * * @return stage --- 169,173 ---- /** ! * Get the pipeline stage of this ticket. * * @return stage *************** *** 178,182 **** /** ! * Get the step for the ticket * * @return other --- 178,182 ---- /** ! * Get the step for the ticket. * * @return other *************** *** 187,191 **** /** ! * Get the ticket * * @return ticket --- 187,191 ---- /** ! * Get the ticket. * * @return ticket *************** *** 196,200 **** /** ! * ToString * * @return string --- 196,200 ---- /** ! * ToString. * * @return string |
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:40
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/module In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/module Modified Files: BabeldocModuleCommand.java BabeldocModuleList.java CoreModule.java Log Message: javadoc and formatting here. Index: CoreModule.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/module/CoreModule.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CoreModule.java 29 Aug 2003 02:03:22 -0000 1.3 --- CoreModule.java 30 Jul 2004 01:33:01 -0000 1.4 *************** *** 78,85 **** public class CoreModule extends BabeldocModule { public static final String CORE_MODULE_NAME = "core"; /** ! * Return the names of the those objects that this module is dependant on * * @return Module name --- 78,86 ---- public class CoreModule extends BabeldocModule { + /** name of the core module. */ public static final String CORE_MODULE_NAME = "core"; /** ! * Return the names of the those objects that this module is dependant on. * * @return Module name *************** *** 90,94 **** /** ! * Get the name of this module * * @return Module name --- 91,95 ---- /** ! * Get the name of this module. * * @return Module name Index: BabeldocModuleList.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/module/BabeldocModuleList.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BabeldocModuleList.java 23 Jul 2004 22:32:37 -0000 1.6 --- BabeldocModuleList.java 30 Jul 2004 01:33:01 -0000 1.7 *************** *** 87,97 **** private static final String VISITED = "VISITED"; ! /** Instance variable */ private static BabeldocModuleList instance = null; private BabeldocModule[] modules = null; private Map map = new HashMap(); /** ! * Private constructore */ private BabeldocModuleList() { --- 87,98 ---- private static final String VISITED = "VISITED"; ! /** Instance variable. */ private static BabeldocModuleList instance = null; + /** array of babeldoc modules. */ private BabeldocModule[] modules = null; private Map map = new HashMap(); /** ! * Private constructor. */ private BabeldocModuleList() { *************** *** 113,117 **** /** ! * Get the module with the name, aModule * * @param aModule module name --- 114,118 ---- /** ! * Get the module with the name, aModule. * * @param aModule module name *************** *** 192,201 **** /** ! * Sort the nodes from the root node. This is a topographical sort * ! * @param root ! * @param state ! * @param visiting ! * @param ret */ private final void treeSort(String root, Map state, Stack visiting, --- 193,202 ---- /** ! * Sort the nodes from the root node. This is a topographical sort. * ! * @param root root ! * @param state state ! * @param visiting visiting ! * @param ret collection */ private final void treeSort(String root, Map state, Stack visiting, Index: BabeldocModuleCommand.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/module/BabeldocModuleCommand.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** BabeldocModuleCommand.java 29 Aug 2003 02:03:22 -0000 1.16 --- BabeldocModuleCommand.java 30 Jul 2004 01:33:01 -0000 1.17 *************** *** 78,90 **** /** * Command class to access and browse the babeldoc modules from the command ! * line * * @author bmcdonald ! * @version */ public class BabeldocModuleCommand extends BabeldocCommand { /** ! * Setup the babeldoc command class * * @param args the command line arguments --- 78,90 ---- /** * Command class to access and browse the babeldoc modules from the command ! * line. * * @author bmcdonald ! * @version 1.1 */ public class BabeldocModuleCommand extends BabeldocCommand { /** ! * Setup the babeldoc command class. * * @param args the command line arguments *************** *** 95,101 **** /** ! * Main routine * ! * @param args */ public static void main(String[] args) { --- 95,101 ---- /** ! * Main routine. * ! * @param args command line */ public static void main(String[] args) { *************** *** 105,109 **** /** ! * process and execute the commandline and * * @param commandLine the command line --- 105,109 ---- /** ! * process and execute the commandline. * * @param commandLine the command line *************** *** 122,126 **** /** ! * List the currently load modules in the system */ public void listModules() { --- 122,126 ---- /** ! * List the currently load modules in the system. */ public void listModules() { *************** *** 141,145 **** /** ! * Setup the command line arguments * * @param options the commandline options to look for --- 141,145 ---- /** ! * Setup the command line arguments. * * @param options the commandline options to look for *************** *** 161,167 **** * Get the set of strings as a csv string. * ! * @param depSet ! * ! * @return */ private String getDependantsAsCVS(Set depSet) { --- 161,166 ---- * Get the set of strings as a csv string. * ! * @param depSet set string.s ! * @return csv string */ private String getDependantsAsCVS(Set depSet) { |
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:39
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/journal/command Modified Files: JournalCommand.java Log Message: javadoc and formatting here. Index: JournalCommand.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/command/JournalCommand.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JournalCommand.java 23 Jul 2004 22:31:54 -0000 1.7 --- JournalCommand.java 30 Jul 2004 01:33:00 -0000 1.8 *************** *** 102,112 **** */ public class JournalCommand extends BabeldocCommand { ! /** constants: display xml */ private static final int XML_DISP = 1; ! /** constants: display csv */ private static final int CSV_DISP = 2; ! /** instance: display mode */ private int dispMode = 0; --- 102,112 ---- */ public class JournalCommand extends BabeldocCommand { ! /** constants: display xml. */ private static final int XML_DISP = 1; ! /** constants: display csv. */ private static final int CSV_DISP = 2; ! /** instance: display mode. */ private int dispMode = 0; *************** *** 114,120 **** /** ! * process the commandline arguments * ! * @param args */ public JournalCommand(String[] args) { --- 114,120 ---- /** ! * process the commandline arguments. * ! * @param args command line arguments. */ public JournalCommand(String[] args) { *************** *** 123,127 **** /** ! * handle displaying of a document * * @param cmdLine the command line --- 123,127 ---- /** ! * handle displaying of a document. * * @param cmdLine the command line *************** *** 161,165 **** /** ! * Listing ticket information * * @param cmdLine the command line --- 161,165 ---- /** ! * Listing ticket information. * * @param cmdLine the command line *************** *** 236,240 **** /** ! * handle replaying of a ticket * * @param cmdLine the command line --- 236,240 ---- /** ! * handle replaying of a ticket. * * @param cmdLine the command line *************** *** 261,265 **** /** ! * handle listing the steps for a ticket * * @param cmdLine the command line --- 261,265 ---- /** ! * handle listing the steps for a ticket. * * @param cmdLine the command line *************** *** 285,291 **** /** ! * Execute the command line * ! * @param commandLine */ public void execute(CommandLine commandLine) { --- 285,291 ---- /** ! * Execute the command line. * ! * @param commandLine command line */ public void execute(CommandLine commandLine) { *************** *** 304,310 **** /** ! * Main routine * ! * @param args */ public static void main(String[] args) { --- 304,310 ---- /** ! * Main routine. * ! * @param args commandline. */ public static void main(String[] args) { *************** *** 358,362 **** /** ! * Convert a string date into a java date * * @param arg the date string --- 358,362 ---- /** ! * Convert a string date into a java date. * * @param arg the date string *************** *** 383,387 **** /** ! * Determine if the argument at the position is a valid display mode modifier * * @param commandline the command line --- 383,387 ---- /** ! * Determine if the argument at the position is a valid display mode modifier. * * @param commandline the command line *************** *** 400,404 **** /** ! * Query the journal and render the results * * @param qts The tickets to query --- 400,404 ---- /** ! * Query the journal and render the results. * * @param qts The tickets to query |
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:38
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/config/light In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/config/light Modified Files: LightConfigCommand.java LightConfigService.java Log Message: javadoc and formatting here. Index: LightConfigService.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/config/light/LightConfigService.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** LightConfigService.java 24 Jul 2004 00:18:50 -0000 1.14 --- LightConfigService.java 30 Jul 2004 01:33:00 -0000 1.15 *************** *** 87,95 **** /** ! * <p> ! * Ultra light configuration service. This searches for property files in the ! * classpath. This uses the ResourceLoader object which knows how to load ! * objects from a file, from the classpath or from a url ! * </p> * * @author Bmcdonald --- 87,93 ---- /** ! * Configuration service that stores its properties in regular properties files. This ! * searches for property files in the classpath. This uses the ResourceLoader object ! * which knows how to load objects from a file, from the classpath or from a url * * @author Bmcdonald *************** *** 99,110 **** */ public class LightConfigService extends Named implements IConfigService { ! /** constant: the .properties file suffix */ public static final String DOT_PROPERTIES = ".properties"; ! /** Log service to use */ private LogService log = LogService.getInstance(LightConfigService.class.getName()); /** ! * Default constructor */ public LightConfigService() { --- 97,108 ---- */ public class LightConfigService extends Named implements IConfigService { ! /** constant: the .properties file suffix. */ public static final String DOT_PROPERTIES = ".properties"; ! /** Log service to use. */ private LogService log = LogService.getInstance(LightConfigService.class.getName()); /** ! * Default constructor. */ public LightConfigService() { *************** *** 113,117 **** /** ! * named constructor * * @param name name this server --- 111,115 ---- /** ! * named constructor. * * @param name name this server *************** *** 142,146 **** /** * Get the name of the property file (adds properties to end of ! * the name if necessary) * * @param name configuration file name --- 140,144 ---- /** * Get the name of the property file (adds properties to end of ! * the name if necessary). * * @param name configuration file name *************** *** 157,161 **** /** ! * get a config bundle for the name and locale * * @param name configuration name --- 155,159 ---- /** ! * get a config bundle for the name and locale. * * @param name configuration name *************** *** 174,178 **** * @param name path to the configuration file * ! * @return */ public IConfig createConfig(String name) { --- 172,176 ---- * @param name path to the configuration file * ! * @return created object. */ public IConfig createConfig(String name) { *************** *** 181,190 **** /** ! * Currently unimplemented. * ! * @param name ! * @param config * ! * @return */ public boolean saveConfig(String name, IConfig config) { --- 179,190 ---- /** ! * Save this configuration. Tries to find a likely place to place the ! * properties - it can't be in a jar file. If cannot be found, place in ! * the BABELDOC_USER directory. * ! * @param name configuration name. ! * @param config the configuration object. * ! * @return success flag. */ public boolean saveConfig(String name, IConfig config) { *************** *** 256,261 **** * the most specific and the last elment is the most general. * ! * @param name ! * @param properties */ Properties mergePropertiesFileFromUserSearchPath(String name, --- 256,262 ---- * the most specific and the last elment is the most general. * ! * @param name name to search ! * @param properties properties to merge. ! * @return merged properties. */ Properties mergePropertiesFileFromUserSearchPath(String name, *************** *** 277,285 **** /** ! * Set the value for the named property for the named configuration * * @param configName name of the configuration to update * @param propertyName name of the property value to set * @param value value to set */ public void setString(String configName, String propertyName, String value) throws ConfigException { --- 278,287 ---- /** ! * Set the value for the named property for the named configuration. * * @param configName name of the configuration to update * @param propertyName name of the property value to set * @param value value to set + * @throws ConfigException configuration exception */ public void setString(String configName, String propertyName, String value) throws ConfigException { Index: LightConfigCommand.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/config/light/LightConfigCommand.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LightConfigCommand.java 7 Aug 2003 08:46:35 -0000 1.2 --- LightConfigCommand.java 30 Jul 2004 01:33:00 -0000 1.3 *************** *** 11,22 **** /** */ public class LightConfigCommand extends BabeldocCommand{ public static final String SPACER = " "; /** ! * process the class * ! * @param args DOCUMENT ME! */ public LightConfigCommand(String[] args) { --- 11,28 ---- /** + * Command object that operates on the light configuration service. + * + * @author bmcdonald + * @version 1.1 */ public class LightConfigCommand extends BabeldocCommand{ + + /** Some space. */ public static final String SPACER = " "; /** ! * process the class. * ! * @param args Command line */ public LightConfigCommand(String[] args) { *************** *** 26,30 **** /** ! * Execute the command * * @param commandLine The command line. --- 32,36 ---- /** ! * Execute the command. * * @param commandLine The command line. *************** *** 96,100 **** /** ! * Main entry point * * @param args the name of the stage and the name=value pairs --- 102,106 ---- /** ! * Main entry point. * * @param args the name of the stage and the name=value pairs |
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:15
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/resource In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/resource Modified Files: IResource.java Resource.java ResourceConfigInfo.java ResourceFactory.java ResourceType.java Log Message: javadoc and formatting here. Index: ResourceFactory.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/resource/ResourceFactory.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ResourceFactory.java 24 Jul 2004 00:18:51 -0000 1.7 --- ResourceFactory.java 30 Jul 2004 01:33:04 -0000 1.8 *************** *** 88,101 **** */ public class ResourceFactory { public static final int NUM_LRU = 100; ! /** constants for the configuration stuff */ public static final String TYPE = "type"; public static final String RESOURCE = "resource"; ! /** holds singleton reference */ private static ResourceFactory instance = new ResourceFactory(); ! /** this is the actual journal object */ private Map resources; --- 88,103 ---- */ public class ResourceFactory { + /** lru size for map. */ public static final int NUM_LRU = 100; ! /** constants for the configuration stuff. */ public static final String TYPE = "type"; + /** constants for the configuration stuff. */ public static final String RESOURCE = "resource"; ! /** holds singleton reference .*/ private static ResourceFactory instance = new ResourceFactory(); ! /** this is the actual journal object. */ private Map resources; *************** *** 106,110 **** private ResourceFactory() { /** ! * Scanner configuration */ resources = Collections.synchronizedMap(new LRUMap(NUM_LRU)); --- 108,112 ---- private ResourceFactory() { /** ! * resource configuration */ resources = Collections.synchronizedMap(new LRUMap(NUM_LRU)); *************** *** 112,116 **** /** ! * Get an instance of the singleton - make one if necessary * * @return factory object --- 114,118 ---- /** ! * Get an instance of the singleton - make one if necessary. * * @return factory object *************** *** 122,130 **** /** * Get a named resource object. Must be synchronized to disallow the access ! * and possible creation of a new resource ! * ! * @param name DOCUMENT ME! * ! * @return the sqlconnectionmanager object */ public static synchronized IResource getResource(String name) { --- 124,131 ---- /** * Get a named resource object. Must be synchronized to disallow the access ! * and possible creation of a new resource. * ! * @param name resource name ! * @return resource object */ public static synchronized IResource getResource(String name) { Index: IResource.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/resource/IResource.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IResource.java 15 Aug 2003 00:25:29 -0000 1.4 --- IResource.java 30 Jul 2004 01:33:04 -0000 1.5 *************** *** 81,87 **** extends INamed, IConfigurable { /** ! * Check back in a checked out connection * ! * @param object */ public void checkIn(Object object) throws ResourceException; --- 81,88 ---- extends INamed, IConfigurable { /** ! * Check back in a checked out resouce. * ! * @param object object to check in ! * @throws ResourceException */ public void checkIn(Object object) throws ResourceException; *************** *** 91,94 **** --- 92,96 ---- * * @return the checked out connection + * @throws ResourceException */ public Object checkOut() throws ResourceException; Index: ResourceType.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/resource/ResourceType.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ResourceType.java 16 Sep 2003 05:19:01 -0000 1.5 --- ResourceType.java 30 Jul 2004 01:33:04 -0000 1.6 *************** *** 83,87 **** * Private constructor - do not use this - use the constants above. * ! * @param resourceType DOCUMENT ME! */ private ResourceType(String resourceType) { --- 83,87 ---- * Private constructor - do not use this - use the constants above. * ! * @param resourceType name of the resource type */ private ResourceType(String resourceType) { *************** *** 90,98 **** /** ! * Get a resource type object ! * ! * @param resourceType * ! * @return */ public static ResourceType getResourceType(String resourceType) { --- 90,97 ---- /** ! * Get a resource type object. * ! * @param resourceType name of the resource type ! * @return the resource type */ public static ResourceType getResourceType(String resourceType) { *************** *** 103,107 **** * Get the service prefix for this type. * ! * @return */ public String getServicePrefix() { --- 102,106 ---- * Get the service prefix for this type. * ! * @return the service prefix */ public String getServicePrefix() { Index: ResourceConfigInfo.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/resource/ResourceConfigInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ResourceConfigInfo.java 15 Aug 2003 00:25:29 -0000 1.1 --- ResourceConfigInfo.java 30 Jul 2004 01:33:04 -0000 1.2 *************** *** 1,98 **** ! /* ==================================================================== ! * The Apache Software License, Version 1.1 ! * ! * Copyright (c) 2000 The Apache Software Foundation. All rights ! * reserved. ! * ! * Redistribution and use in source and binary forms, with or without ! * modification, are permitted provided that the following conditions ! * are met: ! * ! * 1. Redistributions of source code must retain the above copyright ! * notice, this list of conditions and the following disclaimer. ! * ! * 2. Redistributions in binary form must reproduce the above copyright ! * notice, this list of conditions and the following disclaimer in ! * the documentation and/or other materials provided with the ! * distribution. ! * ! * 3. The end-user documentation included with the redistribution, ! * if any, must include the following acknowledgment: ! * "This product includes software developed by the ! * Apache Software Foundation (http://www.apache.org/)." ! * Alternately, this acknowledgment may appear in the software itself, ! * if and wherever such third-party acknowledgments normally appear. ! * ! * 4. The names "Apache" and "Apache Software Foundation" must ! * not be used to endorse or promote products derived from this ! * software without prior written permission. For written ! * permission, please contact ap...@ap.... ! * ! * 5. Products derived from this software may not be called "Apache", ! * nor may "Apache" appear in their name, without prior written ! * permission of the Apache Software Foundation. ! * ! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED ! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ! * SUCH DAMAGE. ! * ==================================================================== ! * ! * This software consists of voluntary contributions made by many ! * individuals on behalf of the Apache Software Foundation. For more ! * information on the Apache Software Foundation, please see ! * <http://www.apache.org/>. ! * ! * Portions of this software are based upon public domain software ! * originally written at the National Center for Supercomputing Applications, ! * University of Illinois, Urbana-Champaign. ! * ==================================================================== ! * ! * Babeldoc: The Universal Document Processor ! * ! * $Header$ ! * $DateTime$ ! * $Author$ ! * ! */ ! package com.babeldoc.core.resource; ! ! import com.babeldoc.core.option.ConfigInfo; ! ! import java.util.Collection; ! ! /** ! * Configuration information object for resources. This will allow objects ! * to describe those configuration options that are required and optional. ! * ! * @author bmcdonald ! * @version 1.1 ! */ ! public abstract class ResourceConfigInfo ! extends ConfigInfo { ! /** ! * Return an xmlized version of the of the config info ! * ! * @return String of configuration information. ! */ ! public String toXml() { ! return null; ! } ! ! /** ! * This method returns options that are general to all components ! * ! * @return comments ! */ ! public Collection getGeneralOptions() { ! return null; ! } ! } --- 1,170 ---- ! /* ==================================================================== ! ! * The Apache Software License, Version 1.1 ! ! * ! ! * Copyright (c) 2000 The Apache Software Foundation. All rights ! ! * reserved. ! ! * ! ! * Redistribution and use in source and binary forms, with or without ! ! * modification, are permitted provided that the following conditions ! ! * are met: ! ! * ! ! * 1. Redistributions of source code must retain the above copyright ! ! * notice, this list of conditions and the following disclaimer. ! ! * ! ! * 2. Redistributions in binary form must reproduce the above copyright ! ! * notice, this list of conditions and the following disclaimer in ! ! * the documentation and/or other materials provided with the ! ! * distribution. ! ! * ! ! * 3. The end-user documentation included with the redistribution, ! ! * if any, must include the following acknowledgment: ! ! * "This product includes software developed by the ! ! * Apache Software Foundation (http://www.apache.org/)." ! ! * Alternately, this acknowledgment may appear in the software itself, ! ! * if and wherever such third-party acknowledgments normally appear. ! ! * ! ! * 4. The names "Apache" and "Apache Software Foundation" must ! ! * not be used to endorse or promote products derived from this ! ! * software without prior written permission. For written ! ! * permission, please contact ap...@ap.... ! ! * ! ! * 5. Products derived from this software may not be called "Apache", ! ! * nor may "Apache" appear in their name, without prior written ! ! * permission of the Apache Software Foundation. ! ! * ! ! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED ! ! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ! ! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ! ! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ! ! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ! ! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ! ! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ! ! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ! ! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ! ! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ! ! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ! ! * SUCH DAMAGE. ! ! * ==================================================================== ! ! * ! ! * This software consists of voluntary contributions made by many ! ! * individuals on behalf of the Apache Software Foundation. For more ! ! * information on the Apache Software Foundation, please see ! ! * <http://www.apache.org/>. ! ! * ! ! * Portions of this software are based upon public domain software ! ! * originally written at the National Center for Supercomputing Applications, ! ! * University of Illinois, Urbana-Champaign. ! ! * ==================================================================== ! ! * ! ! * Babeldoc: The Universal Document Processor ! ! * ! ! * $Header$ ! ! * $DateTime$ ! ! * $Author$ ! ! * ! ! */ ! ! package com.babeldoc.core.resource; ! ! import com.babeldoc.core.option.ConfigInfo; ! ! ! ! import java.util.Collection; ! ! /** ! * Configuration information object for resources. This will allow objects ! * to describe those configuration options that are required and optional. ! * ! * @author bmcdonald ! * @version 1.1 ! */ ! public abstract class ResourceConfigInfo ! extends ConfigInfo { ! ! /** ! * Return an xmlized version of the of the config info. ! * ! * @return String of configuration information. ! */ ! ! public String toXml() { ! return null; ! } ! ! /** ! * This method returns options that are general to all components. ! * ! * @return general options ! */ ! ! public Collection getGeneralOptions() { ! return null; ! } ! } ! ! Index: Resource.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/resource/Resource.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Resource.java 15 Aug 2003 00:25:29 -0000 1.6 --- Resource.java 30 Jul 2004 01:33:04 -0000 1.7 *************** *** 80,88 **** implements IResource { ! /** State variables */ private boolean initialized = false; /** ! * Setup the resource - this MUST be overridden by child resources * * @throws ResourceException --- 80,88 ---- implements IResource { ! /** State variables. */ private boolean initialized = false; /** ! * Setup the resource - this MUST be overridden by child resources. * * @throws ResourceException *************** *** 94,98 **** * * @return NOTHING - the extending class needs to do the actual work - * * @throws ResourceException */ --- 94,97 ---- *************** *** 108,114 **** /** ! * Has this resource been initialized * ! * @return */ protected boolean isInitialized() { --- 107,113 ---- /** ! * Has this resource been initialized. * ! * @return initialization flag. */ protected boolean isInitialized() { *************** *** 117,123 **** /** ! * Set this resouces initialized state * ! * @param initialized */ protected void setInitialized(boolean initialized) { --- 116,122 ---- /** ! * Set this resouces initialized state. * ! * @param initialized flag */ protected void setInitialized(boolean initialized) { |
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/pipeline/xml/digester Modified Files: Connection.java DigesterPipelineUnmarshaller.java Dynamic.java Option.java Pipeline.java StageInst.java Log Message: javadoc and formatting here. Index: Dynamic.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Dynamic.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Dynamic.java 16 Sep 2003 05:19:01 -0000 1.5 --- Dynamic.java 30 Jul 2004 01:33:04 -0000 1.6 *************** *** 79,95 **** */ public class Dynamic { ! /** the collection of connections */ private Collection connections = new ArrayList(); ! /** the stage insts collection */ private Collection stageInsts = new ArrayList(); ! /** the entry stage */ private String entryStage; /** ! * Set the connections * ! * @param connections */ public void setConnections(Collection connections) { --- 79,95 ---- */ public class Dynamic { ! /** the collection of connections .*/ private Collection connections = new ArrayList(); ! /** the stage insts collection. */ private Collection stageInsts = new ArrayList(); ! /** the entry stage. */ private String entryStage; /** ! * Set the connections. * ! * @param connections conenections to set */ public void setConnections(Collection connections) { *************** *** 98,102 **** /** ! * @return DOCUMENT ME! */ public Collection getConnections() { --- 98,102 ---- /** ! * @return get the connections. */ public Collection getConnections() { *************** *** 105,111 **** /** ! * set the entry stage * ! * @param entryStage */ public void setEntryStage(String entryStage) { --- 105,111 ---- /** ! * set the entry stage. * ! * @param entryStage the new entry stage. */ public void setEntryStage(String entryStage) { *************** *** 121,127 **** /** ! * set the stage insts * ! * @param stageInsts */ public void setStageInsts(ArrayList stageInsts) { --- 121,127 ---- /** ! * set the stage insts. * ! * @param stageInsts stage insts */ public void setStageInsts(ArrayList stageInsts) { *************** *** 130,134 **** /** ! * @return Get the stage insts */ public Collection getStageInsts() { --- 130,134 ---- /** ! * @return Get the stage insts. */ public Collection getStageInsts() { *************** *** 137,143 **** /** ! * Add a connection * ! * @param connection */ public void addConnection(Connection connection) { --- 137,143 ---- /** ! * Add a connection. * ! * @param connection connection to add. */ public void addConnection(Connection connection) { *************** *** 146,152 **** /** ! * Add a stage instance * ! * @param stageInst */ public void addStageInst(StageInst stageInst) { --- 146,152 ---- /** ! * Add a stage instance. * ! * @param stageInst isntnce to add. */ public void addStageInst(StageInst stageInst) { Index: DigesterPipelineUnmarshaller.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/DigesterPipelineUnmarshaller.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DigesterPipelineUnmarshaller.java 16 Sep 2003 05:19:01 -0000 1.7 --- DigesterPipelineUnmarshaller.java 30 Jul 2004 01:33:04 -0000 1.8 *************** *** 67,70 **** --- 67,71 ---- import com.babeldoc.core.pipeline.xml.IUnmarshaller; + import com.babeldoc.core.pipeline.PipelineStageConnection; import com.babeldoc.core.option.IConfigData; import com.babeldoc.core.option.ConfigData; *************** *** 92,102 **** implements IUnmarshaller { ! /** pipeline value object */ private Pipeline pipeline; ! /** key for stageType */ public static final String STAGE_TYPE = "stageType"; ! /** get for description */ public static final String STAGE_DESC = "stageDesc"; --- 93,103 ---- implements IUnmarshaller { ! /** pipeline value object. */ private Pipeline pipeline; ! /** key for stageType. */ public static final String STAGE_TYPE = "stageType"; ! /** get for description. */ public static final String STAGE_DESC = "stageDesc"; *************** *** 106,110 **** * Construct the unmarshaller from the source... * ! * @param input */ public DigesterPipelineUnmarshaller(InputStream input) { --- 107,111 ---- * Construct the unmarshaller from the source... * ! * @param input input stream */ public DigesterPipelineUnmarshaller(InputStream input) { *************** *** 127,133 **** * Construct the unmarshaller from the source... * ! * @param filename ! * ! * @throws IOException DOCUMENT ME! */ public DigesterPipelineUnmarshaller(String filename) --- 128,133 ---- * Construct the unmarshaller from the source... * ! * @param filename the pipeline definition file ! * @throws IOException */ public DigesterPipelineUnmarshaller(String filename) *************** *** 137,153 **** /** ! * Get the pipeline stage connections from the * ! * @return */ ! public com.babeldoc.core.pipeline.PipelineStageConnection[] getPipelineStageConnections() { try { Collection connections = pipeline.getDynamic().getConnections(); ! com.babeldoc.core.pipeline.PipelineStageConnection[] pstageConnections = new com.babeldoc.core.pipeline.PipelineStageConnection[connections.size()]; int count = 0; for (Iterator i = connections.iterator(); i.hasNext();) { Connection connection = (Connection) i.next(); ! pstageConnections[count++] = new com.babeldoc.core.pipeline.PipelineStageConnection(connection.getSource(), connection.getSink()); } --- 137,153 ---- /** ! * Get the pipeline stage connections from the configuration * ! * @return array of pipeline stage connections. */ ! public PipelineStageConnection[] getPipelineStageConnections() { try { Collection connections = pipeline.getDynamic().getConnections(); ! PipelineStageConnection[] pstageConnections = new PipelineStageConnection[connections.size()]; int count = 0; for (Iterator i = connections.iterator(); i.hasNext();) { Connection connection = (Connection) i.next(); ! pstageConnections[count++] = new PipelineStageConnection(connection.getSource(), connection.getSink()); } *************** *** 166,170 **** * pipeline stage config. * ! * @return */ public IConfigData getRootConfig() { --- 166,170 ---- * pipeline stage config. * ! * @return configuarion data */ public IConfigData getRootConfig() { *************** *** 199,207 **** /** ! * Test me! ! * ! * @param args * ! * @throws IOException DOCUMENT ME! */ public static void main(String[] args) throws IOException { --- 199,206 ---- /** ! * Test. * ! * @param args commandline arguments. ! * @throws IOException */ public static void main(String[] args) throws IOException { *************** *** 234,238 **** * setup the digester. * ! * @param digester */ private void configureDigester(Digester digester) { --- 233,237 ---- * setup the digester. * ! * @param digester digester to configure */ private void configureDigester(Digester digester) { Index: StageInst.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/StageInst.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** StageInst.java 16 Sep 2003 05:19:01 -0000 1.5 --- StageInst.java 30 Jul 2004 01:33:04 -0000 1.6 *************** *** 80,99 **** public class StageInst { ! /** the collection of options */ private Collection options = new ArrayList(); ! /** the stage description */ private String desc; ! /** the name of the stage */ private String name; ! /** the type of the stage */ private String type; /** ! * Set the description * ! * @param desc DOCUMENT ME! */ public void setDesc(String desc) { --- 80,99 ---- public class StageInst { ! /** the collection of options. */ private Collection options = new ArrayList(); ! /** the stage description. */ private String desc; ! /** the name of the stage. */ private String name; ! /** the type of the stage. */ private String type; /** ! * Set the description. * ! * @param desc set the description of the stage instance. */ public void setDesc(String desc) { *************** *** 109,115 **** /** ! * set the name of the stage instance * ! * @param name */ public void setName(String name) { --- 109,115 ---- /** ! * set the name of the stage instance. * ! * @param name new name of the stage instance */ public void setName(String name) { *************** *** 141,147 **** /** ! * Get the type * ! * @param type */ public void setType(String type) { --- 141,147 ---- /** ! * set the type. * ! * @param type new type. */ public void setType(String type) { *************** *** 157,163 **** /** ! * add the option * ! * @param option */ public void addOption(Option option) { --- 157,163 ---- /** ! * add the option. * ! * @param option add option */ public void addOption(Option option) { Index: Connection.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Connection.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Connection.java 16 Sep 2003 05:19:01 -0000 1.5 --- Connection.java 30 Jul 2004 01:33:04 -0000 1.6 *************** *** 79,83 **** /** ! * Set the sink stage * * @param sink stage as a sink --- 79,83 ---- /** ! * Set the sink stage. * * @param sink stage as a sink *************** *** 95,99 **** /** ! * Set the source stage * * @param source the source stage --- 95,99 ---- /** ! * Set the source stage. * * @param source the source stage Index: Option.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Option.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Option.java 16 Sep 2003 05:19:01 -0000 1.5 --- Option.java 30 Jul 2004 01:33:04 -0000 1.6 *************** *** 79,93 **** */ public class Option { ! /** the collection of suboptions */ private Collection subOptions = new ArrayList(); ! /** the option name */ private String name; ! /** the value of the option */ private String value; /** ! * Set the name of the option * * @param name --- 79,93 ---- */ public class Option { ! /** the collection of suboptions. */ private Collection subOptions = new ArrayList(); ! /** the option name. */ private String name; ! /** the value of the option. */ private String value; /** ! * Set the name of the option. * * @param name *************** *** 105,111 **** /** ! * Set the suboptions * ! * @param subOptions */ public void setSubOptions(Collection subOptions) { --- 105,111 ---- /** ! * Set the suboptions. * ! * @param subOptions suboptions */ public void setSubOptions(Collection subOptions) { *************** *** 121,127 **** /** ! * Set the value of the option * ! * @param value */ public void setValue(String value) { --- 121,127 ---- /** ! * Set the value of the option. * ! * @param value value */ public void setValue(String value) { *************** *** 137,143 **** /** ! * Add an option as a suboption * ! * @param option */ public void addSubOption(Option option) { --- 137,143 ---- /** ! * Add an option as a suboption. * ! * @param option suboption */ public void addSubOption(Option option) { Index: Pipeline.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Pipeline.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Pipeline.java 16 Sep 2003 05:19:01 -0000 1.5 --- Pipeline.java 30 Jul 2004 01:33:04 -0000 1.6 *************** *** 85,89 **** /** ! * Set the documentation on the pipeline * * @param documentation --- 85,89 ---- /** ! * Set the documentation on the pipeline. * * @param documentation *************** *** 101,107 **** /** ! * set the dynamic option * ! * @param dynamic */ public void setDynamic(Dynamic dynamic) { --- 101,107 ---- /** ! * set the dynamic option. * ! * @param dynamic dynamic */ public void setDynamic(Dynamic dynamic) { *************** *** 117,123 **** /** ! * set the name * ! * @param name */ public void setName(String name) { --- 117,123 ---- /** ! * set the name. * ! * @param name name */ public void setName(String name) { *************** *** 133,139 **** /** ! * Add a dynamic portion * ! * @param dynamic */ public void addDynamic(Dynamic dynamic) { --- 133,139 ---- /** ! * Add a dynamic portion. * ! * @param dynamic dynamic */ public void addDynamic(Dynamic dynamic) { |
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:15
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/service In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/service Modified Files: ServiceException.java ServiceFactory.java Log Message: javadoc and formatting here. Index: ServiceFactory.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/service/ServiceFactory.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ServiceFactory.java 9 Aug 2003 00:21:13 -0000 1.7 --- ServiceFactory.java 30 Jul 2004 01:33:05 -0000 1.8 *************** *** 84,95 **** */ public class ServiceFactory { ! /** Configuration constants */ public static String CONFIG_NAME = "service/query"; ! /** singleton configuration */ private static ServiceFactory instance = null; /** ! * Private constructor */ private ServiceFactory() { --- 84,95 ---- */ public class ServiceFactory { ! /** Configuration constants. */ public static String CONFIG_NAME = "service/query"; ! /** singleton configuration.*/ private static ServiceFactory instance = null; /** ! * Private constructor. */ private ServiceFactory() { *************** *** 100,106 **** * relevant named services for display, iteration purposes. * ! * @param serviceType hashmap of matching services. ! * ! * @return */ public static Map getAllServices(String serviceType) { --- 100,105 ---- * relevant named services for display, iteration purposes. * ! * @param serviceType all services matching this serviceType. ! * @return all services. */ public static Map getAllServices(String serviceType) { *************** *** 132,139 **** * must have a default (no-argument) constructor or this will fail. * ! * @param name ! * * @return instantiated object (must have a null constructor) - * * @throws ServiceException */ --- 131,136 ---- * must have a default (no-argument) constructor or this will fail. * ! * @param name service name * @return instantiated object (must have a null constructor) * @throws ServiceException */ *************** *** 169,175 **** /** ! * Get the singleton reference * ! * @return DOCUMENT ME! */ protected static ServiceFactory getInstance() { --- 166,172 ---- /** ! * Get the singleton reference. * ! * @return singleton reference */ protected static ServiceFactory getInstance() { Index: ServiceException.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/service/ServiceException.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ServiceException.java 27 Jun 2003 02:20:00 -0000 1.3 --- ServiceException.java 30 Jul 2004 01:33:05 -0000 1.4 *************** *** 66,69 **** --- 66,71 ---- package com.babeldoc.core.service; + import com.babeldoc.core.GeneralException; + /** * Handling service exceptions. This is straight specialization of *************** *** 73,98 **** * @version 1.0 */ ! public class ServiceException extends com.babeldoc.core.GeneralException { /** ! * Service exception * ! * @param name ! * @param e */ ! public ServiceException(String name, Throwable e) { ! super(name, e); } /** ! * Service exception * ! * @param name */ ! public ServiceException(String name) { ! super(name); } /** ! * Service exception */ public ServiceException() { --- 75,100 ---- * @version 1.0 */ ! public class ServiceException extends GeneralException { /** ! * Service exception. * ! * @param message exception message ! * @param e parent exception */ ! public ServiceException(String message, Throwable e) { ! super(message, e); } /** ! * Service exception. * ! * @param message exception message */ ! public ServiceException(String message) { ! super(message); } /** ! * Service exception. */ public ServiceException() { |
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:14
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/processor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/pipeline/processor Modified Files: AsyncPipelineStageProcessor.java IPipelineStageProcessor.java PipelineStageProcessorFactory.java ProcessorConfigInfo.java SyncPipelineStageProcessor.java ThreadPooledPipelineStageProcessor.java Log Message: javadoc and formatting here. Index: SyncPipelineStageProcessor.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/processor/SyncPipelineStageProcessor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SyncPipelineStageProcessor.java 28 Jul 2004 21:44:19 -0000 1.6 --- SyncPipelineStageProcessor.java 30 Jul 2004 01:33:03 -0000 1.7 *************** *** 100,104 **** * Get the "owning" pipeline stage factory. * ! * @return */ public IPipelineStageFactory getStageFactory() { --- 100,104 ---- * Get the "owning" pipeline stage factory. * ! * @return pipeline stage factory. */ public IPipelineStageFactory getStageFactory() { *************** *** 107,116 **** /** ! * Returns the pipeline stage type for this particular pipeline ! * ! * @param stageName ! * ! * @return * * @throws PipelineException */ --- 107,114 ---- /** ! * Returns the pipeline stage type for this particular pipeline. * + * @param stageName name of the stage. + * @return type for the name. * @throws PipelineException */ *************** *** 124,131 **** * * @param stageName the unique name of the stage - * * @return a reference to the pipeline stage ! * ! * @throws PipelineException DOCUMENT ME! */ public IPipelineStage getPipelineStage(String stageName) --- 122,127 ---- * * @param stageName the unique name of the stage * @return a reference to the pipeline stage ! * @throws PipelineException */ public IPipelineStage getPipelineStage(String stageName) *************** *** 171,176 **** * @param ticket the tracker ticket * @param finalResults the resulting processed documents after all processing is completed ! * ! * @throws com.babeldoc.core.pipeline.PipelineException DOCUMENT ME! */ public void process(String name, PipelineDocument document, --- 167,171 ---- * @param ticket the tracker ticket * @param finalResults the resulting processed documents after all processing is completed ! * @throws PipelineException */ public void process(String name, PipelineDocument document, *************** *** 268,276 **** /** ! * Track the document on the pipeline stage ! * ! * @param pstage * ! * @throws PipelineException DOCUMENT ME! */ protected void trackDocument(IPipelineStage pstage) --- 263,270 ---- /** ! * Track the document on the pipeline stage. * ! * @param pstage pipeline stage name to track ! * @throws PipelineException */ protected void trackDocument(IPipelineStage pstage) *************** *** 288,292 **** /** ! * Get the configuration information for this processor * * @return IConfigInfo object --- 282,286 ---- /** ! * Get the configuration information for this processor. * * @return IConfigInfo object Index: PipelineStageProcessorFactory.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/processor/PipelineStageProcessorFactory.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PipelineStageProcessorFactory.java 23 Jul 2004 22:38:09 -0000 1.3 --- PipelineStageProcessorFactory.java 30 Jul 2004 01:33:03 -0000 1.4 *************** *** 1 **** ! /* ==================================================================== * The Apache Software License, Version 1.1 * * Copyright (c) 2000 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this * software without prior written permission. For written * permission, please contact ap...@ap.... * * 5. Products derived from this software may not be called "Apache", * nor may "Apache" appear in their name, without prior written * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. * * Portions of this software are based upon public domain software * originally written at the National Center for Supercomputing Applications, * University of Illinois, Urbana-Champaign. * ==================================================================== * * Babeldoc: The Universal Document Processor * * $Header$ * $DateTime$ * $Author$ * */ package com.babeldoc.core.pipeline.processor; import com.babeldoc.core.pipeline.IPipelineStageFactory; import com.babeldoc.core.GeneralException; import com.babeldoc.core.option.IConfigData; import com.babeldoc.core.service.ServiceFactory; /** * The <code>PipelineStageProcessorFactory</code> code provides a * means to load the relevant processor for the pipelinestagefactory. * * @author bmcdonald * @version 1.1 */ public class PipelineStageProcessorFactory { public static final String PROCESSOR_TYPE = "type"; public static final String SERVICE_PROCESSOR = "PipelineStageProcessor."; /** * Quick and easy way to getChild a Pipeline stage processor implementation. If the * config object is null (no processor specified in the pipeline configuration, * then the default processor is assigned. If the configuration is given and is a * map (nested/tiered configuration), then the type is determined and a * processor is created and initialized. * * @param psFactory the pipeline stage factory associated with this processor * @param data the configuration object - this can be null * @return a completely constructed Processor - ready to go. * @throws GeneralException */ public static IPipelineStageProcessor getProcessor( IPipelineStageFactory psFactory, IConfigData data) throws GeneralException { IPipelineStageProcessor processor = null; if (data == null) { processor = new SyncPipelineStageProcessor(); } else { String processorType = data.getValue(PROCESSOR_TYPE); processor = (IPipelineStageProcessor) (ServiceFactory .getService(SERVICE_PROCESSOR + processorType)); } processor.configure(psFactory, data); return processor; } } \ No newline at end of file --- 1 ---- ! /* ==================================================================== * The Apache Software License, Version 1.1 * * Copyright (c) 2000 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this * software without prior written permission. For written * permission, please contact ap...@ap.... * * 5. Products derived from this software may not be called "Apache", * nor may "Apache" appear in their name, without prior written * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. * * Portions of this software are based upon public domain software * originally written at the National Center for Supercomputing Applications, * University of Illinois, Urbana-Champaign. * ==================================================================== * * Babeldoc: The Universal Document Processor * * $Header$ * $DateTime$ * $Author$ * */ package com.babeldoc.core.pipeline.processor; import com.babeldoc.core.pipeline.IPipelineStageFactory; import com.babeldoc.core.GeneralException; import com.babeldoc.core.option.IConfigData; import com.babeldoc.core.service.ServiceFactory; /** * The <code>PipelineStageProcessorFactory</code> code provides a * means to load the relevant processor for the pipelinestagefactory. * * @author bmcdonald * @version 1.1 */ public class PipelineStageProcessorFactory { /** processor type string. */ public static final String PROCESSOR_TYPE = "type"; /** pipeline stage processor string. */ public static final String SERVICE_PROCESSOR = "PipelineStageProcessor."; /** * Quick and easy way to getChild a Pipeline stage processor implementation. If the * config object is null (no processor specified in the pipeline configuration, * then the default processor is assigned. If the configuration is given and is a * map (nested/tiered configuration), then the type is determined and a * processor is created and initialized. * * @param psFactory the pipeline stage factory associated with this processor * @param data the configuration object - this can be null * @return a completely constructed Processor - ready to go. * @throws GeneralException */ public static IPipelineStageProcessor getProcessor( IPipelineStageFactory psFactory, IConfigData data) throws GeneralException { IPipelineStageProcessor processor = null; if (data == null) { processor = new SyncPipelineStageProcessor(); } else { String processorType = data.getValue(PROCESSOR_TYPE); processor = (IPipelineStageProcessor) (ServiceFactory .getService(SERVICE_PROCESSOR + processorType)); } processor.configure(psFactory, data); return processor; } } \ No newline at end of file Index: AsyncPipelineStageProcessor.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/processor/AsyncPipelineStageProcessor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AsyncPipelineStageProcessor.java 23 Jul 2004 22:38:09 -0000 1.5 --- AsyncPipelineStageProcessor.java 30 Jul 2004 01:33:03 -0000 1.6 *************** *** 88,92 **** --- 88,94 ---- private int globalMaxThreads; + /** constant for the max threads. */ public static final String MAX_THREADS = "maxThreads"; + /** default max threads. */ public static final int DEFAULT_MAX_THREADS = 5; *************** *** 96,99 **** --- 98,102 ---- * * @param stageFactory set the associated stage factory for this processor + * @param data configuration data for this processor */ public void configure(IPipelineStageFactory stageFactory, IConfigData data) { *************** *** 146,149 **** --- 149,153 ---- * @param finalResults result of the current pipeline stage process * @param maxThreads max number of threads to spawn to process the finalResults + * @throws PipelineException */ protected void processPipelineStageResultsParallel(final PipelineStageResult[] psResults, *************** *** 196,200 **** * Get the globally configured number of threads allowed. * ! * @return */ public int getGlobalMaxThreads() { --- 200,204 ---- * Get the globally configured number of threads allowed. * ! * @return global threads */ public int getGlobalMaxThreads() { *************** *** 204,208 **** /** ! * Get the configuration information for this processor * * @return IConfigInfo object --- 208,212 ---- /** ! * Get the configuration information for this processor. * * @return IConfigInfo object Index: ThreadPooledPipelineStageProcessor.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/processor/ThreadPooledPipelineStageProcessor.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ThreadPooledPipelineStageProcessor.java 23 Jul 2004 22:38:09 -0000 1.7 --- ThreadPooledPipelineStageProcessor.java 30 Jul 2004 01:33:03 -0000 1.8 *************** *** 89,95 **** --- 89,99 ---- implements IShutdownListener { + /** poolsize configuration. */ public static final String POOL_SIZE = "poolSize"; + /** keepalive configuration. */ public static final String KEEP_ALIVE = "keepAlive"; + /** default poolsize. */ public static final int DEFAULT_POOLSIZE = 5; + /** default keep alive. */ public static final int DEFAULT_KEEPALIVE = 15*1000; // 15 seconds *************** *** 103,106 **** --- 107,111 ---- * * @param stageFactory set the associated stage factory for this processor + * @param data data for the pipeline */ public void configure(IPipelineStageFactory stageFactory, IConfigData data) { *************** *** 126,129 **** --- 131,135 ---- * @param psResults results from the current pipeline stage process * @param finalResults result of the current pipeline stage process + * @throws PipelineException */ protected void processPipelineStageResults(final PipelineStageResult[] psResults, Collection finalResults) *************** *** 151,155 **** /** ! * Get the configuration information for this processor * * @return IConfigInfo object --- 157,161 ---- /** ! * Get the configuration information for this processor. * * @return IConfigInfo object Index: ProcessorConfigInfo.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/processor/ProcessorConfigInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ProcessorConfigInfo.java 23 Jul 2004 22:38:09 -0000 1.4 --- ProcessorConfigInfo.java 30 Jul 2004 01:33:03 -0000 1.5 *************** *** 95,101 **** extends ConfigInfo{ /** ! * This method returns options that are general to all components * ! * @return comments */ public Collection getGeneralOptions() { --- 95,101 ---- extends ConfigInfo{ /** ! * This method returns options that are general to all components. * ! * @return collection of general options. */ public Collection getGeneralOptions() { *************** *** 104,110 **** /** ! * Return an xmlized version of the of the config info * ! * @return DOCUMENT ME! */ public String toXml() { --- 104,110 ---- /** ! * Return an xmlized version of the of the config info. * ! * @return xml version of the data. */ public String toXml() { *************** *** 154,160 **** /** ! * Get all the xml definitions in one humungo xml file * ! * @return */ public static String getAllXml() { --- 154,160 ---- /** ! * Get all the xml definitions in one humungo xml file. * ! * @return all the stages xml */ public static String getAllXml() { Index: IPipelineStageProcessor.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/processor/IPipelineStageProcessor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IPipelineStageProcessor.java 23 Jul 2004 22:38:09 -0000 1.4 --- IPipelineStageProcessor.java 30 Jul 2004 01:33:03 -0000 1.5 *************** *** 84,87 **** --- 84,88 ---- public interface IPipelineStageProcessor extends IConfigurable { + /** constant processor. */ public static final String PROCESSOR = "processor"; *************** *** 90,96 **** * * @param stageName the unique name of the stage - * * @return a reference to the pipeline stage - * * @throws PipelineException */ --- 91,95 ---- *************** *** 108,112 **** * @param finalResults the resulting processed documents after all processing is completed * ! * @throws com.babeldoc.core.pipeline.PipelineException DOCUMENT ME! */ public void process(String name, PipelineDocument document, --- 107,111 ---- * @param finalResults the resulting processed documents after all processing is completed * ! * @throws com.babeldoc.core.pipeline.PipelineException */ public void process(String name, PipelineDocument document, |
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:13
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/pipeline/xml Modified Files: IUnmarshaller.java XmlPipelineStageFactory.java XmlPipelineStageResolver.java Log Message: javadoc and formatting here. Index: IUnmarshaller.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/IUnmarshaller.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IUnmarshaller.java 12 Aug 2003 23:44:44 -0000 1.4 --- IUnmarshaller.java 30 Jul 2004 01:33:04 -0000 1.5 *************** *** 70,74 **** /** ! * Interface that all pipeline stage configuration unmarshallers * * @author bmcdonald --- 70,74 ---- /** ! * Interface that all pipeline stage configuration unmarshallers. * * @author bmcdonald *************** *** 76,83 **** */ public interface IUnmarshaller { public static final String ROOT = "root"; /** ! * Get the array of pipeline stage connections * * @return array of connections. --- 76,84 ---- */ public interface IUnmarshaller { + /** root string. */ public static final String ROOT = "root"; /** ! * Get the array of pipeline stage connections. * * @return array of connections. *************** *** 88,92 **** * Get root configuration object. * ! * @return */ public IConfigData getRootConfig(); --- 89,93 ---- * Get root configuration object. * ! * @return config data */ public IConfigData getRootConfig(); Index: XmlPipelineStageFactory.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/XmlPipelineStageFactory.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** XmlPipelineStageFactory.java 27 Aug 2003 03:13:35 -0000 1.8 --- XmlPipelineStageFactory.java 30 Jul 2004 01:33:04 -0000 1.9 *************** *** 90,97 **** extends PipelineStageFactory { ! /** constant: Configuration constants */ public static final String XML_FILENAME = "configFile"; ! /** Keep the configuration information */ private IConfigInfo info; --- 90,97 ---- extends PipelineStageFactory { ! /** constant: Configuration constants. */ public static final String XML_FILENAME = "configFile"; ! /** Keep the configuration information. */ private IConfigInfo info; *************** *** 116,120 **** /** ! * Get the configuration iformation for this class * * @return IConfigInfo object --- 116,120 ---- /** ! * Get the configuration iformation for this class. * * @return IConfigInfo object Index: XmlPipelineStageResolver.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/XmlPipelineStageResolver.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** XmlPipelineStageResolver.java 12 Aug 2003 23:44:44 -0000 1.8 --- XmlPipelineStageResolver.java 30 Jul 2004 01:33:04 -0000 1.9 *************** *** 89,98 **** implements IPipelineStageResolver { /** ! * Set up the data for this resolver * ! * @param xmlFile * ! * @throws IOException DOCUMENT ME! ! * @throws RuntimeException DOCUMENT ME! */ public XmlPipelineStageResolver(String xmlFile) throws IOException { --- 89,97 ---- implements IPipelineStageResolver { /** ! * Set up the data for this resolver. * ! * @param xmlFile xml file. * ! * @throws IOException */ public XmlPipelineStageResolver(String xmlFile) throws IOException { *************** *** 113,117 **** * handled. Need to create the stages hashtables too. * ! * @param unmarshaller */ protected void setupConfigData(IUnmarshaller unmarshaller) { --- 112,116 ---- * handled. Need to create the stages hashtables too. * ! * @param unmarshaller marshaller object. */ protected void setupConfigData(IUnmarshaller unmarshaller) { |
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:12
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/pipeline/simple Modified Files: SimplePipelineStageFactory.java SimplePipelineStageResolver.java Log Message: javadoc and formatting here. Index: SimplePipelineStageFactory.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/simple/SimplePipelineStageFactory.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SimplePipelineStageFactory.java 7 Nov 2003 02:29:52 -0000 1.8 --- SimplePipelineStageFactory.java 30 Jul 2004 01:33:03 -0000 1.9 *************** *** 87,98 **** implements IPipelineStageFactory { ! /** Configuration constants */ public static final String CONFIG_FILENAME = "configFile"; ! /** Keep reference to the configuration information */ private IConfigInfo info; /** ! * Get the configuration iformation for this class * * @return IConfigInfo object --- 87,98 ---- implements IPipelineStageFactory { ! /** Configuration constants. */ public static final String CONFIG_FILENAME = "configFile"; ! /** Keep reference to the configuration information. */ private IConfigInfo info; /** ! * Get the configuration iformation for this class. * * @return IConfigInfo object Index: SimplePipelineStageResolver.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/simple/SimplePipelineStageResolver.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SimplePipelineStageResolver.java 12 Aug 2003 23:44:44 -0000 1.8 --- SimplePipelineStageResolver.java 30 Jul 2004 01:33:03 -0000 1.9 *************** *** 89,98 **** extends PipelineStageResolver implements IPipelineStageResolver { ! /** configuration constants */ public static final String CONNECTION = "connection"; public static final String GLUE = "."; /** ! * Construct this object */ public SimplePipelineStageResolver() { --- 89,99 ---- extends PipelineStageResolver implements IPipelineStageResolver { ! /** configuration constants. */ public static final String CONNECTION = "connection"; + /** configuration constants. */ public static final String GLUE = "."; /** ! * Construct this object. */ public SimplePipelineStageResolver() { *************** *** 101,107 **** /** ! * Construct this object using a configuration object * ! * @param config */ public SimplePipelineStageResolver(IConfig config) { --- 102,108 ---- /** ! * Construct this object using a configuration object. * ! * @param config configuration data */ public SimplePipelineStageResolver(IConfig config) { *************** *** 115,119 **** * configuration information. * ! * @param config */ protected void setupConfigData(IConfig config) { --- 116,120 ---- * configuration information. * ! * @param config configuration data */ protected void setupConfigData(IConfig config) { |
|
From: bruce m. <tr...@us...> - 2004-07-30 01:33:11
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/error In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/modules/core/src/com/babeldoc/core/pipeline/error Modified Files: RedirectErrorHandler.java Log Message: javadoc and formatting here. Index: RedirectErrorHandler.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/error/RedirectErrorHandler.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RedirectErrorHandler.java 16 Sep 2003 05:19:01 -0000 1.5 --- RedirectErrorHandler.java 30 Jul 2004 01:33:02 -0000 1.6 *************** *** 80,84 **** public class RedirectErrorHandler implements IPipelineStageErrorHandler { /** ! * Called when an error is encountered * * @param stage the pipeline stage that encountered the exception --- 80,84 ---- public class RedirectErrorHandler implements IPipelineStageErrorHandler { /** ! * Called when an error is encountered. * * @param stage the pipeline stage that encountered the exception |
|
From: bruce m. <tr...@us...> - 2004-07-30 00:14:10
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28587/modules/core/src/com/babeldoc/core Modified Files: BabeldocCommand.java Log Message: When BabeldocCommand is run with an option -d, the logger is put into debug mode. Index: BabeldocCommand.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/BabeldocCommand.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** BabeldocCommand.java 23 Jul 2004 22:28:09 -0000 1.18 --- BabeldocCommand.java 30 Jul 2004 00:13:54 -0000 1.19 *************** *** 78,81 **** --- 78,83 ---- import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; + import org.apache.log4j.Logger; + import org.apache.log4j.Level; /** *************** *** 91,297 **** */ public abstract class BabeldocCommand ! extends Named { ! /** Options */ ! private Options options = new Options(); ! /** The description of the command */ ! private String desc; ! /** instance: is this verbose */ ! private boolean verbose = false; ! /** ! * Had to lessen this from private access. This is because it is too strict ! * for all purposes. ! */ ! protected BabeldocCommand() { ! } ! /** ! * construct the object. The arguments from the command line. ! * ! * @param name command name ! * @param desc command description ! * @param args command line arguments ! */ ! protected BabeldocCommand(String name, String desc, String[] args) { ! setName(name); ! this.desc = desc; ! setup(); ! setupCommandLine(options); ! CommandLine commandLine = null; ! try { ! commandLine = new GnuParser().parse(options, args); ! } catch (ParseException e) { ! printUsage(); ! return; ! } ! setupShutdownHook(); ! executeCommand(commandLine); ! } ! /** ! * Set the verbose flag ! * ! * @param verbose flag ! */ ! public void setVerbose(boolean verbose) { ! this.verbose = verbose; ! } ! /** ! * @return get the verbose flag ! */ ! public boolean isVerbose() { ! return verbose; ! } ! /** ! * execute the commandline. This must be overloaded to handle the command ! * line options ! * ! * @param commandLine the command line options that have been detected ! */ ! public void executeCommand(CommandLine commandLine) { ! if (commandLine.hasOption('h')) { ! printUsage(); ! return; ! }; ! if (commandLine.hasOption('v')) { ! setVerbose(true); ! }; ! if (commandLine.hasOption('d')) { ! printConfigInfo(); ! }; ! execute(commandLine); EnvironmentLoader.shutdown(); ! } ! ! ! /** ! * @param commandLine ! */ ! public abstract void execute(CommandLine commandLine); ! /** ! * Stopping - execute all necessary shutdown processing. ! */ ! public void finishUp() { ! } ! /** ! * print the usage instructions ! */ ! public void printUsage() { ! System.out.println(getName()); ! System.out.println(desc); ! new HelpFormatter().printHelp(getName(), options); ! String version = ! ConfigService.getString("env/build", "babeldoc_version"); ! System.out.println("\n" + I18n.get("001006", version)); ! System.out.println(I18n.get("001007")); ! System.out.println(I18n.get("001008")); ! System.out.println(I18n.get("001009")); ! } ! /** ! * print configuration info ! */ ! public void printConfigInfo() { ! // NOTE: copied from LightConfigService.mergePropertiesFileFromUserSearchPath ! // get all the 'config.properties' files that are/will be loaded ! URL[] urls = ! ResourceLoader.getMatchingUrlsInSearchPath( ! "env/config.properties", ! EnvironmentLoader.getSearchPaths()); ! // display the name and contents of each config file ! System.out.println("Showing configuration files and contents:"); ! for (int i = urls.length - 1; i >= 0; --i) { ! URL url = urls[i]; ! System.out.println(" === " + url + " ==="); ! try { ! BufferedReader reader = ! new BufferedReader(new InputStreamReader(url.openStream())); ! String line; ! do { ! line = reader.readLine(); ! if (line != null) { ! System.out.println(line); ! } ! } while (line != null); ! } catch (IOException e) { ! LogService.getInstance().logError(e); ! } ! } ! } ! /** ! * setup the options on the command line. ! * ! * @param options the options to access ! */ ! public void setupCommandLine(Options options) { ! options.addOption( ! "v", ! "verbose", ! false, ! I18n.get("001002")); ! options.addOption( ! "h", ! "help", ! false, ! I18n.get("001003")); ! options.addOption("d", "debug", false, "Write config info to stdout"); ! } ! /** ! * Setup the shutdown hook. ! */ ! public void setupShutdownHook() { ! /** ! * Thread class that will be executed when this command shutsdown. ! */ ! class ShutMeDownNicely extends Thread { ! BabeldocCommand command; ! /** ! * Creates a new ShutMeDownNicely object. ! * ! * @param command DOCUMENT ME! ! */ ! ShutMeDownNicely(BabeldocCommand command) { ! super("shutdown"); ! this.command = command; ! } ! /** ! * shut down the command by calling finishUp ! */ ! public void run() { ! LogService.getInstance().logDebug(I18n.get("001001")); ! command.finishUp(); ! } ! } ! Runtime.getRuntime().addShutdownHook(new ShutMeDownNicely(this)); ! } ! /** ! * Setup - calls the Environment loader which bootstraps the ! * <sttrong>Babeldoc</strong> environment. ! */ ! protected void setup() { ! // EnvironmentLoader.loadEnvironment(); ! } } --- 93,310 ---- */ public abstract class BabeldocCommand ! extends Named { ! /** Available options. */ ! private Options options = new Options(); ! /** The description of the command. */ ! private String desc; ! /** instance: is this verbose. */ ! private boolean verbose = false; ! private static final String LOGGER_NAME = "com.babeldoc"; ! /** ! * Had to lessen this from private access. This is because it is too strict ! * for all purposes. ! */ ! protected BabeldocCommand() { ! } ! /** ! * Construct the object. The arguments from the command line are ! * parsed into the CommandLine object which is then passed to ! * the executeCommand method. ! * ! * @param name command name ! * @param desc command description ! * @param args command line arguments ! */ ! protected BabeldocCommand(String name, String desc, String[] args) { ! setName(name); ! this.desc = desc; ! setup(); ! setupCommandLine(options); ! CommandLine commandLine = null; ! try { ! commandLine = new GnuParser().parse(options, args); ! } catch (ParseException e) { ! printUsage(); ! return; ! } ! setupShutdownHook(); ! executeCommand(commandLine); ! } ! /** ! * Set the verbose flag. ! * ! * @param verbose flag ! */ ! public void setVerbose(boolean verbose) { ! this.verbose = verbose; ! if(this.verbose) { ! Logger.getLogger(LOGGER_NAME).setLevel((Level)Level.DEBUG); ! } ! } ! /** ! * Get the verbose flag. ! * ! * @return get the verbose flag ! */ ! public boolean isVerbose() { ! return verbose; ! } ! /** ! * execute the commandline. This must be overloaded to handle the command ! * line options ! * ! * @param commandLine the command line options that have been detected ! */ ! public void executeCommand(CommandLine commandLine) { ! if (commandLine.hasOption('h')) { ! printUsage(); ! return; ! }; ! if (commandLine.hasOption('v')) { ! setVerbose(true); ! }; ! if (commandLine.hasOption('d')) { ! printConfigInfo(); ! }; ! execute(commandLine); EnvironmentLoader.shutdown(); ! } ! ! ! /** ! * Execute the command specific arguments from using the command line. ! * ! * @param commandLine parsed arguments from main. ! */ ! public abstract void execute(CommandLine commandLine); ! /** ! * Stopping - execute all necessary shutdown processing. ! */ ! public void finishUp() { ! } ! /** ! * print the usage instructions. Child classes must call this prior ! * to printing their usage instructions. ! */ ! public void printUsage() { ! System.out.println(getName()); ! System.out.println(desc); ! new HelpFormatter().printHelp(getName(), options); ! String version = ! ConfigService.getString("env/build", "babeldoc_version"); ! System.out.println("\n" + I18n.get("001006", version)); ! System.out.println(I18n.get("001007")); ! System.out.println(I18n.get("001008")); ! System.out.println(I18n.get("001009")); ! } ! /** ! * print configuration infomation. ! */ ! public void printConfigInfo() { ! // NOTE: copied from LightConfigService.mergePropertiesFileFromUserSearchPath ! // get all the 'config.properties' files that are/will be loaded ! URL[] urls = ! ResourceLoader.getMatchingUrlsInSearchPath( ! "env/config.properties", ! EnvironmentLoader.getSearchPaths()); ! // display the name and contents of each config file ! System.out.println("Showing configuration files and contents:"); ! for (int i = urls.length - 1; 0 <= i; --i) { ! URL url = urls[i]; ! System.out.println(" === " + url + " ==="); ! try { ! BufferedReader reader = ! new BufferedReader(new InputStreamReader(url.openStream())); ! String line; ! do { ! line = reader.readLine(); ! if (null != line) { ! System.out.println(line); ! } ! } while (null != line); ! } catch (IOException e) { ! LogService.getInstance().logError(e); ! } ! } ! } ! /** ! * setup the options on the command line. ! * ! * @param options the options to access ! */ ! public void setupCommandLine(Options options) { ! options.addOption( ! "v", ! "verbose", ! false, ! I18n.get("001002")); ! options.addOption( ! "h", ! "help", ! false, ! I18n.get("001003")); ! options.addOption("d", "debug", false, "Write config info to stdout"); ! } ! /** ! * Setup the shutdown hook. ! */ ! public void setupShutdownHook() { ! /** ! * Thread class that will be executed when this command shutsdown. ! */ ! class ShutMeDownNicely extends Thread { ! BabeldocCommand command; ! /** ! * Creates a new ShutMeDownNicely object. ! * ! * @param command DOCUMENT ME! ! */ ! ShutMeDownNicely(BabeldocCommand command) { ! super("shutdown"); ! this.command = command; ! } ! /** ! * shut down the command by calling finishUp ! */ ! public void run() { ! LogService.getInstance().logDebug(I18n.get("001001")); ! command.finishUp(); ! } ! } ! Runtime.getRuntime().addShutdownHook(new ShutMeDownNicely(this)); ! } ! /** ! * Setup - calls the Environment loader which bootstraps the ! * <sttrong>Babeldoc</strong> environment. ! */ ! protected void setup() { ! // EnvironmentLoader.loadEnvironment(); ! } } |
2 messages has been excluded from this view by a project administrator.
