babeldoc-devel — Babeldoc developer list

Re: [Babeldoc-devel] Temp branch

[Bruce M. <br...@mc...>]

I dont mind moving quite a bit of current babeldoc out to modules project.  In 
my mind this includes:

babelfish
conversion
xslfo

Now, at the moment we just place these in a top level directory in the same 
tree as babeldoc - thus restricting committers to the same list as for 
babeldoc.  This could be a problem.  So your idea about another project is 
probably the right idea here.

regards,
Bruce

Tiki-wiki is not happening - how can you help with this?  Do you have a spare 
internet connected server laying around :) ?

On Thursday 13 November 2003 02:56 am, Dejan Krsmanovic wrote:
> We should really think about new Babeldoc structure in post 1.2 versions. I
> guess that there will be more and more features that not everybody will
> use. So it does make sense to include only necessery classes in the main
> package. All other modules (including pipeline stages and scanner workers)
> should be downloaded separately. That's why I put jabber module in separate
> cvs module. Unfortunatelly we really don't have plan how this all should
> look like (developing and installing new modules) so it just sit there
> waiting for its time ;).
>
> So maybe it is time to start thinking about separating classes into
> modules. Or we should let this for Babeldoc 2.0 since there could possibly
> be many incompatibilies?
>
> Dejan
> P.S.
> Bruce, what is happening with tiki-wiki? If you need any help with setting
> up please contact me.
>
> ----- Original Message -----
> From: "Michael Ansley" <mic...@ze...>
> To: <bab...@li...>
> Sent: Thursday, November 13, 2003 1:46 AM
> Subject: Re: [Babeldoc-devel] Temp branch
>
> > Hi,
> >
> > Yes, of course.
> >
> > If anybody is interested in the work (jmx scanner and jfreereports
> > stage), feel free to contact me and help out with development.
> >
> > Cheers...
> >
> >
> > MikeA
> >
> > On Wed, 2003-11-12 at 23:24, Bruce McDonald wrote:
> > > Ok,  can you give some idea (at the merge time) what everything is?
> > >
> > > On Wednesday 12 November 2003 06:10 pm, Michael Ansley wrote:
> > > > Hi,
> > > >
> > > > FYI:
> > > > I've created a branch called TEMP_MIKEA, which contains some
>
> development
>
> > > > work that I'm busy with.  It is intended that once the maintenance
> > > > branch for 1.2 is created, this temp branch will be merged with the
> > > > HEAD.
> > > >
> > > > Cheers...
> > > >
> > > >
> > > > MikeA
> > > >
> > > >
> > > >
> > > >
> > > >
> > > > -------------------------------------------------------
> > > > This SF.Net email sponsored by: ApacheCon 2003,
> > > > 16-19 November in Las Vegas. Learn firsthand the latest
> > > > developments in Apache, PHP, Perl, XML, Java, MySQL,
> > > > WebDAV, and more! http://www.apachecon.com/
> > > > _______________________________________________
> > > > Babeldoc-devel mailing list
> > > > Bab...@li...
> > > > https://lists.sourceforge.net/lists/listinfo/babeldoc-devel
> > >
> > > -------------------------------------------------------
> > > This SF.Net email sponsored by: ApacheCon 2003,
> > > 16-19 November in Las Vegas. Learn firsthand the latest
> > > developments in Apache, PHP, Perl, XML, Java, MySQL,
> > > WebDAV, and more! http://www.apachecon.com/
> > > _______________________________________________
> > > Babeldoc-devel mailing list
> > > Bab...@li...
> > > https://lists.sourceforge.net/lists/listinfo/babeldoc-devel
> >
> > -------------------------------------------------------
> > This SF.Net email sponsored by: ApacheCon 2003,
> > 16-19 November in Las Vegas. Learn firsthand the latest
> > developments in Apache, PHP, Perl, XML, Java, MySQL,
> > WebDAV, and more! http://www.apachecon.com/
> > _______________________________________________
> > Babeldoc-devel mailing list
> > Bab...@li...
> > https://lists.sourceforge.net/lists/listinfo/babeldoc-devel
>
> -------------------------------------------------------
> This SF.Net email sponsored by: ApacheCon 2003,
> 16-19 November in Las Vegas. Learn firsthand the latest
> developments in Apache, PHP, Perl, XML, Java, MySQL,
> WebDAV, and more! http://www.apachecon.com/
> _______________________________________________
> Babeldoc-devel mailing list
> Bab...@li...
> https://lists.sourceforge.net/lists/listinfo/babeldoc-devel

Re: [Babeldoc-devel] Temp branch

[Dejan K. <dej...@nb...>]

> I think that we should probably look at guidelines for 1.3, and try to
> do as much as possible without breaking anything.  I'm happy to move the
> jfreereports stuff into a separate project, even for 1.3.  It's not in
> 1.2, so there are no issues with compatibility.
>
> In order to set the guidelines, a few questions: what constitutes a core
> module (i.e.: one which goes into com.babeldoc.core.pipeline or
> com.babeldoc.scanner)?  Or a secondary (i.e.: it goes into e.g.:
> com.babeldoc.sql.*), or a peripheral module (i.e.: into it's own CVS
> project and separate jar files)

Well these are the issues we should talk about. I am not very satisfied with
current module organization. IMO, in core module there should be classes
needed by other modules. For example, I would put scanner classes into core
module. However, I would exclude all classes (scaner workers, pipeline
stages, journal implementations) that need some additional jars or that are
not used very often.
All other modules should be developed, maintained and downloaded separately.


> As far as the mechanics go, what about having a "contrib" top-level
> project, into which any developer can place any experimental code.
> Postgres do this, and it seems to work quite well.  When something in
> contrib is considered to have matured enough, and be demanded enough, to
> be in the core system, it's migrated from contrib into the main project.
>
> Thoughts...

I agree. I would even create this as separate CVS project so we can grant
CVS commit rights to everyone who wants.

By the way, what exactly will do your new pipeline stage (jfreereport)?

Dejan

>
> MikeA
>
> PS: I added a stack of directories before branching, I'm not sure if
> they appear on the HEAD now.  Anybody getting the new directories when
> they "cvs update"?

Re: [Babeldoc-devel] Temp branch

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

Hi,

I think that we should probably look at guidelines for 1.3, and try to
do as much as possible without breaking anything.  I'm happy to move the
jfreereports stuff into a separate project, even for 1.3.  It's not in
1.2, so there are no issues with compatibility.

In order to set the guidelines, a few questions: what constitutes a core
module (i.e.: one which goes into com.babeldoc.core.pipeline or
com.babeldoc.scanner)?  Or a secondary (i.e.: it goes into e.g.:
com.babeldoc.sql.*), or a peripheral module (i.e.: into it's own CVS
project and separate jar files)

As far as the mechanics go, what about having a "contrib" top-level
project, into which any developer can place any experimental code. 
Postgres do this, and it seems to work quite well.  When something in
contrib is considered to have matured enough, and be demanded enough, to
be in the core system, it's migrated from contrib into the main project.

Thoughts...


MikeA

PS: I added a stack of directories before branching, I'm not sure if
they appear on the HEAD now.  Anybody getting the new directories when
they "cvs update"?


