idrs-commit Mailing List for Internet Document and Report Server

Brought to you by: bigman921

idrs-commit — List For CVS Commit Mails

You can subscribe to this list here.

2002	_Jan (113)	_Feb (34)	_Mar (38)	_Apr (63)	_May	_Jun	_Jul	_Aug (40)	_Sep (26)	_Oct (4)	_Nov (5)	_Dec (3)
2003	_Jan (13)	_Feb (15)	_Mar (21)	_Apr (7)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2004	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug (71)	_Sep (4)	_Oct	_Nov	_Dec

Flat | Threaded

1 2 3 .. 19 > >> (Page 1 of 19)

[Idrs-commit] CVS: Idrs/dev/lib idrs.jar,1.21,1.22

From: Marc B. <big...@us...> - 2004-09-11 20:08:49

Update of /cvsroot/idrs/Idrs/dev/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19267/lib

Modified Files:
	idrs.jar 
Log Message:
Added a "while" tag that allows a condition for looping :

<while condition="value < x">
.
.
.
</while>

Previosly a script block had to be used to do while loops.  The condition is in the form of whatever the scriptcontext uses

Index: idrs.jar
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/lib/idrs.jar,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
Binary files /tmp/cvsDgkY6Y and /tmp/cvsGGqyNE differ

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/report WhileLine.java,NONE,1.1

From: Marc B. <big...@us...> - 2004-09-11 20:08:48

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19267/src/net/sourceforge/idrs/core/report

Added Files:
	WhileLine.java 
Log Message:
Added a "while" tag that allows a condition for looping :

<while condition="value < x">
.
.
.
</while>

Previosly a script block had to be used to do while loops.  The condition is in the form of whatever the scriptcontext uses

--- NEW FILE: WhileLine.java ---
/*
Copyright (C) 2002-2004 Marc Boorshtein

The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
you may not use this file except in compliance with the License. You may obtain a copy of the
License at http://www.mozilla.org/MPL/

Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
language governing rights and limitations under the License.
*/
package net.sourceforge.idrs.core.report;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Vector;

import org.apache.log4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;



/**
 * @author mlb
 *
 * TODO To change the template for this generated type comment go to
 * Window - Preferences - Java - Code Style - Code Templates
 */
public class WhileLine extends Line implements Chunk, Serializable {
	/** The condintion to continue the loop */
	String condition;
	static Logger logger = Logger.getLogger(WhileLine.class.getName());
	private Vector vlines;
	private Line[] lines;
	
	/**
	 * @param arg0
	 */
	public WhileLine(String condition) {
		this.condition  = condition;
		
	}

	
	/**
     * Sets the vector constaing the lines for the containor
        @param line Line to add
     */
    public void addLine(Line line) {
        vlines.add(line);
    }
    
    /**
     * Sets the vector constaing the lines for the containor
     *@param lines Lines being used
     */
    
    public void setLines(Vector lines) {
        this.vlines = lines;
    }
	
	/* (non-Javadoc)
	 * @see net.sourceforge.idrs.core.report.Chunk#toString(net.sourceforge.idrs.core.report.IDRSHead)
	 */
	public String toString(IDRSHead head) throws Exception {
		// TODO Auto-generated method stub
		return "";
	}
	
	/**
     * "Seals" the report head into static data structures from dynamic ones
     */
    public void seal() {
        if (! sealed) {
            ArrayList llines = new ArrayList();
    
            
            
            
            int i=0;
            for (i=0;i<vlines.size();i++) {
            		Line l = (Line) (Line) vlines.get(i);
                
                if (l != null) {
                    //((Line) lines[i]).seal();
                }
                else {
                    lines[i] = new Line();
                    ((Line) lines[i]).addChunk(new TextChunk(""));
                    ((Line) lines[i]).seal();
                }
                
                
                		llines.add(l);
                
                
            }
            
            lines = new Line[llines.size()];
            System.arraycopy(llines.toArray(),0,lines,0,lines.length);
            
            
            
            sealed = true;
            vlines.removeAllElements();
        }
        
        
    }
    
    /**
    Public method to retrieve the information about the all of the Chunks stored in the Line
        @param head IDRSHead of report
        @param buffer Buffered output of report
     */
    public String toString(IDRSHead head, StringBuffer buffer) throws Exception  {
    		StringBuffer tmp = new StringBuffer(100);
    		String conditionRes = head.getScriptContext().eval(condition);
    		while (conditionRes.equalsIgnoreCase("true") || conditionRes.equals("1")) {
    			int i = 0;
    	        while (i < this.lines.length) {
    	            Line line =  lines[i];
    	            String ln = line.toString(head,tmp);
    	            //if (ln != null)
    	            if (tmp.charAt(tmp.length()-1)!='\n') {
    	                tmp.append("\n");   
    	            }
    	            i++;
    	        }
    	        i=0;
    	        tmp.deleteCharAt(tmp.length()-1);
    	        conditionRes = head.getScriptContext().eval(condition);
    		}
    		
    		buffer.append(tmp);
    		return null;
    }
    
    public void toDOM(IDRSHead head, Document doc, Element root)
	throws Exception {
    	StringBuffer tmp = new StringBuffer(100);
		String conditionRes = head.getScriptContext().eval(condition);
		
		while (conditionRes.equalsIgnoreCase("true") || conditionRes.equals("1")) {
			int i = 0;
	        while (i < this.lines.length) {
	            Line line =  lines[i];
	            line.toDOM(head,doc,root);
	            i++;
	        }
	        i=0;
	        
	        conditionRes = head.getScriptContext().eval(condition);
		}
    }
    

}

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units While.java,NONE,1.1

From: Marc B. <big...@us...> - 2004-09-11 20:08:48

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19267/src/net/sourceforge/idrs/deploy/compile/units

Added Files:
	While.java 
Log Message:
Added a "while" tag that allows a condition for looping :

<while condition="value < x">
.
.
.
</while>

Previosly a script block had to be used to do while loops.  The condition is in the form of whatever the scriptcontext uses

--- NEW FILE: While.java ---
/*
Copyright (C) 2002-2004 Marc Boorshtein

The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
you may not use this file except in compliance with the License. You may obtain a copy of the
License at http://www.mozilla.org/MPL/

Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
language governing rights and limitations under the License.
*/
package net.sourceforge.idrs.deploy.compile.units;

import java.util.Vector;

import net.sourceforge.idrs.core.report.TagLine;
import net.sourceforge.idrs.core.report.WhileLine;
import net.sourceforge.idrs.deploy.compile.CompilerState;

import org.xml.sax.Attributes;

/**
 * @author mlb
 *
 * TODO To change the template for this generated type comment go to
 * Window - Preferences - Java - Code Style - Code Templates
 */
public class While extends Body {
	String condition;
	private WhileLine whileLine;
	/**
     *allows for a compiler to use the attributes of the calling tag
     */
    public void setAttributes(Attributes atts) throws Exception  {
        this.atts = atts;
        condition = atts.getValue("condition");
        this.whileLine = new WhileLine(condition);
       
    }
    
    
    /**
     *allows for the compiler to work with the current state of the page compilation
     */
    public void setState(CompilerState state) throws Exception  {
        this.state = state;
        state.sealLine();
        state.pushLines();
        //state.addRepeatLine(id,color1,color2);
    }
    
    /**
     *Retrieves the current repeat line
     */
    public WhileLine getWhileLine() {
     return this.whileLine;   
    }
    
    /**
    * allows for the execution of any wrap-up code at the hitting of the end tag
    */
    public void seal()  throws Exception  {
        //if (state.getCurrentLine() != null)
        state.sealLine();
        Vector lines = state.popLines();
        //System.out.println("num lines repeat : " + lines.size());
        whileLine.setLines(lines);
        
        state.setLine(whileLine);
        state.sealLine();
    }
}

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/deploy/macro MacroToXML.java,1.21,1.22