On Thu, 2003-11-13 at 07:56, Dejan Krsmanovic wrote:
> We should really think about new Babeldoc structure in post 1.2 versions. I
> guess that there will be more and more features that not everybody will use.
> So it does make sense to include only necessery classes in the main package.
> All other modules (including pipeline stages and scanner workers) should be
> downloaded separately. That's why I put jabber module in separate cvs
> module. Unfortunatelly we really don't have plan how this all should look
> like (developing and installing new modules) so it just sit there waiting
> for its time ;).
> 
> So maybe it is time to start thinking about separating classes into modules.
> Or we should let this for Babeldoc 2.0 since there could possibly be many
> incompatibilies?
> 
> Dejan
> P.S.
> Bruce, what is happening with tiki-wiki? If you need any help with setting
> up please contact me.
> 
> ----- Original Message ----- 
> From: "Michael Ansley" <mic...@ze...>
> To: <bab...@li...>
> Sent: Thursday, November 13, 2003 1:46 AM
> Subject: Re: [Babeldoc-devel] Temp branch
> 
> 
> > Hi,
> >
> > Yes, of course.
> >
> > If anybody is interested in the work (jmx scanner and jfreereports
> > stage), feel free to contact me and help out with development.
> >
> > Cheers...
> >
> >
> > MikeA
> >
> >
> >
> >
> > On Wed, 2003-11-12 at 23:24, Bruce McDonald wrote:
> > > Ok,  can you give some idea (at the merge time) what everything is?
> > >
> > > On Wednesday 12 November 2003 06:10 pm, Michael Ansley wrote:
> > > > Hi,
> > > >
> > > > FYI:
> > > > I've created a branch called TEMP_MIKEA, which contains some
> development
> > > > work that I'm busy with.  It is intended that once the maintenance
> > > > branch for 1.2 is created, this temp branch will be merged with the
> > > > HEAD.
> > > >
> > > > Cheers...
> > > >
> > > >
> > > > MikeA
> > > >
> > > >
> > > >
> > > >
> > > >
> > > > -------------------------------------------------------
> > > > This SF.Net email sponsored by: ApacheCon 2003,
> > > > 16-19 November in Las Vegas. Learn firsthand the latest
> > > > developments in Apache, PHP, Perl, XML, Java, MySQL,
> > > > WebDAV, and more! http://www.apachecon.com/
> > > > _______________________________________________
> > > > Babeldoc-devel mailing list
> > > > Bab...@li...
> > > > https://lists.sourceforge.net/lists/listinfo/babeldoc-devel
> > >
> > >
> > > -------------------------------------------------------
> > > This SF.Net email sponsored by: ApacheCon 2003,
> > > 16-19 November in Las Vegas. Learn firsthand the latest
> > > developments in Apache, PHP, Perl, XML, Java, MySQL,
> > > WebDAV, and more! http://www.apachecon.com/
> > > _______________________________________________
> > > Babeldoc-devel mailing list
> > > Bab...@li...
> > > https://lists.sourceforge.net/lists/listinfo/babeldoc-devel
> >
> >
> >
> > -------------------------------------------------------
> > This SF.Net email sponsored by: ApacheCon 2003,
> > 16-19 November in Las Vegas. Learn firsthand the latest
> > developments in Apache, PHP, Perl, XML, Java, MySQL,
> > WebDAV, and more! http://www.apachecon.com/
> > _______________________________________________
> > Babeldoc-devel mailing list
> > Bab...@li...
> > https://lists.sourceforge.net/lists/listinfo/babeldoc-devel
> 
> 
> 
> 
> -------------------------------------------------------
> This SF.Net email sponsored by: ApacheCon 2003,
> 16-19 November in Las Vegas. Learn firsthand the latest
> developments in Apache, PHP, Perl, XML, Java, MySQL,
> WebDAV, and more! http://www.apachecon.com/
> _______________________________________________
> Babeldoc-devel mailing list
> Bab...@li...
> https://lists.sourceforge.net/lists/listinfo/babeldoc-devel

Re: [Babeldoc-devel] Temp branch

[Dejan K. <dej...@nb...>]

We should really think about new Babeldoc structure in post 1.2 versions. I
guess that there will be more and more features that not everybody will use.
So it does make sense to include only necessery classes in the main package.
All other modules (including pipeline stages and scanner workers) should be
downloaded separately. That's why I put jabber module in separate cvs
module. Unfortunatelly we really don't have plan how this all should look
like (developing and installing new modules) so it just sit there waiting
for its time ;).

So maybe it is time to start thinking about separating classes into modules.
Or we should let this for Babeldoc 2.0 since there could possibly be many
incompatibilies?

Dejan
P.S.
Bruce, what is happening with tiki-wiki? If you need any help with setting
up please contact me.

----- Original Message ----- 
From: "Michael Ansley" <mic...@ze...>
To: <bab...@li...>
Sent: Thursday, November 13, 2003 1:46 AM
Subject: Re: [Babeldoc-devel] Temp branch


> Hi,
>
> Yes, of course.
>
> If anybody is interested in the work (jmx scanner and jfreereports
> stage), feel free to contact me and help out with development.
>
> Cheers...
>
>
> MikeA
>
>
>
>
> On Wed, 2003-11-12 at 23:24, Bruce McDonald wrote:
> > Ok,  can you give some idea (at the merge time) what everything is?
> >
> > On Wednesday 12 November 2003 06:10 pm, Michael Ansley wrote:
> > > Hi,
> > >
> > > FYI:
> > > I've created a branch called TEMP_MIKEA, which contains some
development
> > > work that I'm busy with.  It is intended that once the maintenance
> > > branch for 1.2 is created, this temp branch will be merged with the
> > > HEAD.
> > >
> > > Cheers...
> > >
> > >
> > > MikeA
> > >
> > >
> > >
> > >
> > >
> > > -------------------------------------------------------
> > > This SF.Net email sponsored by: ApacheCon 2003,
> > > 16-19 November in Las Vegas. Learn firsthand the latest
> > > developments in Apache, PHP, Perl, XML, Java, MySQL,
> > > WebDAV, and more! http://www.apachecon.com/
> > > _______________________________________________
> > > Babeldoc-devel mailing list
> > > Bab...@li...
> > > https://lists.sourceforge.net/lists/listinfo/babeldoc-devel
> >
> >
> > -------------------------------------------------------
> > This SF.Net email sponsored by: ApacheCon 2003,
> > 16-19 November in Las Vegas. Learn firsthand the latest
> > developments in Apache, PHP, Perl, XML, Java, MySQL,
> > WebDAV, and more! http://www.apachecon.com/
> > _______________________________________________
> > Babeldoc-devel mailing list
> > Bab...@li...
> > https://lists.sourceforge.net/lists/listinfo/babeldoc-devel
>
>
>
> -------------------------------------------------------
> This SF.Net email sponsored by: ApacheCon 2003,
> 16-19 November in Las Vegas. Learn firsthand the latest
> developments in Apache, PHP, Perl, XML, Java, MySQL,
> WebDAV, and more! http://www.apachecon.com/
> _______________________________________________
> Babeldoc-devel mailing list
> Bab...@li...
> https://lists.sourceforge.net/lists/listinfo/babeldoc-devel

Re: [Babeldoc-devel] Temp branch

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

Hi,

Yes, of course.

If anybody is interested in the work (jmx scanner and jfreereports
stage), feel free to contact me and help out with development.

Cheers...


MikeA