From: Marc B. <big...@us...> - 2004-09-11 20:08:48

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19267/src/net/sourceforge/idrs/deploy/macro

Modified Files:
	MacroToXML.java 
Log Message:
Added a "while" tag that allows a condition for looping :

<while condition="value < x">
.
.
.
</while>

Previosly a script block had to be used to do while loops.  The condition is in the form of whatever the scriptcontext uses

Index: MacroToXML.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro/MacroToXML.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MacroToXML.java	30 Aug 2004 00:56:07 -0000	1.21
--- MacroToXML.java	11 Sep 2004 20:08:39 -0000	1.22
***************
*** 360,363 ****
--- 360,377 ----
      
      
+     private int findChar(char  look,int begin) {
+     		boolean inQuote = false;
+     		for (int i=begin,m=rmlSrc.length();i<m;i++) {
+     			if (rmlSrc.charAt(i) == '"' && rmlSrc.charAt(i-1) != '\\') {
+     				inQuote  = ! inQuote;
+     			} else if (! inQuote && rmlSrc.charAt(i) == look) {
+     				return i;
+     			}
+     		}
+     		return -1;
+     }
+     
+     
+     
      /**
       *Reads rmlSrc for position of the end of the current tag
***************
*** 366,371 ****
      protected int readTag(int begin) {
          int indexGT, indexLT;
!         indexGT = rmlSrc.indexOf(">", begin);
!         indexLT = rmlSrc.indexOf("<", begin+1);
          if (indexLT == -1 || indexGT < indexLT) {
              return indexGT + 1;
--- 380,385 ----
      protected int readTag(int begin) {
          int indexGT, indexLT;
!         indexGT = findChar('>', begin);
!         indexLT = findChar('<', begin+1);
          if (indexLT == -1 || indexGT < indexLT) {
              return indexGT + 1;
***************
*** 463,466 ****
--- 477,492 ----
      }
      
+     
+     private int findChar(char  look,String str) {
+ 		boolean inQuote = false;
+ 		for (int i=0,m=str.length();i<m;i++) {
+ 			if (str.charAt(i) == '"' && str.charAt(i-1) != '\\') {
+ 				inQuote  = ! inQuote;
+ 			} else if (! inQuote && str.charAt(i) == look) {
+ 				return i;
+ 			}
+ 		}
+ 		return -1;
+ 	}
      /**
       *Writes the RML tag as full XML 1.0 tag
***************
*** 473,476 ****
--- 499,503 ----
          }*/
          
+         
          int begin=0, end=0,tmp,retEnd;
          int tokBegin, tokEnd;
***************
*** 489,493 ****
          
          begin = end;
!         end = tag.indexOf(">");
          
          begin = tag.indexOf(tagName) + tagName.length();
--- 516,520 ----
          
          begin = end;
!         end = findChar('>',tag);
          
          begin = tag.indexOf(tagName) + tagName.length();

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units Tag.java,1.3,1.4

From: Marc B. <big...@us...> - 2004-08-30 03:00:05

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29424/src/net/sourceforge/idrs/deploy/compile/units

Modified Files:
	Tag.java 
Log Message:
*  Added getXMLObjects to idrsshell
*  Added an "ns" attribute to the "tag" tag so a namespace can be specified

Index: Tag.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Tag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Tag.java	29 Aug 2004 05:01:38 -0000	1.3
--- Tag.java	30 Aug 2004 02:59:54 -0000	1.4
***************
*** 36,40 ****
          this.atts = atts;
          name = atts.getValue("name");
!         this.tagLine = new TagLine(name,true);
         
      }
--- 36,40 ----
          this.atts = atts;
          name = atts.getValue("name");
!         this.tagLine = new TagLine(name,true,atts.getValue("ns"));
         
      }

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/report IDRSCompiler.java,1.8,1.9 TagLine.java,1.4,1.5

From: Marc B. <big...@us...> - 2004-08-30 03:00:05

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29424/src/net/sourceforge/idrs/core/report

Modified Files:
	IDRSCompiler.java TagLine.java 
Log Message:
*  Added getXMLObjects to idrsshell
*  Added an "ns" attribute to the "tag" tag so a namespace can be specified

Index: IDRSCompiler.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSCompiler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** IDRSCompiler.java	29 Aug 2004 05:01:39 -0000	1.8
--- IDRSCompiler.java	30 Aug 2004 02:59:54 -0000	1.9
***************
*** 1147,1151 ****
          }
          
!         tagLine = new TagLine(tagName,trim);
          currentLine = tagLine;
          Vector lines = new Vector();
--- 1147,1151 ----
          }
          
!         tagLine = new TagLine(tagName,trim,null);
          currentLine = tagLine;
          Vector lines = new Vector();

Index: TagLine.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/TagLine.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TagLine.java	30 Aug 2004 00:56:08 -0000	1.4
--- TagLine.java	30 Aug 2004 02:59:54 -0000	1.5
***************
*** 33,41 ****
  	private AttributeLine[] attribs;
  	boolean trim;
  	
! 	public TagLine(String name,boolean trim) {
  		this.tagName = name;
  		vlines = new Vector();
  		this.trim = trim;
  	}
  	
--- 33,43 ----
  	private AttributeLine[] attribs;
  	boolean trim;
+ 	String xmlns;
  	
! 	public TagLine(String name,boolean trim,String xmlns) {
  		this.tagName = name;
  		vlines = new Vector();
  		this.trim = trim;
+ 		this.xmlns = xmlns;
  	}
  	
***************
*** 129,132 ****
--- 131,138 ----
          }
          
+         if (this.xmlns != null) {
+         		buffer.append(" xmlns=\"").append(this.xmlns).append("\" ");
+         }
+         
  		buffer.append(">\n");
  		i = 0;
***************
*** 180,183 ****
--- 186,194 ----
          
          Element element = doc.createElement(tagName);
+         
+         if (this.xmlns != null) {
+         		element.setAttribute("xmlns",this.xmlns);
+         }
+         
          if (root == null) {
          		doc.appendChild(element);

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/script/embedable IDRSShell.java,1.8,1.9

From: Marc B. <big...@us...> - 2004-08-30 03:00:03

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/embedable
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29424/src/net/sourceforge/idrs/script/embedable

Modified Files:
	IDRSShell.java 
Log Message:
*  Added getXMLObjects to idrsshell
*  Added an "ns" attribute to the "tag" tag so a namespace can be specified

Index: IDRSShell.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/embedable/IDRSShell.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** IDRSShell.java	29 Aug 2004 05:01:40 -0000	1.8
--- IDRSShell.java	30 Aug 2004 02:59:54 -0000	1.9
***************
*** 17,20 ****
--- 17,22 ----
  import javax.servlet.*;
  import java.io.PrintWriter;
+ import java.util.ArrayList;
+ 
  import net.sourceforge.idrs.core.servlet.MultiPartRequest;
  import net.sourceforge.idrs.utils.Application;
***************
*** 194,196 ****
--- 196,202 ----
    }
    
+   public ArrayList getXMLObjects() {
+   	return idrs.getXMLObjects();
+   }
+   
  }

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/axis IdrsHandler.java,1.4,1.5 IdrsResourceMgr.java,1.3,1.4 IdrsProvider.java,1.5,1.6

From: Marc B. <big...@us...> - 2004-08-30 01:43:24

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/axis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19734/src/net/sourceforge/idrs/axis

Modified Files:
	IdrsHandler.java IdrsResourceMgr.java IdrsProvider.java 
Log Message:
changes to RML pages are detected every 5 seconds allowing for hot reload