On Wed, 2003-11-12 at 23:24, Bruce McDonald wrote:
> Ok,  can you give some idea (at the merge time) what everything is?
> 
> On Wednesday 12 November 2003 06:10 pm, Michael Ansley wrote:
> > Hi,
> >
> > FYI:
> > I've created a branch called TEMP_MIKEA, which contains some development
> > work that I'm busy with.  It is intended that once the maintenance
> > branch for 1.2 is created, this temp branch will be merged with the
> > HEAD.
> >
> > Cheers...
> >
> >
> > MikeA
> >
> >
> >
> >
> >
> > -------------------------------------------------------
> > This SF.Net email sponsored by: ApacheCon 2003,
> > 16-19 November in Las Vegas. Learn firsthand the latest
> > developments in Apache, PHP, Perl, XML, Java, MySQL,
> > WebDAV, and more! http://www.apachecon.com/
> > _______________________________________________
> > Babeldoc-devel mailing list
> > Bab...@li...
> > https://lists.sourceforge.net/lists/listinfo/babeldoc-devel
> 
> 
> -------------------------------------------------------
> This SF.Net email sponsored by: ApacheCon 2003,
> 16-19 November in Las Vegas. Learn firsthand the latest
> developments in Apache, PHP, Perl, XML, Java, MySQL,
> WebDAV, and more! http://www.apachecon.com/
> _______________________________________________
> Babeldoc-devel mailing list
> Bab...@li...
> https://lists.sourceforge.net/lists/listinfo/babeldoc-devel

Re: [Babeldoc-devel] Temp branch

[Bruce M. <br...@mc...>]

Ok,  can you give some idea (at the merge time) what everything is?

On Wednesday 12 November 2003 06:10 pm, Michael Ansley wrote:
> Hi,
>
> FYI:
> I've created a branch called TEMP_MIKEA, which contains some development
> work that I'm busy with.  It is intended that once the maintenance
> branch for 1.2 is created, this temp branch will be merged with the
> HEAD.
>
> Cheers...
>
>
> MikeA
>
>
>
>
>
> -------------------------------------------------------
> This SF.Net email sponsored by: ApacheCon 2003,
> 16-19 November in Las Vegas. Learn firsthand the latest
> developments in Apache, PHP, Perl, XML, Java, MySQL,
> WebDAV, and more! http://www.apachecon.com/
> _______________________________________________
> Babeldoc-devel mailing list
> Bab...@li...
> https://lists.sourceforge.net/lists/listinfo/babeldoc-devel

[Babeldoc-devel] Temp branch

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

Hi,

FYI:
I've created a branch called TEMP_MIKEA, which contains some development
work that I'm busy with.  It is intended that once the maintenance
branch for 1.2 is created, this temp branch will be merged with the
HEAD.

Cheers...


MikeA

[Babeldoc-devel] babeldoc/modules/jfreereports/services com.babeldoc.core.module.BabeldocModule,NONE,1.1.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/jfreereports/services
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/jfreereports/services

Added Files:
      Tag: TEMP_MIKEA
	com.babeldoc.core.module.BabeldocModule 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

--- NEW FILE: com.babeldoc.core.module.BabeldocModule ---
com.babeldoc.jfreereports.module.JFRModule

[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner/jmx ScannerServiceMBean.java,1.3,1.3.2.1 ScannerService.java,1.5,1.5.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/jmx
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/scanner/src/com/babeldoc/scanner/jmx

Modified Files:
      Tag: TEMP_MIKEA
	ScannerServiceMBean.java ScannerService.java 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

Index: ScannerServiceMBean.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/jmx/ScannerServiceMBean.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** ScannerServiceMBean.java	27 Jun 2003 14:00:15 -0000	1.3
--- ScannerServiceMBean.java	12 Nov 2003 22:18:06 -0000	1.3.2.1
***************
*** 92,95 ****
--- 92,101 ----
    public String getConfigUrl() throws Exception;
  
+   public void setBabeldocHome(String home) throws Exception;
+   
+   public String getBabeldocHome() throws Exception;
+ 
+   public String getStateString() throws Exception;
+   
    /**
     * TODO: DOCUMENT ME!

Index: ScannerService.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/jmx/ScannerService.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** ScannerService.java	27 Jun 2003 14:00:15 -0000	1.5
--- ScannerService.java	12 Nov 2003 22:18:06 -0000	1.5.2.1
***************
*** 66,76 ****
  package com.babeldoc.scanner.jmx;
  
  import com.babeldoc.scanner.Scanner;
  
  
  /**
   * MBean service support for jboss.  Start up the scanner
-  */
- /**
   * MBean implementor - this is for embedding the scanner into a mbean container
   * like jboss or weblogic, etc, etc.  Generally a good idea, the only problem
--- 66,77 ----
  package com.babeldoc.scanner.jmx;
  
+ import com.babeldoc.core.LogService;
  import com.babeldoc.scanner.Scanner;
  
+ import java.net.URL;
+ 
  
  /**
   * MBean service support for jboss.  Start up the scanner
   * MBean implementor - this is for embedding the scanner into a mbean container
   * like jboss or weblogic, etc, etc.  Generally a good idea, the only problem
***************
*** 81,84 ****
--- 82,91 ----
   */
  public class ScannerService implements ScannerServiceMBean {
+   private static LogService log =
+ 				LogService.getInstance(ScannerService.class.getName());
+   public static final int STATE_STOPPED = 0;
+   public static final int STATE_STARTED = 1; 
+   public static final String stateDescriptions[] = new String[] {"scanner.002", "scanner.001"};
+   int state = 0;
    Scanner scanner = null;
  
***************
*** 94,114 ****
     */
    public void setConfigUrl(String configUrl) throws Exception {
!     this.configUrl = configUrl;
!     System.out.println("setConfigUrl: " + configUrl);
    }
  
    /**
!    * Start the service mbean
     *
!    * @return DOCUMENT ME!
     *
!    * @throws Exception DOCUMENT ME!
     */
    public String getConfigUrl() throws Exception {
!     System.out.println("getConfigUrl: " + configUrl);
! 
!     return this.configUrl;
    }
! 
    /**
     * Start the service mbean
--- 101,158 ----
     */
    public void setConfigUrl(String configUrl) throws Exception {
! 	this.configUrl = configUrl;
! 	getLog().logInfo("setConfigUrl: " + configUrl);
    }
  
    /**
!    * Get the configUrl setting
     *
!    * @return configUrl DOCUMENT ME!
     *
!    * @throws Exception
     */
    public String getConfigUrl() throws Exception {
! 	getLog().logInfo("getConfigUrl: " + configUrl);
! 	return this.configUrl;
    }
!   
!   /**
!    * Set the babeldoc home
!    *
!    * @param babeldoc.home The babeldoc home directory
!    *
!    * @throws Exception
!    */
!   public void setBabeldocHome(String home) throws Exception {
! 		System.setProperty("babeldoc.home", home);
! 		getLog().logInfo("setBabeldocHome: " + home);
!   }
!   
!   /**
!    * Get the babeldoc home
!    *
!    * @return babeldoc.home The babeldoc home directory
!    *
!    * @throws Exception
!    */
!   public String getBabeldocHome() throws Exception {
! 		String home = System.getProperty("babeldoc.home"); 
! 		getLog().logInfo("getBabeldocHome: " + home);
! 		return (home);
!   }
!   
!   /**
!    * Get the state string
!    *
!    * @return StateString The string describing the current state 
!    *
!    * @throws Exception
!    */
!   public String getStateString() throws Exception {
! 		getLog().logInfo("getStateString: " +
! com.babeldoc.core.I18n.get(stateDescriptions[state]));
! 		return (com.babeldoc.core.I18n.get(stateDescriptions[state]));
!   }
!   
    /**
     * Start the service mbean
***************
*** 117,125 ****
     */
    public void start() throws Exception {
!     scanner = new Scanner(new String[] {  });
  
!     //TODO: Double check this since it maybe won't work... Did anyone used this anyway???
!     scanner.start();
!     System.out.println(com.babeldoc.core.I18n.get("scanner.001"));
    }
  
--- 161,185 ----
     */
    public void start() throws Exception {
!         
! 		/* This section determines what the usual babeldoc.home will be for a standard
! 		 *  JBoss system.  This will be ignored by other J2EE application containers,
! 		 * but we should probably look at putting good defaults in for them too.
! 		 */
! 		String babeldocHome = System.getProperty("jboss.server.config.url");
! 		if ((babeldocHome != null) && (babeldocHome.length() > 0)) {
! 				// This assumes that jboss.server.conf.url will always be a file://
! 				// Not sure if babeldoc can handle a non-file home directory, e.g. ftp://
! 				URL urlHome = new URL(babeldocHome);
! 				setBabeldocHome(urlHome.getFile());
! 		}
!         
! 		scanner = new Scanner(new String[] {  });
  
! 	//TODO: Double check this since it maybe won't work... Did anyone used this anyway???
! 	// MCA: I checked, it works.
! 	// TODO: Remove this and above comments before 1.3 release.
! 	scanner.start();
! 	state = ScannerService.STATE_STARTED;
! 	getLog().logInfo(com.babeldoc.core.I18n.get(stateDescriptions[state]));
    }
  
***************
*** 130,135 ****
     */
    public void stop() throws Exception {
!     scanner.stop();
!     System.out.println(com.babeldoc.core.I18n.get("scanner.002"));
    }
! }
--- 190,211 ----
     */
    public void stop() throws Exception {
! 		if (scanner == null) {
! 				state = ScannerService.STATE_STOPPED;
! 		}
! 		if (state != ScannerService.STATE_STOPPED) {
! 				scanner.stop();
! 				scanner.finishUp();
! 				scanner = null;
! 		}
! 	state = ScannerService.STATE_STOPPED;
! 	getLog().logInfo(com.babeldoc.core.I18n.get(stateDescriptions[state]));
    }
! 
!   public static LogService getLog() {
! 		  return log;
!   }
! 
!   public static void setLog(LogService log) {
! 		  ScannerService.log = log;
!   }
! }
\ No newline at end of file