Index: IdrsHandler.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/axis/IdrsHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IdrsHandler.java	30 Aug 2004 00:56:10 -0000	1.4
--- IdrsHandler.java	30 Aug 2004 01:43:11 -0000	1.5
***************
*** 46,50 ****
  	public static final String CONFIG_PARSE_OPTION = "parseClass";
  	
! 	ConfigInfo config;
  
  	IdrsResourceMgr mgr;
--- 46,50 ----
  	public static final String CONFIG_PARSE_OPTION = "parseClass";
  	
! 	public ConfigInfo config;
  
  	IdrsResourceMgr mgr;
***************
*** 113,116 ****
--- 113,118 ----
  			buildScriptContexts();
  			logger.info("Created Script Contexts");
+ 			
+ 			mgr.config = this.config;
  		} catch (Exception e) {
  			logger.error("Could not initiate handler",e);

Index: IdrsResourceMgr.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/axis/IdrsResourceMgr.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IdrsResourceMgr.java	29 Aug 2004 05:01:40 -0000	1.3
--- IdrsResourceMgr.java	30 Aug 2004 01:43:11 -0000	1.4
***************
*** 15,18 ****
--- 15,19 ----
  import java.util.HashMap;
  
+ import net.sourceforge.idrs.core.servlet.ConfigInfo;
  import net.sourceforge.idrs.pool.ScriptPool;
  import net.sourceforge.idrs.utils.Application;
***************
*** 28,30 ****
--- 29,32 ----
  	public HashMap dbs;
  	public ScriptPool scriptPool;
+ 	public ConfigInfo config;
  }

Index: IdrsProvider.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/axis/IdrsProvider.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IdrsProvider.java	30 Aug 2004 00:56:10 -0000	1.5
--- IdrsProvider.java	30 Aug 2004 01:43:11 -0000	1.6
***************
*** 18,22 ****
--- 18,25 ----
  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
+ import java.io.File;
+ import java.io.FileNotFoundException;
  import java.io.FileReader;
+ import java.io.IOException;
  import java.io.ObjectOutputStream;
  import java.io.OutputStreamWriter;
***************
*** 35,40 ****
--- 38,45 ----
  
  import net.sourceforge.idrs.core.report.IDRSRep;
+ import net.sourceforge.idrs.core.servlet.Init;
  import net.sourceforge.idrs.deploy.compile.RmlCompiler;
  import net.sourceforge.idrs.pool.DbPool;
+ import net.sourceforge.idrs.pool.RepPool;
  import net.sourceforge.idrs.script.embedable.IDRSScriptLanguage;
  import net.sourceforge.idrs.utils.Application;
***************
*** 71,82 ****
  	public static final String CONFIG_IDRS_RML_PATH = "rml";
  	public static final String CONFIG_IDRS_BASE_PACKAGE = "basePackage";
! 	
  	String rmlSrcPath;
  	String basePackage;