[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner/gui ScannerMonitorFrame.java,1.7,1.7.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/scanner/src/com/babeldoc/scanner/gui

Modified Files:
      Tag: TEMP_MIKEA
	ScannerMonitorFrame.java 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

Index: ScannerMonitorFrame.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/gui/ScannerMonitorFrame.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** ScannerMonitorFrame.java	14 Aug 2003 02:34:20 -0000	1.7
--- ScannerMonitorFrame.java	12 Nov 2003 22:18:06 -0000	1.7.2.1
***************
*** 409,413 ****
      int returned = fileDialog.showOpenDialog(this);
  
!     if (returned == fileDialog.APPROVE_OPTION) {
        if (fileDialog.getSelectedFile().exists()) {
          optionEditor.setText(fileDialog.getSelectedFile().getPath());
--- 409,413 ----
      int returned = fileDialog.showOpenDialog(this);
  
!     if (returned == JFileChooser.APPROVE_OPTION) {
        if (fileDialog.getSelectedFile().exists()) {
          optionEditor.setText(fileDialog.getSelectedFile().getPath());
***************
*** 624,632 ****
              //handle files and dirs
              if (optionInfo.getType().equals(IConfigOptionType.DIRECTORY)) {
!               fileDialog.setFileSelectionMode(fileDialog.DIRECTORIES_ONLY);
                btnFileOpen.setVisible(true);
                lblOptionEditor.setText("Choose directory:");
              } else if (optionInfo.getType().equals(IConfigOptionType.FILENAME)) {
!               fileDialog.setFileSelectionMode(fileDialog.FILES_ONLY);
                btnFileOpen.setVisible(true);
                lblOptionEditor.setText("Choose file:");
--- 624,632 ----
              //handle files and dirs
              if (optionInfo.getType().equals(IConfigOptionType.DIRECTORY)) {
!               fileDialog.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
                btnFileOpen.setVisible(true);
                lblOptionEditor.setText("Choose directory:");
              } else if (optionInfo.getType().equals(IConfigOptionType.FILENAME)) {
!               fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
                btnFileOpen.setVisible(true);
                lblOptionEditor.setText("Choose file:");

[Babeldoc-devel] babeldoc/modules/sql build.xml,1.8,1.8.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/sql
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/sql

Modified Files:
      Tag: TEMP_MIKEA
	build.xml 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

Index: build.xml
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/build.xml,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** build.xml	27 Jun 2003 02:05:58 -0000	1.8
--- build.xml	12 Nov 2003 22:18:06 -0000	1.8.2.1
***************
*** 50,54 ****
  		<jar 
  			jarfile="${base_dir}/build/lib/${Jarfile}"
! 			basedir="${module_path}">
  			<manifest>
  				<attribute name="Built-By" value="${user.name}"/>
--- 50,55 ----
  		<jar 
  			jarfile="${base_dir}/build/lib/${Jarfile}"
! 			basedir="${module_path}"
! 			compress="false">
  			<manifest>
  				<attribute name="Built-By" value="${user.name}"/>

[Babeldoc-devel] babeldoc/modules/jfreereports build.xml,NONE,1.1.2.1 build.properties,NONE,1.1.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/jfreereports
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/jfreereports

Added Files:
      Tag: TEMP_MIKEA
	build.xml build.properties 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

--- NEW FILE: build.xml ---
<project name="jfreereports" basedir="." default="setup">
	<property file="build.properties"/>

	<property name="module_name" value="babeldoc_${Module}"/>
	<property name="module_path" value="${build}"/>

	<target
		name="setup"/>

	<target
		name="clean">
		<echo message="Cleaning ${Module}"/>
		<delete dir="${build}"/>
	</target>

	<target
		name="build">
		<echo message="Building ${Module}"/>
		<mkdir dir="${module_path}"/>
		<javac 
			destdir="${module_path}" 
			srcdir="./src" 
			deprecation="${compile.deprecation}"
			debug="${compile.debug}">
		  <classpath>
				<fileset dir="${base_dir}/build/lib">
				  <include name="*"/>
			  </fileset>
			  <pathelement location="${base_dir}/support/ant/lib/junit.jar"/>
		  </classpath>
		</javac>

    <!-- Copy the configuration files to build/jfreereports/... -->
    <mkdir dir="${module_path}/${Module}"/>
		<copy toDir="${module_path}/${Module}">
			<fileset dir="config">
				<include name="*/**"/>
			</fileset>
		</copy>

		<jar 
			jarfile="${base_dir}/build/lib/${Jarfile}"
			basedir="${module_path}">
			<manifest>
				<attribute name="Built-By" value="${user.name}"/>
				<section name="Babeldoc">
					<attribute name="Module" value="${Module}"/>
					<attribute name="Depends" value="${Depends}"/>
					<attribute name="ModuleClass" value="${ModuleClass}"/>
	      </section>
	    </manifest>
		</jar>

		<copy toDir="${base_dir}/build">
			<fileset dir=".">
				<include name="examples/**"/>
				<include name="lib/**"/>
			</fileset>
		</copy>
	</target>

	<target
		name="deploy">
		<echo message="Deploying ${Module}"/>
	</target>

  <target
		name="test">
		<echo message="Testing ${Module}"/>
	</target>  
	
  <target name="format">
    <echo message="Formatting ${Module}"/>
    <echo message="NOT! uncomment to make it work"/>
    <!--
     uncomment to test it
     remove destdir attribute when you are happy with the result
    <jalopy fileformat="${jalopy.fileformat}"
            convention="${jalopy.convention}"
            history="${jalopy.history}"
            loglevel="${jalopy.loglevel}"
            threads="${jalopy.threads}">
      <fileset dir="./src">
        <include name="**/*.java" />
      </fileset>
    </jalopy>
    -->
  </target>

</project>

--- NEW FILE: build.properties ---
Module=jfreereports
Depends=core,scanner
Jarfile=babeldoc_jfreereports.jar
ModuleClass=com.babeldoc.jfreereports.module.JFRModule

[Babeldoc-devel] babeldoc/modules/sql/src/com/babeldoc/sql/pipeline/stage SqlQueryPipelineStage.java,1.6,1.6.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/pipeline/stage
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/sql/src/com/babeldoc/sql/pipeline/stage

Modified Files:
      Tag: TEMP_MIKEA
	SqlQueryPipelineStage.java 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

Index: SqlQueryPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/pipeline/stage/SqlQueryPipelineStage.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** SqlQueryPipelineStage.java	23 Oct 2003 00:20:05 -0000	1.6
--- SqlQueryPipelineStage.java	12 Nov 2003 22:18:06 -0000	1.6.2.1
***************
*** 120,123 ****
--- 120,124 ----
    public static final String COLUMN_NAME = "column-name";
    public static final String COLUMN_NUMBER = "column-number";
+   public static final String COLUMN_CLASS = "column-class";
  
    /**
***************
*** 253,256 ****
--- 254,258 ----
          columnElement.addAttribute(COLUMN_NAME, name);
          columnElement.addAttribute(COLUMN_NUMBER, Integer.toString(j));
+ 		columnElement.addAttribute(COLUMN_CLASS, metaData.getColumnClassName(j));
          if(value!=null) {
            columnElement.setText(value.toString());

[Babeldoc-devel] babeldoc/modules/scanner/config jboss-service.xml,NONE,1.1.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/scanner/config
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/scanner/config

Added Files:
      Tag: TEMP_MIKEA
	jboss-service.xml 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

--- NEW FILE: jboss-service.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<service>

  <!-- A simple Babeldoc scanner service -->
  <mbean code="com.babeldoc.scanner.jmx.ScannerService"
        name="jboss.jmx:name=BabeldocScanner,service=BabeldocScanner,type=adaptor">
  </mbean>

</service>

[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core ResourceLoader.java,1.9,1.9.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/core/src/com/babeldoc/core

Modified Files:
      Tag: TEMP_MIKEA
	ResourceLoader.java 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

Index: ResourceLoader.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/ResourceLoader.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** ResourceLoader.java	17 Sep 2003 16:40:44 -0000	1.9
--- ResourceLoader.java	12 Nov 2003 22:18:05 -0000	1.9.2.1
***************
*** 102,105 ****
--- 102,106 ----
    public static Class getClass(String className) {
      try {
+ 	  LogService.getInstance().logWarn(System.getProperty("class.path"));
        return Class.forName(className);
      } catch (Exception e) {

[Babeldoc-devel] babeldoc/modules/jfreereports/src/com/babeldoc/jfreereports/module JFRModule.java,NONE,1.1.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/jfreereports/src/com/babeldoc/jfreereports/module
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/jfreereports/src/com/babeldoc/jfreereports/module

Added Files:
      Tag: TEMP_MIKEA
	JFRModule.java 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

--- NEW FILE: JFRModule.java ---
/* ====================================================================
 * 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: /cvsroot/babeldoc/babeldoc/modules/jfreereports/src/com/babeldoc/jfreereports/module/Attic/JFRModule.java,v 1.1.2.1 2003/11/12 22:18:06 michaelansley Exp $
 * $DateTime$
 * $Author: michaelansley $
 *
 */
package com.babeldoc.jfreereports.module;

import com.babeldoc.core.module.BabeldocModule;

import java.util.HashSet;
import java.util.Set;


/**
 * This is the jfreereports module - it doesn't do very much except support the dependsOn.
 *
 * @author MCA
 * @version 1.0
 */
public class JFRModule extends BabeldocModule {
  public static final String MODULE = "jfreereports";

  /**
   * jfreereports module only depends on core
   *
   * @return
   */
  public Set getDependsOn() {
    Set set = new HashSet();
    set.add("core");
	set.add("scanner");

    return set;
  }

  /**
   * The Name of the module is jfreereports
   *
   * @return
   */
  public String getName() {
    return MODULE;
  }
}

[Babeldoc-devel] babeldoc/modules/scanner build.xml,1.10,1.10.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/scanner
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/scanner

Modified Files:
      Tag: TEMP_MIKEA
	build.xml 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

Index: build.xml
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/build.xml,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** build.xml	11 Jun 2003 11:03:20 -0000	1.10
--- build.xml	12 Nov 2003 22:18:06 -0000	1.10.2.1
***************
*** 1,3 ****
! <project name="sql" basedir="." default="setup">
  	<property file="build.properties"/>
  
--- 1,3 ----
! <project name="scanner" basedir="." default="setup">
  	<property file="build.properties"/>
  
***************
*** 57,61 ****
  		<jar 
  			jarfile="${base_dir}/build/lib/${Jarfile}"
! 			basedir="${module_path}">
  			<manifest>
  				<attribute name="Built-By" value="${user.name}"/>
--- 57,63 ----
  		<jar 
  			jarfile="${base_dir}/build/lib/${Jarfile}"
! 			basedir="${module_path}"
! 			compress="false"
! 			excludes="**/jboss-service.xml">
  			<manifest>
  				<attribute name="Built-By" value="${user.name}"/>

[Babeldoc-devel] babeldoc build.xml,1.16,1.16.2.1

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

Update of /cvsroot/babeldoc/babeldoc
In directory sc8-pr-cvs1:/tmp/cvs-serv21577

Modified Files:
      Tag: TEMP_MIKEA
	build.xml 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

Index: build.xml
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/build.xml,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** build.xml	4 Sep 2003 03:16:53 -0000	1.16
--- build.xml	12 Nov 2003 22:18:06 -0000	1.16.2.1
***************
*** 226,228 ****
--- 226,284 ----
      <moduleRunner target="format" modules="${babeldoc_modules}"/>
    </target>
+   
+   <!--
+   jboss target - create jboss sar (and eventually jar, for EJB stuff) file
+   -->
+   <target
+   	name="jboss"
+   	depends="build">
+   	<echo message="Building JBoss service archive"/>
+   	<mkdir dir="build/babeldoc-service.sar"/>
+   	<mkdir dir="build/babeldoc-service.sar/META-INF"/>
+   	<copy todir="build/babeldoc-service.sar/META-INF">
+   		<fileset dir="modules/scanner/config">
+   			<include name="jboss-service.xml"/>
+   		</fileset>
+ 	</copy>
+   	<copy todir="build/babeldoc-service.sar">
+   		<fileset dir="build/lib">
+   			<include name="activation.jar"/>
+   			<include name="avalon-framework.jar"/>
+   			<include name="babeldoc_babelfish.jar"/>
+   			<include name="babeldoc_conversion.jar"/>
+   			<include name="babeldoc_core.jar"/>
+   			<include name="babeldoc_crypto.jar"/>
+   			<include name="babeldoc_init.jar"/>
+   			<include name="babeldoc-scanner.jar"/>
+   			<include name="babeldoc_sql.jar"/>
+   			<include name="babeldoc_xslfo.jar"/>
+   			<include name="batik.jar"/>
+   			<include name="bsf.jar"/>
+   			<include name="classes12.jar"/>
+   			<include name="commons-beanutils.jar"/>
+   			<include name="commons-cli.jar"/>
+   			<include name="commons-collections.jar"/>
+   			<include name="commons-dbcp.jar"/>
+   			<include name="commons-digester.jar"/>
+   			<include name="commons-discovery.jar"/>
+   			<include name="commons-httpclient.jar"/>
+   			<include name="commons-lang.jar"/>
+   			<include name="commons-logging.jar"/>
+   			<include name="commons-net.jar"/>
+   			<include name="commons-pool.jar"/>
+   			<include name="concurrent.jar"/>
+   			<include name="csv19.jar"/>
+   			<include name="poi.jar"/>
+   			<include name="velocity.jar"/>
+   			<include name="xml-apis.jar"/>
+   			<include name="xmlsec.jar"/>
+   		</fileset>
+   	</copy>
+   	<jar destfile="build/lib/babeldoc-service.sar"
+   		basedir="build/babeldoc-service.sar">
+ 			<manifest>
+ 				<attribute name="Built-By" value="${user.name}"/>
+ 			</manifest>
+   	</jar>
+   </target>
  </project>

[Babeldoc-devel] babeldoc/modules/jfreereports/src/com/babeldoc/jfreereports/pipeline/stage JFRPipelineStage.java,NONE,1.1.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/jfreereports/src/com/babeldoc/jfreereports/pipeline/stage
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/jfreereports/src/com/babeldoc/jfreereports/pipeline/stage

Added Files:
      Tag: TEMP_MIKEA
	JFRPipelineStage.java 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

--- NEW FILE: JFRPipelineStage.java ---
/* ====================================================================
 * 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: /cvsroot/babeldoc/babeldoc/modules/jfreereports/src/com/babeldoc/jfreereports/pipeline/stage/Attic/JFRPipelineStage.java,v 1.1.2.1 2003/11/12 22:18:05 michaelansley Exp $
 * $DateTime$
 * $Author: michaelansley $
 *
 */

package com.babeldoc.jfreereports.pipeline.stage;

import com.babeldoc.core.I18n;
import com.babeldoc.core.LogService;
import com.babeldoc.core.NameValuePair;
import com.babeldoc.core.option.ComplexConfigOptionType;
import com.babeldoc.core.option.ConfigOption;
import com.babeldoc.core.option.IConfigOptionType;
import com.babeldoc.core.pipeline.PipelineDocument;
import com.babeldoc.core.pipeline.PipelineException;
import com.babeldoc.core.pipeline.PipelineStage;
import com.babeldoc.core.pipeline.PipelineStageInfo;
import com.babeldoc.core.pipeline.PipelineStageResult;
import com.babeldoc.core.resource.IResource;
import com.babeldoc.core.resource.ResourceException;
import com.babeldoc.core.resource.ResourceFactory;

import java.io.IOException;
import java.io.File;
import java.io.FileWriter;
import java.lang.reflect.Constructor;
import java.net.URL;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;

import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableModel;

import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.Node;

import org.jfree.report.JFreeReport;
import org.jfree.report.modules.parser.base.ReportGenerator;
import org.jfree.report.modules.output.pageable.pdf.PDFReportUtil;

/**
 * @author mikea
 *
 */
public class JFRPipelineStage extends PipelineStage {

	/**
	 * constants
	 */
	public static final String XML_MIME_TYPE = "text/xml";
	
	public final static String REPORT_DEF = "reportDefinition";
	public final static String REPORT_DEF_URL = "reportDefinitionUrl";

	/**
	   * Construct with this stages info
	   */
  public JFRPipelineStage() {
		super(new PipelineStageInfo() {
		  public String getName() {
			return "JFreeReport";
		  }

		  public String getDescription() {
			return I18n.get("jfr.001");
		  }

		  public Collection getTypeSpecificOptions() {
			ArrayList options = new ArrayList();
			options.add(new ConfigOption(REPORT_DEF, IConfigOptionType.URL,
				null, true, I18n.get("jfr.002")));
			options.add(new ConfigOption(REPORT_DEF_URL, IConfigOptionType.URL,
				null, true, I18n.get("jfr.003")));

			return options;
		  }
		});
	  }
	
	/* (non-Javadoc)
	 * @see com.babeldoc.core.pipeline.PipelineStage#process()
	 */
	public PipelineStageResult[] process() throws PipelineException {
		
		if (getDocument().getMimeType() != XML_MIME_TYPE) {
			throw new PipelineException(I18n.get("jfr.101"));
		}
		
		// Find the report definition
		String xmlReportDefinition = getReportDefinition();
		File f = new File(System.getProperties().get("java.io.tmpdir") + "/tmprpt.xml");
		try {
			FileWriter writer = new FileWriter(f);
			writer.write(xmlReportDefinition);
			writer.flush();
			writer.close();
		} catch (java.io.IOException e) {
			e.printStackTrace();
		}
		
		// Set up the table model
		TableModel tm = getTableModel();

		ReportGenerator gen = ReportGenerator.getInstance();
		JFreeReport report = null;
		try {
			report = gen.parseReport(f);
		} catch (java.io.IOException e) {
			e.printStackTrace();
		} catch (org.jfree.xml.ElementDefinitionException e2) {
			e2.printStackTrace();
		}
		report.setData(tm);
		
		PDFReportUtil.createPDF(report, System.getProperties().get("java.io.tmpdir") + "/output.pdf");
		
		// TODO Auto-generated method stub
		return null;
	}

	/*
	 * Find the report definition.  First search the document attributes for a
	 * report definition, then a report definition URL.  Then check the pipeline
	 * stage.
	 * 
	 * @return String The report definition
	 * 
	 * @throws ResourceException Any exceptions encountered are converted to 
	 * 												ResourceException
	 *  
	 */
	private String getReportDefinition() throws PipelineException {

		String xmlReportDefinition;
		String strReportDefinitionUrl;
		
		// Try to get the report definition directly from the document attributes
		xmlReportDefinition = (String) getDocument().get(REPORT_DEF);
		// If unsuccessful, then try for a report definition URL from the document attributes
		if (xmlReportDefinition == null) {
			strReportDefinitionUrl = (String) getDocument().get(REPORT_DEF_URL);
			if (strReportDefinitionUrl != null) {
				URL urlReportDefinitionUrl;
				try {
					urlReportDefinitionUrl = new URL(strReportDefinitionUrl);
					xmlReportDefinition = (String) urlReportDefinitionUrl.getContent();
				} catch (java.net.MalformedURLException e) {
					throw new PipelineException(I18n.get("jfr.102"), e);
				} catch (IOException e) {
					throw new PipelineException(I18n.get("jfr.103"), e);
				}
			}
		}
		// If still unsuccessful, then try the stage definition for a report definition
		if (xmlReportDefinition == null) {
			xmlReportDefinition = (String) this.getInfo().getOption(REPORT_DEF).getValue();
		}
		// Otherwise a report definition URL from the stage definition
		if (xmlReportDefinition == null) {
			strReportDefinitionUrl = (String) this.getInfo().getOption(REPORT_DEF_URL).getValue();
			if (strReportDefinitionUrl != null) {
				URL urlReportDefinitionUrl;
				try {
					urlReportDefinitionUrl = new URL(strReportDefinitionUrl);
					xmlReportDefinition = (String) urlReportDefinitionUrl.getContent();
				} catch (java.net.MalformedURLException e) {
					throw new PipelineException(I18n.get("jfr.102"), e);
				} catch (IOException e) {
					throw new PipelineException(I18n.get("jfr.103"), e);
				}
			}
		}
		return (xmlReportDefinition);
	}
	
	private TableModel getTableModel() {
		
		DefaultTableModel tm = new DefaultTableModel();
		Document doc;
		try {
			doc = DocumentHelper.parseText(new String(getDocument().getBytes()));
		} catch (DocumentException e) {
			LogService.getInstance().logError(e);
			return (tm);
		}

		Element queryResults = (Element) doc.selectSingleNode( "/queryresults/query" );
		
		// iterate through child elements of root with element name "foo"
		ArrayList rowData = new ArrayList();
		boolean needHeaders = true;
		for ( Iterator i = queryResults.elementIterator( "row" ); i.hasNext(); ) {
			Element row = (Element) i.next();
			int pos = 0;
			for ( Iterator j = queryResults.elementIterator( "column" ); j.hasNext(); ) {
				Element cell = (Element) j.next();
				// Add the column to the table model, if this is the first row being constructed
				if (needHeaders) {
					String columnName = cell.attribute("column-name").toString();
					if (tm.findColumn(columnName) == -1) {
						tm.addColumn(columnName);
					}
				}
				// Add the cell value to the rowData array
				Object v;
				try {
					Class c = Class.forName(cell.attribute("column-class").toString()).getClass();
					Constructor  cons = c.getConstructor(new Class[] {String.class});
					v = cons.newInstance(new Object[] {cell.getText()});
				} catch (Exception e) {
					LogService.getInstance().logWarn(e.getMessage());
					v = new String("[" + I18n.get("jfr.104", cell.attribute("column-class").toString()) + "]");
				}
				rowData.add(pos, v);
				pos++;
			}
			needHeaders = false;
			tm.addRow(rowData.toArray());
		}		
		return (tm);
	}
}

[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner/worker MailboxScanner.java,1.29,1.29.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/scanner/src/com/babeldoc/scanner/worker

Modified Files:
      Tag: TEMP_MIKEA
	MailboxScanner.java 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

Index: MailboxScanner.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker/MailboxScanner.java,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -C2 -d -r1.29 -r1.29.2.1
*** MailboxScanner.java	13 Oct 2003 07:24:39 -0000	1.29
--- MailboxScanner.java	12 Nov 2003 22:18:05 -0000	1.29.2.1
***************
*** 79,83 ****
  import javax.mail.Folder;
  import javax.mail.Message;
- import javax.mail.MessagingException;
  import javax.mail.Multipart;
  import javax.mail.Part;
--- 79,82 ----
***************
*** 85,91 ****
  import javax.mail.Store;
  
- import java.util.regex.Pattern;
- import java.util.regex.Matcher;
- 
  import com.babeldoc.core.I18n;
  import com.babeldoc.core.option.ConfigOption;
--- 84,87 ----
***************
*** 116,124 ****
  	public static final String SUBJECT_FILTER = "subjectFilter";
  
! 	//Values for getFrom attribute
  	public static final String BODY = "body";
  	public static final String ATTACHMENT = "attachment";
  
! 	//default values
  	public static String DEFAULT_PROTOCOL = "pop3";
  	public static String DEFAULT_FOLDER = "INBOX";
--- 112,120 ----
  	public static final String SUBJECT_FILTER = "subjectFilter";
  
! 	/** Values for getFrom attribute */
  	public static final String BODY = "body";
  	public static final String ATTACHMENT = "attachment";
  
! 	/** Default values */
  	public static String DEFAULT_PROTOCOL = "pop3";
  	public static String DEFAULT_FOLDER = "INBOX";
***************
*** 149,156 ****
  	 * Do the scan
  	 *
! 	 * @throws ScannerException DOCUMENT ME!
  	 */
  	public void doScan() throws ScannerException {
- 		//Folder folder = null;
  		Folder folder = null;
  		Store store = null;
--- 145,153 ----
  	 * Do the scan
  	 *
! 	 * @throws ScannerException
! 	 * 
! 	 * @see ScannerWorker
  	 */
  	public void doScan() throws ScannerException {
  		Folder folder = null;
  		Store store = null;
***************
*** 206,212 ****
  	 * @param	message	the message to be tested against the current
  	 *			set of filters
  	 * @return	boolean	true if the message matches any of the
  	 *			current filters
! 	 * @see		Message ScannerWorker
  	 */
  	private boolean matchMessage(Message m) throws javax.mail.MessagingException {
--- 203,213 ----
  	 * @param	message	the message to be tested against the current
  	 *			set of filters
+ 	 *
  	 * @return	boolean	true if the message matches any of the
  	 *			current filters
! 	 * 
! 	 * @throws MessagingException
! 	 * 
! 	 * @see		Message
  	 */
  	private boolean matchMessage(Message m) throws javax.mail.MessagingException {
***************
*** 216,220 ****
  		boolean subjectMatch = false;
  
! 		// Check for a match in the recipients
  		Address[] from = m.getFrom();
  		for (int j = 0; j < from.length; j++) {
--- 217,221 ----
  		boolean subjectMatch = false;
  
! 		// Check for a match in the senders
  		Address[] from = m.getFrom();
  		for (int j = 0; j < from.length; j++) {
***************
*** 244,247 ****
--- 245,249 ----
  		}
  
+ 		// Check for a match in the subject
  		if (getLog().isDebugEnabled()) {
  			getLog().logDebug("Testing " + m.getSubject().toString() + " against " + getFilter(SUBJECT_FILTER));
***************
*** 287,291 ****
  
  	/**
! 	 * release the held resource.  Do nothing - no held resources.
  	 */
  	public void relinquishResources() {
--- 289,293 ----
  
  	/**
! 	 * Release held resources.  Do nothing - no held resources.
  	 */
  	public void relinquishResources() {
***************
*** 300,306 ****
  	 * @return StringBuffer with content of the message
  	 *
! 	 * @throws Exception
  	 */
! 	private StringBuffer getMailContent(Part part) throws Exception {
  		// Code donated by Hans Benedict.
  		BufferedReader reader =
--- 302,308 ----
  	 * @return StringBuffer with content of the message
  	 *
! 	 * @throws IOException, MessagingException
  	 */
! 	private StringBuffer getMailContent(Part part) throws java.io.IOException, javax.mail.MessagingException {
  		// Code donated by Hans Benedict.
  		BufferedReader reader =
***************
*** 310,314 ****
  
  		while ((line = reader.readLine()) != null) {
- 			//System.out.println( "appending: "+line);
  			result.append(line).append("\n");
  		}
--- 312,315 ----
***************
*** 323,340 ****
  	 * @param message
  	 *
! 	 * @throws MessagingException DOCUMENT ME!
  	 */
! 	private void deleteMessage(Message message) throws MessagingException {
  		message.setFlag(Flags.Flag.DELETED, true);
  	}
  
  	/**
! 	 * DOCUMENT ME!
  	 *
  	 * @param message
  	 *
! 	 * @throws Exception DOCUMENT ME!
  	 */
! 	private void processMessage(Message message) throws Exception {
  		//process as multipart
  		if (message.getContent() instanceof Multipart) {
--- 324,343 ----
  	 * @param message
  	 *
! 	 * @throws MessagingException
  	 */
! 	private void deleteMessage(Message message) throws javax.mail.MessagingException {
  		message.setFlag(Flags.Flag.DELETED, true);
  	}
  
  	/**
! 	 * Place the specified message in a queue.
! 	 * <p>
! 	 * Multipart messages need to be handled slightly differently.
  	 *
  	 * @param message
  	 *
! 	 * @throws IOException, MessagingException
  	 */
! 	private void processMessage(Message message) throws java.io.IOException, javax.mail.MessagingException {
  		//process as multipart
  		if (message.getContent() instanceof Multipart) {
***************
*** 346,358 ****
  
  	/**
! 	 * DOCUMENT ME!
  	 *
  	 * @param multipart
  	 * @param originalMessage DOCUMENT ME!
  	 *
! 	 * @throws Exception DOCUMENT ME!
  	 */
  	private void processMultipart(Multipart multipart, Message originalMessage)
! 		throws Exception {
  		int numberOfParts = multipart.getCount();
  
--- 349,365 ----
  
  	/**
! 	 * Processes multiparts of a multipart message.
! 	 * <p>
! 	 * This method is recursive, unravelling the (possibly) nested multiparts
! 	 * of a message.  Each multipart is broken down into its constituent parts
! 	 * which are enqueued, before the entire multipart is enqueued.
  	 *
  	 * @param multipart
  	 * @param originalMessage DOCUMENT ME!
  	 *
! 	 * @throws IOException, MessagingException
  	 */
  	private void processMultipart(Multipart multipart, Message originalMessage)
! 		throws java.io.IOException, javax.mail.MessagingException {
  		int numberOfParts = multipart.getCount();
  
***************
*** 366,370 ****
  					originalMessage);
  			}
! 
  			processPart(part, originalMessage);
  		}
--- 373,377 ----
  					originalMessage);
  			}
! 			// Should this be here, or in the else portion of the above if statement?
  			processPart(part, originalMessage);
  		}
***************
*** 372,384 ****
  
  	/**
! 	 * This method is used for processing message part
  	 *
! 	 * @param part
! 	 * @param originalMessage DOCUMENT ME!
  	 *
! 	 * @throws Exception DOCUMENT ME!
  	 */
  	private void processPart(Part part, Message originalMessage)
! 		throws Exception {
  		String disposition = part.getDisposition();
  		String path = protocol + "://" + username + "@" + host + "/" + folder_;
--- 379,393 ----
  
  	/**
! 	 * This method is used for processing a message part.
! 	 * <p>
! 	 * This method processes a part, either a base part, or multipart. 
  	 *
! 	 * @param part Part of message to process
! 	 * @param originalMessage Reference to original message for certain properties
  	 *
! 	 * @throws IOException, MessagingException
  	 */
  	private void processPart(Part part, Message originalMessage)
! 		throws java.io.IOException, javax.mail.MessagingException {
  		String disposition = part.getDisposition();
  		String path = protocol + "://" + username + "@" + host + "/" + folder_;
***************
*** 392,398 ****
  		attrs.put(SCAN_FROM_KEY, originalMessage.getFrom());
  		attrs.put(SCAN_REPLYTO_KEY, originalMessage.getReplyTo());
! 
! 		//attrs.put("to" , originalMessage.getAllRecipients());
! 		//attrs.put(SCAN_TO_KEY, originalMessage.getSubject());
  
  		if (disposition == null) {
--- 401,405 ----
  		attrs.put(SCAN_FROM_KEY, originalMessage.getFrom());
  		attrs.put(SCAN_REPLYTO_KEY, originalMessage.getReplyTo());
! 		//attrs.put(SCAN_TO_KEY , originalMessage.getAllRecipients());
  
  		if (disposition == null) {
***************
*** 408,412 ****
  
  				//store all attributes
! 				//TODO: This should be done more clever then this
  				attrs.put("contentType", "text/plain");
  				attrs.put(ScannerWorker.FILE_NAME_KEY, originalMessage.getSubject());
--- 415,419 ----
  
  				//store all attributes
! 				//TODO: This should be done more clever than this
  				attrs.put("contentType", "text/plain");
  				attrs.put(ScannerWorker.FILE_NAME_KEY, originalMessage.getSubject());

[Babeldoc-devel] babeldoc/modules/core build.xml,1.12,1.12.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/core
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/core

Modified Files:
      Tag: TEMP_MIKEA
	build.xml 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

Index: build.xml
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/build.xml,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** build.xml	12 Sep 2003 00:44:09 -0000	1.12
--- build.xml	12 Nov 2003 22:18:05 -0000	1.12.2.1
***************
*** 53,57 ****
  			jarfile="${base_dir}/build/lib/${Jarfile}"
  			basedir="${module_path}"
! 			excludes="**/*Test.class">
  			<manifest>
  				<attribute name="Built-By" value="${user.name}"/>
--- 53,58 ----
  			jarfile="${base_dir}/build/lib/${Jarfile}"
  			basedir="${module_path}"
! 			excludes="**/*Test.class"
! 			compress="false">
  			<manifest>
  				<attribute name="Built-By" value="${user.name}"/>

[Babeldoc-devel] babeldoc/modules/jfreereports/lib itext-1.00.jar,NONE,1.1.2.1 pixie-0.8.0.jar,NONE,1.1.2.1 poi-2.0-pre3-20030728.jar,NONE,1.1.2.1 gnujaxp.jar,NONE,1.1.2.1 jfreereport-0.8.4_4-all.jar,NONE,1.1.2.1 jcommon-0.8.5.jar,NONE,1.1.2.1 bsh-1.2b6.jar,NONE,1.1.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/jfreereports/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/jfreereports/lib

Added Files:
      Tag: TEMP_MIKEA
	itext-1.00.jar pixie-0.8.0.jar poi-2.0-pre3-20030728.jar 
	gnujaxp.jar jfreereport-0.8.4_4-all.jar jcommon-0.8.5.jar 
	bsh-1.2b6.jar 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

--- NEW FILE: itext-1.00.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: pixie-0.8.0.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: poi-2.0-pre3-20030728.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: gnujaxp.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: jfreereport-0.8.4_4-all.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: jcommon-0.8.5.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: bsh-1.2b6.jar ---
(This appears to be a binary file; contents omitted.)

[Babeldoc-devel] babeldoc/modules/jfreereports/config/i18n messages.properties,NONE,1.1.2.1

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

Update of /cvsroot/babeldoc/babeldoc/modules/jfreereports/config/i18n
In directory sc8-pr-cvs1:/tmp/cvs-serv21577/modules/jfreereports/config/i18n

Added Files:
      Tag: TEMP_MIKEA
	messages.properties 
Log Message:
This branch has an augmented jmx scanner, and a new pipeline stage for jfreereports.

--- NEW FILE: messages.properties ---
# com.babeldoc.jfreereports.pipeline.stage.JFRPipelineStage
jfr.001=Stage to produce a report from a data document
jfr.002=The report definition
jfr.003=URL of the report definition

#Some error messages
jfr.101=Invalid data document mime type
jfr.102=Invalid report definition URL
jfr.103=IO exception when retrieving report definition from URL
jfr.104=Error loading data type {0}

RE: [Babeldoc-devel] Branching

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

No, Do it.

-----Original Message-----
From: Michael Ansley [mailto:mic...@ze...]
Sent: Wednesday, November 12, 2003 2:26 PM
To: bab...@li...
Subject: [Babeldoc-devel] Branching


Hi,

Is it OK with everybody if I create a temporary branch in CVS for
myself?  I have some work that I really need to commit, but I can't put
it on the HEAD.  It'll get merged after the 1.2 maintenance split. 
Anybody have any issues?

Cheers...


MikeA





-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
_______________________________________________
Babeldoc-devel mailing list
Bab...@li...
https://lists.sourceforge.net/lists/listinfo/babeldoc-devel

[Babeldoc-devel] Branching

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

Hi,

Is it OK with everybody if I create a temporary branch in CVS for
myself?  I have some work that I really need to commit, but I can't put
it on the HEAD.  It'll get merged after the 1.2 maintenance split. 
Anybody have any issues?

Cheers...


MikeA