! 	private IDRSRep report;
! 	
  	static int count;
  	private boolean doneinit;
  	HashMap nameSpaces;
  	
  	/* (non-Javadoc)
--- 76,90 ----
  	public static final String CONFIG_IDRS_RML_PATH = "rml";
  	public static final String CONFIG_IDRS_BASE_PACKAGE = "basePackage";
! 	IdrsResourceMgr mgr;
  	String rmlSrcPath;
  	String basePackage;
! 	RepPool pool;
  	static int count;
  	private boolean doneinit;
  	HashMap nameSpaces;
+ 	private String rmlSchema;
+ 	private String rmlTrans;
+ 	private String parseClass;
+ 	 long lastModified;
  	
  	/* (non-Javadoc)
***************
*** 95,106 ****
  		
  		Document doc = null;
! 		IdrsResourceMgr mgr = (IdrsResourceMgr) msgContext.getProperty(IdrsHandler.IDRS_RESOURCES);
  		HashMap dbs = new HashMap();
  		IDRSScriptLanguage script = null;
  		String buffer = null;
  		try {
  			
! 			
! 			List dbnames = this.report.getHead().getRequiredDBs();
  			Iterator it = dbnames.iterator();
  			while (it.hasNext()) {
--- 103,115 ----
  		
  		Document doc = null;
! 		//IdrsResourceMgr mgr = (IdrsResourceMgr) msgContext.getProperty(IdrsHandler.IDRS_RESOURCES);
  		HashMap dbs = new HashMap();
  		IDRSScriptLanguage script = null;
  		String buffer = null;
+ 		IDRSRep report = null;
  		try {
  			
! 			report = this.pool.getReport();
! 			List dbnames = report.getHead().getRequiredDBs();
  			Iterator it = dbnames.iterator();
  			while (it.hasNext()) {
***************
*** 145,149 ****
  			
  			
! 			this.report.getHead().init(dbs,
  									 0,
  									 0,
--- 154,158 ----
  			
  			
! 			report.getHead().init(dbs,
  									 0,
  									 0,
***************
*** 168,171 ****
--- 177,187 ----
  			logger.error("Could not process report",e1);
  		} finally {
+ 			if (report != null) {
+ 				try {
+ 					pool.returnReport(report);
+ 				} catch (Exception e) {
+ 					logger.error("Could not return report",e);
+ 				}
+ 			}
  			if (script != null) {
  				try {
***************
*** 253,256 ****
--- 269,274 ----
  	private void firstinit(MessageContext ctx) {
  		try {
+ 			 mgr = (IdrsResourceMgr) ctx.getProperty(IdrsHandler.IDRS_RESOURCES);
+ 			
  		//		get needed info
  			//System.out.println(ctx.getService().getOptions());
***************
*** 263,274 ****
  		
  		
! 		String rmlTrans = webinf + "/rmlTrans.xml";
! 		String rmlSchema = webinf + "/rmlSchema.xml";
! 		
! 		String parseClass = "org.apache.xerces.parsers.SAXParser";
! 		
  		rmlSrcPath = servlet.getServletContext().getRealPath(rmlSrcPath);
  		
- 		this.basePackage = (String) ctx.getService().getOption(IdrsProvider.CONFIG_IDRS_BASE_PACKAGE);
  		
  		Hashtable options = ctx.getService().getOptions();
--- 281,289 ----
  		
  		
! 		rmlTrans = webinf + "/rmlTrans.xml";
! 		rmlSchema = webinf + "/rmlSchema.xml";
! 		parseClass = "org.apache.xerces.parsers.SAXParser";
  		rmlSrcPath = servlet.getServletContext().getRealPath(rmlSrcPath);
  		
  		
  		Hashtable options = ctx.getService().getOptions();
***************
*** 284,289 ****
--- 299,323 ----
  		}
  		
+ 		File rml = new File(rmlSrcPath);
+ 		this.lastModified = rml.lastModified();
+ 		
+ 		
+ 		
+ 		loadRML();
+ 		} catch (Exception e) {
+ 			logger.error("Could not compile page",e);
+ 		}
  		
  		
+ 		new LookForRML(this).start();
+ 		this.doneinit = true;
+ 	}
+ 	
+ 	/**
+ 	 * @throws FileNotFoundException
+ 	 * @throws IOException
+ 	 * @throws Exception
+ 	 */
+ 	protected void loadRML() throws FileNotFoundException, IOException, Exception {
  		StringBuffer buf = new StringBuffer();
  		BufferedReader in = new BufferedReader(new FileReader(rmlSrcPath));
***************
*** 295,311 ****
  		
  		
! 			this.compilePage(buf.toString(),new PrintWriter(new OutputStreamWriter(System.out)),parseClass,rmlTrans,true,rmlSchema);
! 		} catch (Exception e) {
! 			logger.error("Could not compile page",e);
! 		}
! 		
! 		
! 		
! 		this.doneinit = true;
  	}
! 	
  	public void compilePage (
  			String src,
- 			PrintWriter logger,
  			String parseClass,
  			String rmlTrans,
--- 329,337 ----
  		
  		
! 			this.compilePage(buf.toString(),parseClass,rmlTrans,true,rmlSchema);
  	}
! 
  	public void compilePage (
  			String src,
  			String parseClass,
  			String rmlTrans,
***************
*** 326,335 ****
  							rmlSchema);
  
! 					report = compiler.getReport();
! 					
  					
  				} catch (Exception e) {
  
! 					e.printStackTrace(logger);
  					
  					
--- 352,368 ----
  							rmlSchema);
  
! 					IDRSRep report = compiler.getReport();
  					
+ 					pool = createReportPool();
+ 					pool.build(
+ 						10,
+ 						50,
+ 						report,
+ 						2000L,
+ 						null,
+ 						10);
  				} catch (Exception e) {
  
! 					logger.error("Could not compile report",e);
  					
  					
***************
*** 338,340 ****
--- 371,415 ----
  			
  		}
+ 	
+ 	private  RepPool createReportPool() throws Exception {
+ 		String reportPool = this.mgr.config.getReportPoolClass();
+ 		reportPool = (reportPool != null) ? reportPool : Init.DEFAULT_REPORT_POOL;
+ 		return (RepPool) Class.forName(reportPool).newInstance();
+ 	}
+ }
+ 
+ class LookForRML extends Thread {
+ 	IdrsProvider provider;
+ 	static Logger logger = Logger.getLogger(LookForRML.class.getName());
+ 	
+ 	public LookForRML(IdrsProvider provider) {
+ 		this.provider = provider;
+ 		this.setPriority(Thread.MIN_PRIORITY);
+ 	}
+ 	
+ 	public void run() {
+ 		while (true) {
+ 			File rml = new File(provider.rmlSrcPath);
+ 			if (rml.lastModified() > provider.lastModified) {
+ 				logger.info("Found new RML, loading");
+ 				try {
+ 					provider.loadRML();
+ 					provider.lastModified = rml.lastModified();
+ 					logger.info("Loaded new RML");
+ 				} catch (FileNotFoundException e) {
+ 					logger.error("Could not load RML",e);
+ 				} catch (IOException e) {
+ 					logger.error("Could not load RML",e);
+ 				} catch (Exception e) {
+ 					logger.error("Could not load RML",e);
+ 				}
+ 			}
+ 			
+ 			try {
+ 				this.sleep(5000);
+ 			} catch (InterruptedException e) {
+ 				return;
+ 			}
+ 		}
+ 	}
  }

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/servlet Init.java,1.14,1.15

From: Marc B. <big...@us...> - 2004-08-30 01:43:24

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19734/src/net/sourceforge/idrs/core/servlet

Modified Files:
	Init.java 
Log Message:
changes to RML pages are detected every 5 seconds allowing for hot reload

Index: Init.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/Init.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Init.java	30 Aug 2004 00:56:07 -0000	1.14
--- Init.java	30 Aug 2004 01:43:11 -0000	1.15
***************
*** 38,45 ****
   */
  public class Init {
! 	static final String DEFAULT_DB_POOL = "net.sourceforge.idrs.pool.JDBCPool";
! 	static final String DEFAULT_REPORT_POOL =
  		"net.sourceforge.idrs.pool.IDRSRepPool";
! 	static final String DEFAULT_SCRIPT_POOL =
  		"net.sourceforge.idrs.pool.ScriptContextPool";
  
--- 38,45 ----
   */
  public class Init {
! 	public static final String DEFAULT_DB_POOL = "net.sourceforge.idrs.pool.JDBCPool";
! 	public static final String DEFAULT_REPORT_POOL =
  		"net.sourceforge.idrs.pool.IDRSRepPool";
! 	public static final String DEFAULT_SCRIPT_POOL =
  		"net.sourceforge.idrs.pool.ScriptContextPool";

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/utils/pool ObjectPool.java,1.4,1.5