idrs-commit — List For CVS Commit Mails

[Idrs-commit] CVS: Idrs/dev/lib idrs.jar,1.17,1.18

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/lib
In directory usw-pr-cvs1:/tmp/cvs-serv3376/dev/lib

Modified Files:
	idrs.jar 
Log Message:
Fixed a bug with returning the authentication connection

Index: idrs.jar
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/lib/idrs.jar,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
Binary files /tmp/cvsLeruNn and /tmp/cvsUa7NOA differ

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

[Marc B. <big...@us...>]

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

Added Files:
	NavNextChunk.java NavPrevChunk.java NavigateChunk.java 
Log Message:
Added data paging support, fixed hot deployment bug

--- NEW FILE: NavNextChunk.java ---
/*
      NavNextChunk.java
      Copyright (C) 2001 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.*;
import java.util.*;
import java.net.*;
import net.sourceforge.idrs.utils.*;
import javax.servlet.http.*;


/**
  Encapsulates any plain text found in an RML page
*/
public final class NavNextChunk extends NavigateChunk {

	public NavNextChunk(String txt) {
		super(txt);
	}
	
	protected int adjustPosition(DB db) throws Exception {
		System.out.println("Curr Location : " + db.getCurrLocation());
		System.out.println("Num Recs : " + db.getNumRecs());
		return db.getCurrLocation();
	}
}
--- NEW FILE: NavPrevChunk.java ---
/*
      NavPrevChunk.java
      Copyright (C) 2001 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.*;
import java.util.*;
import java.net.*;
import net.sourceforge.idrs.utils.*;
import javax.servlet.http.*;


/**
  Encapsulates any plain text found in an RML page
*/
public final class NavPrevChunk extends NavigateChunk {

	public NavPrevChunk(String txt) {
		super(txt);
	}
	
	protected int adjustPosition(DB db) throws Exception {
		
		
		return db.getFirstRec() - db.getNumRecs();
	}
}
--- NEW FILE: NavigateChunk.java ---
/*
      NavigateChunk.java
      Copyright (C) 2001 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.*;
import java.util.*;
import java.net.*;
import net.sourceforge.idrs.utils.*;
import javax.servlet.http.*;


/**
  Encapsulates any plain text found in an RML page
*/
public abstract class NavigateChunk implements Chunk, Serializable {
	String text;
	StringBuffer buff;
	/**
	  Initializes the Chunk
	  @param text Text to be stored
	*/
	public NavigateChunk(String text) {
		this.text = text;
		buff = new StringBuffer();
	}
	
	protected abstract int adjustPosition(DB db) throws Exception ;
	
	/**
	  Returns the link to the next page
	  @param head IDRSHead for report
	*/
	public String toString(IDRSHead head) throws Exception {
		buff.setLength(0);
		
		
		Enumeration paramNames;
		String paramName;
		String param;
		HttpServletRequest request = head.getRequest();;
		//loop through all parameters
		buff.append("<a href=\"").append(request.getRequestURI()).append('?');
		paramNames = request.getParameterNames();
		DB db;
		
		boolean returnLink = false;
		int adjustedPos;
		
		while (paramNames.hasMoreElements()) {
			paramName = (String) paramNames.nextElement();
			param = request.getParameter(paramName);
			
		
			
			if  (paramName.indexOf("_FirstRecord") != -1) {
				db = head.getDB(paramName.substring(0,paramName.indexOf("_")));
				
				adjustedPos = adjustPosition(db);
				returnLink = returnLink || ((adjustedPos >= 0) && (adjustedPos <= db.getNumberRows()));
				
				buff.append(paramName).append('=').append(adjustedPos).append('&');
			}
			else if  (paramName.indexOf("_Reset") != -1) {
				buff.append(paramName).append('=').append(0).append('&');
			}
			else {
				buff.append(paramName).append('=').append(URLEncoder.encode(param)).append('&');
			}
		}
		
		if (returnLink) {
			buff.deleteCharAt(buff.length()-1);
			buff.append("\">").append(text).append("</a>");
			return buff.toString();
		}
		else {
			return "";
		}
		
		
	}
}

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/utils DB.java,1.9,1.10

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils
In directory usw-pr-cvs1:/tmp/cvs-serv11935/dev/src/net/sourceforge/idrs/utils

Modified Files:
	DB.java 
Log Message:
Added data paging support, fixed hot deployment bug

Index: DB.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/DB.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DB.java	9 Sep 2002 21:27:44 -0000	1.9
--- DB.java	16 Sep 2002 15:19:42 -0000	1.10
***************
*** 96,99 ****
--- 96,103 ----
          this.cursur = DB.CLIENT;
      }
+     
+     public int getNumberRows() {
+     	return rows.size();
+     }
      
      
***************
*** 128,131 ****
--- 132,136 ----
      public void setNumRecs(int recs) throws Exception {
          this.numRecs = recs;
+         this.cursur = DB.CLIENT;
      }
      
***************
*** 493,503 ****
       */
      private void readTable() throws Exception {
!         
          if (this.cursur == DB.CLIENT) {
!             //System.out.println("Client cursor");
              rows = new LinkedList();
              while (rs.next()) {
                  this.fields  = new HashMap();
!                 readFields();
                  rows.add(this.fields);
              }
--- 498,515 ----
       */
      private void readTable() throws Exception {
!         
Object key;
!         System.out.println("in read table");
          if (this.cursur == DB.CLIENT) {
!             System.out.println("In Client cursor read table");
              rows = new LinkedList();
+             Iterator it;
              while (rs.next()) {
                  this.fields  = new HashMap();
!                 readFields();
! 				it = fields.keySet().iterator();
! 				while (it.hasNext()) {
! 					key = it.next();
! 					System.out.println(key + "=" + fields.get(key));
! 				}
                  rows.add(this.fields);
              }
***************
*** 615,619 ****
              throw new Exception("getFieldData() can only be called when direction is OUTPUT");
          
!         if (rs == null) {
              return "";
          }
--- 627,631 ----
              throw new Exception("getFieldData() can only be called when direction is OUTPUT");
          
!         if (rs == null && this.cursur != DB.CLIENT) {
              return "";
          }
***************
*** 701,704 ****
--- 713,717 ----
      public void startWith(int location) throws Exception {
          this.beginWith = location;
+         this.cursurLocation = location;
      }
      
***************
*** 714,719 ****
          if (this.cursur == DB.CLIENT) {
              System.out.println("Cursor client : ");
!             if (rows.size() > cursurLocation) {
!                 fields = (HashMap) rows.get(this.cursurLocation);
                  cursurLocation++;
                  hasNext = true;
--- 727,733 ----
          if (this.cursur == DB.CLIENT) {
              System.out.println("Cursor client : ");
!             System.out.println("Location : " + cursurLocation);
!             if ((rows.size() > cursurLocation) && (cursurLocation < beginWith + numRecs)) {
!                 this.fields = (HashMap) rows.get(this.cursurLocation);
                  cursurLocation++;
                  hasNext = true;
***************
*** 792,795 ****
--- 806,811 ----
              	}
              	this.wasCached = (caches.get(this.name) != null);
+             	System.out.println("Cached : " + this.wasCached);
+             	System.out.println("Cache : " + caches.get(this.name));
          }
  		

[Idrs-commit] CVS: Idrs/dev/lib idrs.jar,1.16,1.17

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/lib
In directory usw-pr-cvs1:/tmp/cvs-serv11935/dev/lib

Modified Files:
	idrs.jar 
Log Message:
Added data paging support, fixed hot deployment bug

Index: idrs.jar
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/lib/idrs.jar,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
Binary files /tmp/cvsVYdTIM and /tmp/cvso4gXpo differ

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units Body.java,1.5,1.6 Db.java,1.5,1.6

[Marc B. <big...@us...>]

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

Modified Files:
	Body.java Db.java 
Log Message:
Added data paging support, fixed hot deployment bug

Index: Body.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Body.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Body.java	9 Sep 2002 21:27:44 -0000	1.5
--- Body.java	16 Sep 2002 15:19:42 -0000	1.6
***************
*** 154,157 ****
--- 154,165 ----
      }
      
+     public void navNext(String val, Attributes atts) throws Exception {
+     	state.getCurrentLine().addChunk(new NavNextChunk(val));
+     }
+     
+     public void navPrev(String val, Attributes atts) throws Exception {
+     	state.getCurrentLine().addChunk(new NavPrevChunk(val));
+     }
+     
      /**
       * Handles the formInput tag
***************
*** 209,212 ****
--- 217,222 ----
        state.getReport().getBody().seal();
      }
+     
+     
      
      

Index: Db.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Db.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Db.java	9 Sep 2002 21:27:44 -0000	1.5
--- Db.java	16 Sep 2002 15:19:42 -0000	1.6
***************
*** 100,103 ****
--- 100,106 ----
         	db.setNumRecs(Integer.parseInt(val));
         }
+        else {
+        	db.setNumRecs(-1);
+        }
      
      }

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

[Marc B. <big...@us...>]

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

Modified Files:
	IDRSServlet.java Init.java 
Log Message:
Added data paging support, fixed hot deployment bug

Index: IDRSServlet.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/IDRSServlet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** IDRSServlet.java	9 Sep 2002 21:27:44 -0000	1.13
--- IDRSServlet.java	16 Sep 2002 15:19:42 -0000	1.14
***************
*** 316,320 ****
    ERRORS:Incorrect Parameters
     */
!     private void addVars(IDRSSecurity secure, RequestWrapper req, IDRSRep rep)
      throws Exception {
          String currentDB = "";
--- 316,320 ----
    ERRORS:Incorrect Parameters
     */
!     private void addVars(IDRSSecurity secure, RequestWrapper req, IDRSRep rep,HttpSession session)
      throws Exception {
          String currentDB = "";
***************
*** 325,329 ****
          //retrieve the report header
          IDRSHead head = rep.getHead();
!         HashMap dbCache = (HashMap) head.getSession().getAttribute("IDRS_DB_CACHE");
          
          //retrieve the list of parameter names
--- 325,329 ----
          //retrieve the report header
          IDRSHead head = rep.getHead();
!         HashMap dbCache = (HashMap) session.getAttribute("IDRS_DB_CACHE");
          
          //retrieve the list of parameter names
***************
*** 333,337 ****
          for (int i = 0; i < Params.length; i++) {
              param = (String) Params[i];
!             
              //determine what area of the header "db" is being added to
              db = param.substring(0, param.indexOf("_"));
--- 333,337 ----
          for (int i = 0; i < Params.length; i++) {
              param = (String) Params[i];
!             			
              //determine what area of the header "db" is being added to
              db = param.substring(0, param.indexOf("_"));
***************
*** 345,365 ****
              
        
!       if (param.indexOf("Reset") != -1) {
!         try {
!           if (req.getParameter(param).equalsIgnoreCase("true"))
!             dbCache.remove(db);
!         }
!         catch (Exception ignore){}
!       }
!        
!       else if (param.indexOf("PageSize") != -1) {
!         head.setPageSize(db,Integer.parseInt((String) req.getParameter(param)));
!       }
!       else if (param.indexOf("FirstRecord") != -1) {
!         head.setPageFirst(db,Integer.parseInt((String) req.getParameter(param)));
!       }
         
              
!             if (param.indexOf("UserID") != -1) {
                  System.out.println("HERE");
                  head.add(db, "", "UserID");
--- 345,367 ----
              
        
! 		      if (param.indexOf("Reset") != -1) {
! 		        try {
! 		          if (req.getParameter(param).equalsIgnoreCase("true") && dbCache != null)
! 		            dbCache.remove(db);
! 		        }
! 		        catch (Exception ignore){
! 		        	ignore.printStackTrace(System.out);
! 		        }
! 		      }
! 		       
! 		      else if (param.indexOf("PageSize") != -1) {
! 		        head.setPageSize(db,Integer.parseInt((String) req.getParameter(param)));
! 		      }
! 		      else if (param.indexOf("FirstRecord") != -1) {
! 		        head.setPageFirst(db,Integer.parseInt((String) req.getParameter(param)));
! 		      }
         
              
!             else if (param.indexOf("UserID") != -1) {
                  System.out.println("HERE");
                  head.add(db, "", "UserID");
***************
*** 498,503 ****
          //initialize some information about the report
          poolInfo.docName = docName;
          //add the parameters
!         addVars(secure, rap, rep);
          
          //lets run the page
--- 500,506 ----
          //initialize some information about the report
          poolInfo.docName = docName;
+         poolInfo.rep = rep;
          //add the parameters
!         addVars(secure, rap, rep,req.getSession());
          
          //lets run the page

Index: Init.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/Init.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Init.java	22 Aug 2002 20:06:34 -0000	1.8
--- Init.java	16 Sep 2002 15:19:42 -0000	1.9
***************
*** 93,97 ****
       */
      public JDBCInfo getAppDBInfo() {
! 		return (JDBCInfo) dbs.get(authDB);
  	}
  
--- 93,97 ----
       */
      public JDBCInfo getAppDBInfo() {
! 		return ((DbPool) dbs.get(docsDB)).getInfo();
  	}
  

[Idrs-commit] CVS: Idrs/dev/bin idrs.jar,1.14,1.15

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/bin
In directory usw-pr-cvs1:/tmp/cvs-serv11935/dev/bin

Modified Files:
	idrs.jar 
Log Message:
Added data paging support, fixed hot deployment bug

Index: idrs.jar
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/bin/idrs.jar,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
Binary files /tmp/cvsX5mPsg and /tmp/cvsC99vso differ

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

[Marc B. <big...@us...>]

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

Modified Files:
	IDRSHead.java 
Added Files:
	ErrorChunk.java 
Log Message:
added transaction support and new form handling

--- NEW FILE: ErrorChunk.java ---
/*
      ErrorChunk.java
      Copyright (C) 2001 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;

/**
  Encapsulates any error text found in an RML page
*/
public class ErrorChunk implements Chunk, Serializable {
	//static final long serialVersionUID = -8639937515957851296L;
	
	/**
	  Initializes the Chunk
	  @param text Text to be stored
	*/
	public ErrorChunk() {

	}
	
	
	/**
	  Returns the text stored
	  @param head IDRSHead for report
	*/
	public String toString(IDRSHead head) throws Exception {
		String err;
		err = (String) head.getRequest().getAttribute("doc_Error");
		return (err != null) ? err : "";
	}
}

Index: IDRSHead.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSHead.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** IDRSHead.java	22 Aug 2002 20:06:33 -0000	1.10
--- IDRSHead.java	9 Sep 2002 21:27:44 -0000	1.11
***************
*** 21,26 ****
--- 21,29 ----
      protected HashMap varNames;
      protected HashMap pos;
+     protected transient HashMap trans;
      protected String[] objNames, dbNames;
      
+     
+     
      protected transient boolean send = true;
      static final long serialVersionUID = -4520281654183459125L;
***************
*** 147,150 ****
--- 150,156 ----
          this.digest = digest;
          
+         if (this.trans == null) this.trans = new HashMap();
+         trans.clear();
+         
          this.userInfo=userInfo;
          this.idrs = context;
***************
*** 245,248 ****
--- 251,258 ----
          }
          
+         //we've made it this far, commit all changes
+ 		commitAllTransactions();        
+         
+         
          
          
***************
*** 638,667 ****
    }
    
!   /*
    /**
     *Creates an error in the request
     *@param err as string
!    /
    
    public void createError(String err) {
        request.setAttribute(ERR_NAME,err);
    }
    
    /**
     *Determines if there is an error
     *@return true if there is an error
!    /
    public boolean isError() {
        return request.getAttribute(ERR_NAME) != null;
    }
    
    /**
     *Retrieves the error
!    /
    public String getError() {
        return (String) request.getAttribute(ERR_NAME);
    }
    
!   */
      
  }
--- 648,721 ----
    }
    
!   
    /**
     *Creates an error in the request
     *@param err as string
!    */
    
    public void createError(String err) {
+   	System.out.println("Error 1: " + err);
        request.setAttribute(ERR_NAME,err);
+       System.out.println("Error 2: " + request.getAttribute(ERR_NAME));
    }
    
+ 
    /**
     *Determines if there is an error
     *@return true if there is an error
!    */
    public boolean isError() {
+   	System.out.println("Error : " + request.getAttribute(ERR_NAME));
        return request.getAttribute(ERR_NAME) != null;
    }
    
+ 
    /**
     *Retrieves the error
!    */
    public String getError() {
        return (String) request.getAttribute(ERR_NAME);
    }
    
!   public void commitAllTransactions() throws Exception {
!   	Iterator it = trans.keySet().iterator();
!   	
!   	Connection con;
!   	while (it.hasNext()) {
!   		con = (Connection) trans.get((String) it.next());
!   		con.commit();
!   		it.remove();
!   	}
!   }
!   
!   public void rollbackAllTransactions() throws Exception {
!   	Iterator it = trans.keySet().iterator();
!   	
!   	Connection con;
!   	while (it.hasNext()) {
!   		con = (Connection) trans.get(it.next());
!   		con.rollback();
!   		it.remove();
!   	}
!   }
!   
!   public void addTransaction(String conName) throws Exception {
!   	if (trans.get(conName) == null) {
! 	  	Connection con = (Connection) conns.get(conName);
! 	  	con.setAutoCommit(false);
! 	  	trans.put(conName,con);
! 	  }
!   }
!   
!   public void setPageSize(String db, int size) throws Exception {
!   	((DB) dbs.get(db)).setNumRecs(size);	
!   }
!   
!   public void setPageFirst(String db, int startWith) throws Exception {
!   	((DB) dbs.get(db)).startWith(startWith);
!   }
!   
!   
!   
      
  }

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

[Marc B. <big...@us...>]

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

Modified Files:
	IDRSShell.java 
Log Message:
added transaction support and new form handling

Index: IDRSShell.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/embedable/IDRSShell.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IDRSShell.java	22 Aug 2002 20:06:37 -0000	1.5
--- IDRSShell.java	9 Sep 2002 21:27:44 -0000	1.6
***************
*** 157,165 ****
    }
    
!   /*
    /**
     *Creates an error in the request
     *@param err as string
!    /
    
    public void createError(String err) {
--- 157,165 ----
    }
    
!   
    /**
     *Creates an error in the request
     *@param err as string
!    */
    
    public void createError(String err) {
***************
*** 170,174 ****
     *Determines if there is an error
     *@return true if there is an error
!    /
    public boolean isError() {
        return idrs.isError();
--- 170,174 ----
     *Determines if there is an error
     *@return true if there is an error
!    */
    public boolean isError() {
        return idrs.isError();
***************
*** 177,184 ****
    /**
     *Retrieves the error
!    /
    public String getError() {
        return idrs.getError();
    }
!   */
  }
--- 177,184 ----
    /**
     *Retrieves the error
!    */
    public String getError() {
        return idrs.getError();
    }
!   
  }

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/utils DB.java,1.8,1.9

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils
In directory usw-pr-cvs1:/tmp/cvs-serv10950/src/net/sourceforge/idrs/utils

Modified Files:
	DB.java 
Log Message:
added transaction support and new form handling

Index: DB.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/DB.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DB.java	22 Aug 2002 20:06:37 -0000	1.8
--- DB.java	9 Sep 2002 21:27:44 -0000	1.9
***************
*** 16,19 ****
--- 16,20 ----
  import java.text.*;
  import net.sourceforge.idrs.script.IDRSScript;
+ import net.sourceforge.idrs.core.report.IDRSHead;
  import java.io.*;
  /**
***************
*** 38,41 ****
--- 39,46 ----
      public static final int PROC = 1;
      public static final int SQL = 2;
+     
+     public static final int TRANS_BEGIN = 0;
+     public static final int TRANS_COMPLETE = 1;
+ 
      
      protected int cursurLocation, beginWith = 0;
***************
*** 61,64 ****
--- 66,72 ----
      protected String methodName;
      protected int type;
+     
+     protected int transactionType;
+     
      protected transient boolean hasResults;
      protected transient Statement holdForClean;
***************
*** 718,722 ****
          }
          else {//server cursur is default
!             if (firstRead) {
                  
                  if (rs.next()) {
--- 726,730 ----
          }
          else {//server cursur is default
!             if  (firstRead) {
                  
                  if (rs.next()) {
***************
*** 772,780 ****
      
      
!     public void buildDB(String[] vars,IDRSScript idrs) throws Exception{
!         System.out.println("In buildDB");
! 	System.out.println("cursor : " + (this.cursur == DB.CLIENT));
! 	System.out.println("wasCached : " + this.wasCached);
! 	if (this.cursur != DB.CLIENT && ! this.wasCached) {
              if (type == METHOD) {
                  
--- 780,804 ----
      
      
!     public void buildDB(String[] vars,IDRSHead idrs) throws Exception{
! 		Exception e = null;
! 		boolean wasException = false;
! 		HashMap caches = null;
! 		
! 		if (this.cursur == DB.CLIENT) {
!             	caches = ((HashMap) idrs.getSession().getAttribute("IDRS_DB_CACHE"));
!             	if (caches == null) {
!             		caches = new HashMap();
!             		idrs.getSession().setAttribute("IDRS_DB_CACHE",caches);
!             	}
!             	this.wasCached = (caches.get(this.name) != null);
!         }
! 		
! 		if (this.transactionType == TRANS_BEGIN || this.transactionType == TRANS_COMPLETE) {
! 			idrs.addTransaction(name);
! 		}
! 		
! 		
! 		
! 		if (! this.wasCached && ! idrs.isError()) {
              if (type == METHOD) {
                  
***************
*** 786,790 ****
--- 810,829 ----
                  ProcSQL(sql,(type == PROC),vars);
              }
+             
+             if (this.cursur == DB.CLIENT) {
+             	caches.put(this.name,rows);
+             }
+         }
+         else {
+         	this.rows = ((LinkedList) ((HashMap) idrs.getSession().getAttribute("IDRS_DB_CACHE")).get(this.name));
          }
+         
+         if (idrs.isError() || wasException) {
+         	idrs.rollbackAllTransactions();
+         	if (wasException) throw e;
+         }
+         else if (this.transactionType == TRANS_COMPLETE) {
+         	idrs.commitAllTransactions();
+         }
      }
      
***************
*** 846,849 ****
--- 885,892 ----
          this.wasCached = true;
      }
+     
+     public void setTransactionType(int type) {
+     	this.transactionType = type;
+     }
  }
  

[Idrs-commit] CVS: Idrs/dev/xml rmlSchema.xml,1.2,1.3 rmlTrans.xml,1.7,1.8

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/xml
In directory usw-pr-cvs1:/tmp/cvs-serv10950/xml

Modified Files:
	rmlSchema.xml rmlTrans.xml 
Log Message:
added transaction support and new form handling

Index: rmlSchema.xml
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/xml/rmlSchema.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rmlSchema.xml	23 Mar 2002 04:48:29 -0000	1.2
--- rmlSchema.xml	9 Sep 2002 21:27:44 -0000	1.3
***************
*** 38,41 ****
--- 38,42 ----
   		<xs:all>
   			<xs:element name="text" type="xs:string" />
+  			<xs:element name="error" type="xs:string" />
   			<xs:element name="field" type="xs:string" />
   				<xs:attribute name="format" type="xs:string" />
***************
*** 110,119 ****
  								<xs:complexType>
  									<xs:sequence>
! 										<xs:element name="direction" minOccurrs="0" maxOccurrs="unbound">
  											<xs:restriction base="xs:NMTOKEN">
  									 			<xs:enumeration value="INPUT" />
  									 			<xs:enumeration value="OUTPUT" />
  									 		</xs:restriciton>
! 									 	</xs:element>									
  										<xs:choice>
  											<xs:sequence>
--- 111,126 ----
  								<xs:complexType>
  									<xs:sequence>
! 										<xs:element name="direction" minOccurrs="0" maxOccurrs="1">
  											<xs:restriction base="xs:NMTOKEN">
  									 			<xs:enumeration value="INPUT" />
  									 			<xs:enumeration value="OUTPUT" />
  									 		</xs:restriciton>
! 									 	</xs:element>		
! 									 	<xs:element name="transaction" minOccurrs="0" maxOccurrs="1">
! 											<xs:restriction base="xs:NMTOKEN">
! 									 			<xs:enumeration value="BEGIN" />
! 									 			<xs:enumeration value="COMPLETE" />
! 									 		</xs:restriciton>
! 									 	</xs:element>		
  										<xs:choice>
  											<xs:sequence>

Index: rmlTrans.xml
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/xml/rmlTrans.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rmlTrans.xml	22 Aug 2002 19:35:01 -0000	1.7
--- rmlTrans.xml	9 Sep 2002 21:27:44 -0000	1.8
***************
*** 14,17 ****
--- 14,18 ----
  	<trans:rml simple="true" ownLine="true">db</trans:rml>
  	<trans:rml simple="true" ownLine="false">dbDriver</trans:rml>
+ 	<trans:rml simple="true" ownLine="false">transaction</trans:rml>
  	<trans:rml simple="true" ownLine="false">dbName</trans:rml>
  	<trans:rml simple="true" ownLine="false">dirrection</trans:rml>
***************
*** 27,30 ****
--- 28,32 ----
  	<trans:rml simple="true" ownLine="false" parents="repeat,ifchange,yes,no,body">field</trans:rml>
  	<trans:rml simple="true" ownLine="false">src</trans:rml>
+ 	<trans:rml simple="true" ownLine="false">error</trans:rml>
  	<trans:rml simple="true" ownLine="true" parents="body">ifResults</trans:rml>
  	<trans:rml simple="false" ownLine="true" >yes</trans:rml>

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/script IDRSScript.java,1.7,1.8

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script
In directory usw-pr-cvs1:/tmp/cvs-serv10950/src/net/sourceforge/idrs/script

Modified Files:
	IDRSScript.java 
Log Message:
added transaction support and new form handling

Index: IDRSScript.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/IDRSScript.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** IDRSScript.java	22 Aug 2002 20:06:37 -0000	1.7
--- IDRSScript.java	9 Sep 2002 21:27:44 -0000	1.8
***************
*** 119,127 ****
    public String getDigest(String plain) throws Exception ;
    
!   /*
    /**
     *Creates an error in the request
     *@param err as string
!    /
    
    public void createError(String err);
--- 119,127 ----
    public String getDigest(String plain) throws Exception ;
    
!   
    /**
     *Creates an error in the request
     *@param err as string
!    */
    
    public void createError(String err);
***************
*** 130,140 ****
     *Determines if there is an error
     *@return true if there is an error
!    /
    public boolean isError() ;
    
    /**
     *Retrieves the error
!    /
    public String getError() ;
!   */
  }
--- 130,140 ----
     *Determines if there is an error
     *@return true if there is an error
!    */
    public boolean isError() ;
    
    /**
     *Retrieves the error
!    */
    public String getError() ;
!   
  }

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/servlet IDRSServlet.java,1.12,1.13

[Marc B. <big...@us...>]

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

Modified Files:
	IDRSServlet.java 
Log Message:
added transaction support and new form handling

Index: IDRSServlet.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/IDRSServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** IDRSServlet.java	22 Aug 2002 20:06:33 -0000	1.12
--- IDRSServlet.java	9 Sep 2002 21:27:44 -0000	1.13
***************
*** 325,328 ****
--- 325,329 ----
          //retrieve the report header
          IDRSHead head = rep.getHead();
+         HashMap dbCache = (HashMap) head.getSession().getAttribute("IDRS_DB_CACHE");
          
          //retrieve the list of parameter names
***************
*** 343,347 ****
              }
              
!       /*
        if (param.indexOf("Reset") != -1) {
          try {
--- 344,348 ----
              }
              
!       
        if (param.indexOf("Reset") != -1) {
          try {
***************
*** 353,362 ****
         
        else if (param.indexOf("PageSize") != -1) {
!         rep.setPageSize(db,Integer.parseInt((String) req.getParameter(param)));
        }
        else if (param.indexOf("FirstRecord") != -1) {
!         rep.setPageFirst(db,Integer.parseInt((String) req.getParameter(param)));
        }
!        */
              
              if (param.indexOf("UserID") != -1) {
--- 354,363 ----
         
        else if (param.indexOf("PageSize") != -1) {
!         head.setPageSize(db,Integer.parseInt((String) req.getParameter(param)));
        }
        else if (param.indexOf("FirstRecord") != -1) {
!         head.setPageFirst(db,Integer.parseInt((String) req.getParameter(param)));
        }
!        
              
              if (param.indexOf("UserID") != -1) {
***************
*** 510,524 ****
          buffer = rep.buildReport();
         
!     /*    if (! rep.getHead().isError()) {
!             
!         }*/
!         //if we want to send to the client, send it
!         if(rep.getHead().getSendToClient()) {
!             //set the content type
!             resp.setContentType("text/html");
!             resp.getWriter().print(buffer);
!             resp.getWriter().close();
          }
          
      }
      
--- 511,530 ----
          buffer = rep.buildReport();
         
!         if (! rep.getHead().isError()) {
!             //if we want to send to the client, send it
!         	if(rep.getHead().getSendToClient()) {
!          	   //set the content type
!           	  resp.setContentType("text/html");
!            	 resp.getWriter().print(buffer);
!             	resp.getWriter().close();
!         	}
!         }
!         else {
!         	//there was an error in building the page
!         	goBack(req,resp);
          }
          
+         
+         
      }
      
***************
*** 557,561 ****
          resp.setContentType("text/html");
          req.getSession(true).invalidate();
!         req.getRequestDispatcher(init.getDeniedPage()).include(req, resp);
      }
      
--- 563,589 ----
          resp.setContentType("text/html");
          req.getSession(true).invalidate();
!         req.getRequestDispatcher(init.getDeniedPage()).forward(req, resp);
!     }
!     
!     /**
!      * Used to give specified go back page
!      * @param req Request object
!      * @param resp Response object
!      */
!     public void goBack(HttpServletRequest req, HttpServletResponse resp)
!     throws Exception {
!         String goBackPage = req.getParameter("doc_GoBack");
!         
!         //forward to access denied page specified in the doc_GoBack input field
!         if (goBackPage != null) {
! 	        req.setAttribute("doc_Error",req.getAttribute("doc_ERROR"));
! 	        req.removeAttribute("doc_ERROR");
! 	        req.getRequestDispatcher(goBackPage).forward(req, resp);
! 	        
! 	    }
! 	    else {
! 	    	//there is no goback page, so we will throu an exception
! 	    	throw new Exception((String) req.getAttribute("doc_ERROR"));
! 	    }
      }
      

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

[Marc B. <big...@us...>]

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

Modified Files:
	Body.java Db.java 
Log Message:
added transaction support and new form handling

Index: Body.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Body.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Body.java	13 Apr 2002 16:06:35 -0000	1.4
--- Body.java	9 Sep 2002 21:27:44 -0000	1.5
***************
*** 85,88 ****
--- 85,93 ----
          line.addChunk(new net.sourceforge.idrs.core.report.FieldChunk(id,field,format,state.getCurrentRepeatLine()));
      }
+     
+     public void error(String val, Attributes atts) throws Exception {
+     	Line line = state.getCurrentLine();
+     	line.addChunk(new net.sourceforge.idrs.core.report.ErrorChunk());
+     }
  
      public void inputResults(String val,Attributes atts) throws Exception {

Index: Db.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Db.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Db.java	22 Aug 2002 20:06:34 -0000	1.4
--- Db.java	9 Sep 2002 21:27:44 -0000	1.5
***************
*** 97,101 ****
--- 97,113 ----
      public void pageSize(String val,Attributes atts) throws Exception {
         db.setIsPaged(true);
+        if (! val.equalsIgnoreCase("<external>")) {
+        	db.setNumRecs(Integer.parseInt(val));
+        }
      
+     }
+     
+     public void transaction(String val, Attributes atts) throws Exception {
+     	if (val.equalsIgnoreCase("begin")) {
+ 	    	db.setTransactionType(DB.TRANS_BEGIN);
+ 	    }
+ 	    else if (val.equalsIgnoreCase("complete")) {
+ 	    	db.setTransactionType(DB.TRANS_COMPLETE);
+ 	    }
      }
      

[Idrs-commit] CVS: Idrs/dev build.xml,1.10,1.11

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev
In directory usw-pr-cvs1:/tmp/cvs-serv10950

Modified Files:
	build.xml 
Log Message:
added transaction support and new form handling

Index: build.xml
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** build.xml	23 Aug 2002 00:40:07 -0000	1.10
--- build.xml	9 Sep 2002 21:27:42 -0000	1.11
***************
*** 56,68 ****
  
  		<!-- Tag the results -->
! 		<cvs package="Idrs" cvsRoot="${cvsroot}" cvsRsh="ssh" command="tag ${tag}" />
  
  		<!-- export results to temp file -->
! 		<cvs package="Idrs" cvsRoot="${cvsroot}" cvsRsh="ssh" tag="${tag}" command="export" dest="${tmp_export}" />
  
  		<!-- for debugging -->
! 		<!--<copy todir="${tmp_export}/Idrs">
! 			<fileset dir="/home/mlb/Idrs"  />
! 		</copy> -->
  
  		<!-- create distribution -->
--- 56,71 ----
  
  		<!-- Tag the results -->
! 		<cvs  cvsRoot="${cvsroot}" cvsRsh="ssh" command="tag ${tag}" />
  
  		<!-- export results to temp file -->
! 		<!--<cvs package="Idrs" cvsRoot="${cvsroot}" cvsRsh="ssh" tag="${tag}" command="export" dest="${tmp_export}" /> -->
  
  		<!-- for debugging -->
! 		<copy todir="${tmp_export}/Idrs">
! 			<fileset dir="/home/mlb/projects/Idrs">
! 				<exclude name="**/CVS" />
! 				<exclude name="dist" />
! 			</fileset>
! 		</copy>
  
  		<!-- create distribution -->
***************
*** 91,96 ****
  		<copy todir="${tmp}/bin/WEB-INF" file="${tmp_export}/Idrs/dev/xml/web.xml" />
  
! 		<copy todir="${tmp}/sql_dir">
! 			<fileset dir="${tmp_export}/Idrs/sql_dir" />
  		</copy>
  
--- 94,99 ----
  		<copy todir="${tmp}/bin/WEB-INF" file="${tmp_export}/Idrs/dev/xml/web.xml" />
  
! 		<copy todir="${tmp}/sql_scripts">
! 			<fileset dir="${tmp_export}/Idrs/sql_scripts" />
  		</copy>
  
***************
*** 102,106 ****
  			<fileset dir="${tmp_export}/Idrs/docs/tutorials" />
  		</copy>
! 		
  		<copy todir="${tmp}">
  			<fileset dir="${tmp_export}/Idrs/docs" includes="**/RML.htm" />
--- 105,109 ----
  			<fileset dir="${tmp_export}/Idrs/docs/tutorials" />
  		</copy>
! 
  		<copy todir="${tmp}">
  			<fileset dir="${tmp_export}/Idrs/docs" includes="**/RML.htm" />
***************
*** 108,121 ****
  
  		<copy todir="${tmp}" file="${tmp_export}/Idrs/README" />
- 		 	
  
! 			
! 		
! 		
  		<!-- copy directory to dist -->
  		<copy todir="${dist}/package-${tag}/idrs-${tag}">
  			<fileset dir="${tmp}" />
  		</copy>
! 		
  		<!-- package the files into distributions -->
  		<tar destfile="${dist}/packages/idrs-${tag}.tar" basedir="${dist}/package-${tag}" />
--- 111,124 ----
  
  		<copy todir="${tmp}" file="${tmp_export}/Idrs/README" />
  
! 
! 
! 
! 
  		<!-- copy directory to dist -->
  		<copy todir="${dist}/package-${tag}/idrs-${tag}">
  			<fileset dir="${tmp}" />
  		</copy>
! 
  		<!-- package the files into distributions -->
  		<tar destfile="${dist}/packages/idrs-${tag}.tar" basedir="${dist}/package-${tag}" />

[Idrs-commit] CVS: Idrs/dev/classes/net/sourceforge/idrs/exceptions PageNotFoundException.class,NONE,1.1

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/classes/net/sourceforge/idrs/exceptions
In directory usw-pr-cvs1:/tmp/cvs-serv10950/classes/net/sourceforge/idrs/exceptions

Added Files:
	PageNotFoundException.class 
Log Message:
added transaction support and new form handling

--- NEW FILE: PageNotFoundException.class ---
Êþº¾





 not found


SourceFile

[Idrs-commit] CVS: Idrs/dev/classes/net/sourceforge/idrs/core/report ErrorChunk.class,NONE,1.1

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/classes/net/sourceforge/idrs/core/report
In directory usw-pr-cvs1:/tmp/cvs-serv10950/classes/net/sourceforge/idrs/core/report

Added Files:
	ErrorChunk.class 
Log Message:
added transaction support and new form handling

--- NEW FILE: ErrorChunk.class ---
Êþº¾
Exceptions
getRequest



SourceFile

[Idrs-commit] CVS: Idrs/dev/bin idrs.jar,1.13,1.14

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/bin
In directory usw-pr-cvs1:/tmp/cvs-serv10950/bin

Modified Files:
	idrs.jar 
Log Message:
added transaction support and new form handling

Index: idrs.jar
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/bin/idrs.jar,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
Binary files /tmp/cvs7fEFJe and /tmp/cvs8p1eli differ

[Idrs-commit] CVS: Idrs/dev/lib idrs.jar,1.13,1.14

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/lib
In directory usw-pr-cvs1:/tmp/cvs-serv6015

Modified Files:
	idrs.jar 
Log Message:



Index: idrs.jar
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/lib/idrs.jar,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
Binary files /tmp/cvsXspEQq and /tmp/cvsexfZYI differ

[Idrs-commit] CVS: Idrs/dev/xml rmlTrans.xml~,NONE,1.1 web.xml,NONE,1.1

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/xml
In directory usw-pr-cvs1:/tmp/cvs-serv4347

Added Files:
	rmlTrans.xml~ web.xml 
Log Message:



--- NEW FILE: rmlTrans.xml~ ---
<?xml version="1.0" encoding="UTF-8"?>
<trans:rmlTrans xmlns:trans="rmlTransSchema.xml">
	<!-- define valid rml tags -->
	<trans:rml simple="true" ownLine="false" >rml</trans:rml>
	<trans:rml simple="true" ownLine="false" represent="isHtml" >ishtml</trans:rml>
	<trans:rml simple="true" ownLine="false">scriptClass</trans:rml>
	<trans:rml simple="false" ownLine="true" >head</trans:rml>
	<trans:rml simple="true" ownLine="true" >object</trans:rml>
	<trans:rml simple="true" ownLine="false" represent="className" >class</trans:rml>	
	<trans:rml simple="true" ownLine="true">constructor</trans:rml>
	<trans:rml simple="true" ownLine="false" represent="varType" >vartype</trans:rml>
	<trans:rml simple="true" ownLine="true">method</trans:rml>
	<trans:rml simple="true" ownLine="false">name</trans:rml>
	<trans:rml simple="true" ownLine="true">db</trans:rml>
	<trans:rml simple="true" ownLine="false">dbDriver</trans:rml>
	<trans:rml simple="true" ownLine="false">dbName</trans:rml>
	<trans:rml simple="true" ownLine="false">dbUser</trans:rml>
	<trans:rml simple="true" ownLine="false">dbPass</trans:rml>
	<trans:rml simple="true" ownLine="false">useDb</trans:rml>
	<trans:rml simple="true" ownLine="false">useMethod</trans:rml>
	<trans:rml simple="true" ownLine="true" represent="SQL" >sql</trans:rml>
	<trans:rml simple="true" ownLine="true">storedProc</trans:rml>
	<trans:rml simple="true" ownLine="true">varlist</trans:rml>
	<trans:rml simple="false" ownLine="true">body</trans:rml>
	<trans:rml simple="true" ownLine="false">field</trans:rml>
	<trans:rml simple="true" ownLine="false">src</trans:rml>
	<trans:rml simple="true" ownLine="true">ifResults</trans:rml>
	<trans:rml simple="false" ownLine="true">yes</trans:rml>
	<trans:rml simple="false" ownLine="true" >no</trans:rml>
	<trans:rml simple="false" ownLine="true">repeat</trans:rml>
	<trans:rml simple="false" ownLine="true">ifChange</trans:rml>
	<trans:rml simple="true" ownLine="false">inputResults</trans:rml>
        <trans:rml simple="true" ownLine="false">setProps</trans:rml>
	
	<!-- text tag -->
	<trans:textTag>text</trans:textTag>
	
	<!-- script tag -->
	<trans:scriptTag>script</trans:scriptTag>
	
	<!-- echo script tag -->
	<trans:echoScriptTag>echoScript</trans:echoScriptTag>
	
	<!-- Script tag char -->
	<trans:scriptChar>$</trans:scriptChar>
	
	<!-- Location of RML Schema -->
	<trans:schemaLocation>rmlSchema.xml</trans:schemaLocation>
	
	<!-- Names Space of RML -->
	<trans:schemaNameSpace>rml</trans:schemaNameSpace>
</trans:rmlTrans>
--- NEW FILE: web.xml ---
<!DOCTYPE web-app
    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

<web-app>
    <servlet>
        <servlet-name>idrs</servlet-name>
        <servlet-class>net.sourceforge.idrs.core.servlet.IDRSServlet</servlet-class>
        
        <!-- The following three parameters define what pooling system to use -->
        <init-param>
            <param-name>reportPool</param-name>
            <param-value>net.sourceforge.idrs.pool.IDRSRepPool</param-value>
        </init-param>
        
        <init-param>
            <param-name>scriptPool</param-name>
            <param-value>net.sourceforge.idrs.pool.ScriptContextPool</param-value>
        </init-param>
        
        
        <init-param>
            <param-name>dbPool</param-name>
            <param-value>net.sourceforge.idrs.pool.JDBCPool</param-value>
        </init-param>
        
        
        
        <!-- Where errrors will be logged to -->        
        <init-param>
            <param-name>errorLog</param-name>
            <param-value>/var/log/servlet/error.log</param-value>
        </init-param>

        <!-- Each RML page will have it's own log file, this is where those logs are stored -->
        <init-param>
            <param-name>reportLogPath</param-name>
            <param-value>/var/log/servlet</param-value>
        </init-param>

        <!-- This is the class that is used for embeded scripting.   
                    This class must implement 
                    net.sourceforge.idrs.script.embedable.IDRSScriptLanguage -->
        <init-param>
            <param-name>scriptClass</param-name>
            <param-value>net.sourceforge.idrs.script.embedable.IDRSBeanShell</param-value>
        </init-param>

        <!-- Minimum Number of Script Conetexts -->
        <init-param>
            <param-name>minReports</param-name>
            <param-value>5</param-value>
        </init-param>
    
        <!-- Maximum number of script contexts -->
        <init-param>
            <param-name>maxReports</param-name>
            <param-value>100</param-value>
        </init-param>


        <!-- Maximum number of days a context is open before it is re-set -->
        <init-param>
            <param-name>daysReportsOpen</param-name>
            <param-value>7</param-value>
        </init-param>

        <!-- The page that will be displayed when a user is denied access to an RML page -->
        <init-param>
            <param-name>accessDeniedPage</param-name>
            <param-value>denied.html</param-value>
        </init-param>
        
        <!-- The page that will be displayed when an Exception occurrs -->
	<init-param>
	            <param-name>errorPage</param-name>
	            <param-value>error.jsp</param-value>
        </init-param>

        <!-- This is the number of variables used in the app.
                    These variables are accessale through the Application object -->
        <init-param>
          <param-name>numVars</param-name>
          <param-value>2</param-value>
        </init-param>
      
        <!-- These variables will be used in various tutorials -->  
        <init-param>
          <param-name>varName1</param-name>
          <param-value>companyOwnerl</param-value>
        </init-param>
        <init-param>
          <param-name>varVal1</param-name>
          <param-value>Jennifer Jennens</param-value>
        </init-param>

        <init-param>
          <param-name>varName2</param-name>
          <param-value>sysAdmin</param-value>
        </init-param>
        <init-param>
          <param-name>varVal2</param-name>
          <param-value>Mack Border</param-value>
        </init-param>        

        <!-- This the physical directory of the IDRS' web application -->
       <init-param>
        <param-name>contextPath</param-name>
        <param-value>/usr/local/tomcat/webapps/idrs</param-value>
      </init-param>

        <!--  This is where you can define any number of database connections.  First give numDBs the value of how many connections there are, and then 
                    repeat the dbDriver,dbName,dbAlias,dbUser,dbPass,minConns, maxConns, logPath and daysOpen with the current db number appended to the
                    name.  For example, if I was connecting to another MySQL database named "idrs2" I would use the following setup
                    .
                    .
                    .
                    <init-param>
                        <param-name>dbName1</param-name>
                        <param-value>jdbc:mysql://localhost/idrs2</param-value>
                    </init-param>
                    .
                    .
                    .

                    Repeat this process for every connection needed.
       -->
       <init-param>
            <param-name>numDBs</param-name>
            <param-value>3</param-value>
       </init-param>
       
       <!-- The name of the class for the driver -->
        <init-param>
            <param-name>dbDriver1</param-name>
            <param-value>org.gjt.mm.mysql.Driver</param-value>
        </init-param>

        <!-- The URL for the database -->
        <init-param>
            <param-name>dbName1</param-name>
            <param-value>jdbc:mysql://localhost/idrs_auth</param-value>
        </init-param>

        <!-- Username for the database -->
        <init-param>
            <param-name>dbUser1</param-name>
            <param-value>root</param-value>
        </init-param>

        <!-- Password for teh database -->
        <init-param>
            <param-name>dbPass1</param-name>
            <param-value></param-value>
        </init-param>

        <!-- The name of the database connection inside of RML pages -->
        <init-param>
            <param-name>dbAlias1</param-name>
            <param-value>idrs-auth</param-value>
        </init-param>
         
        <!-- Minimum number of connections -->
       <init-param>
            <param-name>minConns1</param-name>
            <param-value>1</param-value>
       </init-param>

        <!-- Maximum number of connections -->
        <init-param>
            <param-name>maxConns1</param-name>
            <param-value>15</param-value>
       </init-param>
    
        <!-- Where the log file for this Database connection is -->
       <init-param>
            <param-name>logPath1</param-name>
            <param-value>/var/log/servlet/idrs-auth</param-value>
       </init-param>

        <!-- Number of days the connection will remain open before being reset -->
        <init-param>
            <param-name>daysOpen1</param-name>
            <param-value>1</param-value>
       </init-param>
        
        <!-- If your database forces all column names to lower case (Postgres) , this is nessassary -->
        <init-param>
            <param-name>toLower1</param-name>
            <param-value>false</param-value>
        </init-param>
        
        <!-- The name of the class for the driver -->
        <init-param>
            <param-name>dbDriver2</param-name>
            <param-value>org.gjt.mm.mysql.Driver</param-value>
        </init-param>

        <!-- The URL for the database -->
        <init-param>
            <param-name>dbName2</param-name>
            <param-value>jdbc:mysql://localhost/idrs_docs</param-value>
        </init-param>

        <!-- Username for the database -->
        <init-param>
            <param-name>dbUser2</param-name>
            <param-value>root</param-value>
        </init-param>

        <!-- Password for teh database -->
        <init-param>
            <param-name>dbPass2</param-name>
            <param-value></param-value>
        </init-param>

        <!-- The name of the database connection inside of RML pages -->
        <init-param>
            <param-name>dbAlias2</param-name>
            <param-value>idrs-docs</param-value>
        </init-param>
         
        <!-- Minimum number of connections -->
       <init-param>
            <param-name>minConns2</param-name>
            <param-value>1</param-value>
       </init-param>

        <!-- Maximum number of connections -->
        <init-param>
            <param-name>maxConns2</param-name>
            <param-value>15</param-value>
       </init-param>
    
        <!-- Where the log file for this Database connection is -->
       <init-param>
            <param-name>logPath2</param-name>
            <param-value>/var/log/servlet/idrs-docs</param-value>
       </init-param>

        <!-- Number of days the connection will remain open before being reset -->
        <init-param>
            <param-name>daysOpen2</param-name>
            <param-value>1</param-value>
       </init-param>
        
        <!-- If your database forces all column names to lower case (Postgres) , this is nessassary -->
        <init-param>
            <param-name>toLower2</param-name>
            <param-value>false</param-value>
        </init-param>
        
        <!-- The name of the class for the driver -->
        <init-param>
            <param-name>dbDriver3</param-name>
            <param-value>org.gjt.mm.mysql.Driver</param-value>
        </init-param>

        <!-- The URL for the database -->
        <init-param>
            <param-name>dbName3</param-name>
            <param-value>jdbc:mysql://localhost/idrs_test</param-value>
        </init-param>

        <!-- Username for the database -->
        <init-param>
            <param-name>dbUser3</param-name>
            <param-value>root</param-value>
        </init-param>

        <!-- Password for teh database -->
        <init-param>
            <param-name>dbPass3</param-name>
            <param-value></param-value>
        </init-param>

        <!-- The name of the database connection inside of RML pages -->
        <init-param>
            <param-name>dbAlias3</param-name>
            <param-value>idrs-test</param-value>
        </init-param>
         
        <!-- Minimum number of connections -->
       <init-param>
            <param-name>minConns3</param-name>
            <param-value>1</param-value>
       </init-param>

        <!-- Maximum number of connections -->
        <init-param>
            <param-name>maxConns3</param-name>
            <param-value>15</param-value>
       </init-param>
    
        <!-- Where the log file for this Database connection is -->
       <init-param>
            <param-name>logPath3</param-name>
            <param-value>/var/log/servlet/idrs-test</param-value>
       </init-param>

        <!-- Number of days the connection will remain open before being reset -->
        <init-param>
            <param-name>daysOpen3</param-name>
            <param-value>1</param-value>
       </init-param>
        
        <!-- If your database forces all column names to lower case (Postgres) , this is nessassary -->
        <init-param>
            <param-name>toLower3</param-name>
            <param-value>false</param-value>
        </init-param>
        
        <!-- Determines the connection defined above which will be used for storing the RML pages -->
        <init-param>
        	<param-name>docDB</param-name>
        	<param-value>idrs-docs</param-value>
        </init-param>
        
        <!-- Determines which connection will be used for authentication -->
        <init-param>
        	<param-name>authDB</param-name>
        	<param-value>idrs-auth</param-value>
        </init-param>
        
        
        <!-- Tells the IDRS what port to listen to for reset requests -->
        <init-param>
            <param-name>resetPort</param-name>
            <param-value>8888</param-value>
       </init-param>

        <!-- The IDRS allows for reset request to come from only one host,
                    This host must be either a host name or an IP address -->
        <init-param>
            <param-name>resetAllowedHost</param-name>
            <param-value>127.0.0.1</param-value>
       </init-param>
    </servlet>

    <servlet>
        <servlet-name>idrsDeploy</servlet-name>
        <servlet-class>net.sourceforge.idrs.deploy.HotDeploy</servlet-class>

        <!-- The number of servers that need to be reset -->
        <init-param>
            <param-name>numServers</param-name>
            <param-value>1</param-value>
        </init-param>

        <!-- Each server should be defined with a server tag and the number of the server.  Note
                    that each server must accept reset requests from the app's host -->
        <init-param>
            <param-name>server1</param-name>
            <param-value>127.0.0.1</param-value>
        </init-param>

        <!-- This tells the deployer what port the IDRS servers are listening to for reset requests -->
        <init-param>
            <param-name>port</param-name>
            <param-value>8888</param-value>
        </init-param>

        <!-- Where the log for the deployments is -->
        <init-param>
            <param-name>logPath</param-name>
            <param-value>/var/log/idrs/deploy.log</param-value>
        </init-param>

        <!-- The class of the database's driver -->
        <init-param>
            <param-name>dbClass</param-name>
            <param-value>org.gjt.mm.mysql.Driver</param-value>
        </init-param>        

        <!-- The url of the database -->
        <init-param>
            <param-name>dbUrl</param-name>
            <param-value>jdbc:mysql://localhost/idrs_docs</param-value>
        </init-param>        
        
        <!-- The User of the database -->
        <init-param>
            <param-name>dbUser</param-name>
            <param-value>root</param-value>
        </init-param>        

        <!-- Password for database -->
        <init-param>
            <param-name>dbPass</param-name>
            <param-value></param-value>
        </init-param>
        
        <!-- Macro to XML Parsing Schema -->
        <init-param>
        	<param-name>parseClass</param-name>
        	<param-value>org.apache.xerces.parsers.SAXParser</param-value>
        </init-param>
        
        <!-- RML Schema -->
        <init-param>
        	<param-name>schemaLocation</param-name>
        	<param-value>/usr/local/tomcat/webapps/idrs/WEB-INF/rmlSchema.xml</param-value>
        </init-param>
        
        <!-- RML Transofrmation Schema -->
        <init-param>
        	<param-name>rmlTrans</param-name>
        	<param-value>/usr/local/tomcat/webapps/idrs/WEB-INF/rmlTrans.xml</param-value>
        </init-param>
        
        
    </servlet>


    <servlet-mapping>
        <servlet-name>idrs</servlet-name>
        <url-pattern>*.rml</url-pattern>
    </servlet-mapping>

    <servlet-mapping>
        <servlet-name>idrsDeploy</servlet-name>
        <url-pattern>/idrsDeploy</url-pattern>
    </servlet-mapping>
    
    <mime-mapping>
        <extension>
            rml
        </extension>
        <mime-type>
            text/plain
        </mime-type>
    </mime-mapping>


    
    
   
    

</web-app>

[Idrs-commit] CVS: Idrs/dev buildDistro,NONE,1.1 build.xml,1.9,1.10

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev
In directory usw-pr-cvs1:/tmp/cvs-serv2641

Modified Files:
	build.xml 
Added Files:
	buildDistro 
Log Message:
fixed build.xml

--- NEW FILE: buildDistro ---
#! /bin/bash

#Creates a distribution
ant dist -Dbuild.compiler=jikes -Dtag=$1 -Dmess=$2
Index: build.xml
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** build.xml	22 Aug 2002 20:06:16 -0000	1.9
--- build.xml	23 Aug 2002 00:40:07 -0000	1.10
***************
*** 9,13 ****
  		<property name="docsdir" value="docs"/>
  		<property name="dist" value="../dist" />
! 		<property name="cvsroot" value=":d:ext:idrs.sourceforge.net:/usr/local/cvs" />
  		<property name="tmp" value="/tmp/tmp_idrs" />
  		<property name="tmp_export" value="/tmp/tmp_export" />
--- 9,13 ----
  		<property name="docsdir" value="docs"/>
  		<property name="dist" value="../dist" />
! 		<property name="cvsroot" value=":ext:big...@cv...:/cvsroot/idrs" />
  		<property name="tmp" value="/tmp/tmp_idrs" />
  		<property name="tmp_export" value="/tmp/tmp_export" />
***************
*** 19,23 ****
  				<pathelement location="${lib}/servlet.jar"/>
  				<pathelement location="${lib}/xerces.jar"/>
! 				<pathelement location="${lib}/xalan.jar"/>
  				<pathelement location="${lib}/jython.jar"/>
  				<pathelement location="${lib}/bsh-core-1.2b3.jar"/>
--- 19,23 ----
  				<pathelement location="${lib}/servlet.jar"/>
  				<pathelement location="${lib}/xerces.jar"/>
! 				<pathelement location="${lib}/xerces.jar"/>
  				<pathelement location="${lib}/jython.jar"/>
  				<pathelement location="${lib}/bsh-core-1.2b3.jar"/>
***************
*** 35,41 ****
  		<copy file="${jars}/idrs.jar" todir="${lib}"/>
  	</target>
! 	
  	<target depends="init,build,jar" description="performs both a build and jar" name="build-jar"/>
! 	
  	<target depends="init" description="executes javadoc on the sources in src and places the docs in docs" name="doc">
  	   <mkdir dir="tmp"/>
--- 35,41 ----
  		<copy file="${jars}/idrs.jar" todir="${lib}"/>
  	</target>
! 
  	<target depends="init,build,jar" description="performs both a build and jar" name="build-jar"/>
! 
  	<target depends="init" description="executes javadoc on the sources in src and places the docs in docs" name="doc">
  	   <mkdir dir="tmp"/>
***************
*** 43,69 ****
  			<fileset dir="src"/>
  	   </copy>
! 		<javadoc Private="true" author="true" destdir="${docsdir}" packagenames="net.sourceforge.idrs.*" sourcepath="tmp">
  		</javadoc>
  		<delete dir="tmp"/>
  	</target>
! 	
  	<target depends="init,build,jar" description="Commits all files to CVS, perform an export copy all documentation and package the the distro" name="dist">
  		<mkdir dir="${tmp}" />
  		<mkdir dir="${tmp_export}" />
! 		
  		<!-- Commit all changes -->
  		<!--<cvs package="Idrs" cvsRoot="${cvsroot}" cvsRsh="ssh" command="commit -m ${mess}" />-->
! 		
  		<!-- Tag the results -->
! 		<!--<cvs package="Idrs" cvsRoot="${cvsroot}" cvsRsh="ssh" command="tag ${tag}" />-->
! 		
  		<!-- export results to temp file -->
! 		<!--<cvs package="Idrs" cvsRoot="${cvsroot}" cvsRsh="ssh" tag="${tag}" command="export" dest="tmp_export" />-->
! 		
  		<!-- for debugging -->
! 		<copy todir="${tmp_export}/Idrs">
  			<fileset dir="/home/mlb/Idrs"  />
! 		</copy>
! 		
  		<!-- create distribution -->
  		<copy todir="${tmp}/dev">
--- 43,69 ----
  			<fileset dir="src"/>
  	   </copy>
! 		<javadoc classpath="${lib}/servlet.jar:${lib}/xerces.jar:${lib}/xerces.jar:${lib}/jython.jar:${lib}/bsh-core-1.2b3.jar:${lib}/commons-pool.jar" Private="true" author="true" destdir="${docsdir}" packagenames="net.sourceforge.idrs.*" sourcepath="tmp">
  		</javadoc>
  		<delete dir="tmp"/>
  	</target>
! 
  	<target depends="init,build,jar" description="Commits all files to CVS, perform an export copy all documentation and package the the distro" name="dist">
  		<mkdir dir="${tmp}" />
  		<mkdir dir="${tmp_export}" />
! 
  		<!-- Commit all changes -->
  		<!--<cvs package="Idrs" cvsRoot="${cvsroot}" cvsRsh="ssh" command="commit -m ${mess}" />-->
! 
  		<!-- Tag the results -->
! 		<cvs package="Idrs" cvsRoot="${cvsroot}" cvsRsh="ssh" command="tag ${tag}" />
! 
  		<!-- export results to temp file -->
! 		<cvs package="Idrs" cvsRoot="${cvsroot}" cvsRsh="ssh" tag="${tag}" command="export" dest="${tmp_export}" />
! 
  		<!-- for debugging -->
! 		<!--<copy todir="${tmp_export}/Idrs">
  			<fileset dir="/home/mlb/Idrs"  />
! 		</copy> -->
! 
  		<!-- create distribution -->
  		<copy todir="${tmp}/dev">
***************
*** 73,77 ****
  			</fileset>
  		</copy>
! 		
  		<!-- create the "dist" directory with the default WEB-INF -->
  		<mkdir dir="${tmp}/bin" />
--- 73,77 ----
  			</fileset>
  		</copy>
! 
  		<!-- create the "dist" directory with the default WEB-INF -->
  		<mkdir dir="${tmp}/bin" />
***************
*** 79,83 ****
  		<mkdir dir="${tmp}/bin/WEB-INF/xml" />
  		<mkdir dir="${tmp}/bin/WEB-INF/lib" />
! 		
  		<copy todir="${tmp}/bin/WEB-INF/lib">
  			<fileset dir="${tmp_export}/Idrs/dev/lib" includes="*.jar" />
--- 79,83 ----
  		<mkdir dir="${tmp}/bin/WEB-INF/xml" />
  		<mkdir dir="${tmp}/bin/WEB-INF/lib" />
! 
  		<copy todir="${tmp}/bin/WEB-INF/lib">
  			<fileset dir="${tmp_export}/Idrs/dev/lib" includes="*.jar" />
***************
*** 86,102 ****
  		<copy todir="${tmp}/bin/WEB-INF/xml">
  			<fileset dir="${tmp_export}/Idrs/dev/xml" includes="**/*.xml"   excludes="**/web.xml" />
! 			
  		</copy>
! 		
  		<copy todir="${tmp}/bin/WEB-INF" file="${tmp_export}/Idrs/dev/xml/web.xml" />
! 		
! 		<copy todir="${tmp}/sql">
! 			<fileset dir="${tmp_export}/Idrs/sql" />
  		</copy>
! 		
  		<copy todir="${tmp}/dev/docs">
  			<fileset dir="${docsdir}" />
  		</copy>
! 		
  		<copy todir="${tmp}/tutorials">
  			<fileset dir="${tmp_export}/Idrs/docs/tutorials" />
--- 86,102 ----
  		<copy todir="${tmp}/bin/WEB-INF/xml">
  			<fileset dir="${tmp_export}/Idrs/dev/xml" includes="**/*.xml"   excludes="**/web.xml" />
! 
  		</copy>
! 
  		<copy todir="${tmp}/bin/WEB-INF" file="${tmp_export}/Idrs/dev/xml/web.xml" />
! 
! 		<copy todir="${tmp}/sql_dir">
! 			<fileset dir="${tmp_export}/Idrs/sql_dir" />
  		</copy>
! 
  		<copy todir="${tmp}/dev/docs">
  			<fileset dir="${docsdir}" />
  		</copy>
! 
  		<copy todir="${tmp}/tutorials">
  			<fileset dir="${tmp_export}/Idrs/docs/tutorials" />
***************
*** 122,125 ****
--- 122,127 ----
  		<gzip  src="${dist}/packages/idrs-${tag}.tar" zipfile="${dist}/packages/idrs-${tag}.tar.gz" />
  		<zip destfile="${dist}/packages/idrs-${tag}.zip" basedir="${dist}/package-${tag}" />
+ 		<delete dir="${tmp}" />
+ 		<delete dir="${tmp_export}" />
  	</target>
  		

[Idrs-commit] CVS: Idrs/sql_scripts mysql_auth.sql,NONE,1.1 mysql_docs.sql,NONE,1.1

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/sql_scripts
In directory usw-pr-cvs1:/tmp/cvs-serv8412/sql_scripts

Added Files:
	mysql_auth.sql mysql_docs.sql 
Log Message:
Synched Development

--- NEW FILE: mysql_auth.sql ---

CREATE TABLE `tblUser` (
  `UserID` int(11) NOT NULL default '0',
  `Username` varchar(100) default NULL,
  `Password` varchar(100) default NULL,
  `GroupID` varchar(50) default NULL,
  PRIMARY KEY  (`UserID`)
) ;

CREATE TABLE `tblGroups` (
 `GroupID` int(11) NOT NULL auto_increment,
 `GroupName` varchar(20) default NULL,
  PRIMARY KEY  (`GroupID`)
);


--- NEW FILE: mysql_docs.sql ---
CREATE TABLE `tblDoc` (
  `DocID` int(11) NOT NULL auto_increment,
  `DocName` varchar(20) default NULL,
  `DocSrc` blob,
  `DocGroups` varchar(50) default NULL,
  `DocParams` text,
  `DocConns` varchar(70) default NULL,
  `DocMin` int(11) default NULL,
  `DocMax` int(11) default NULL,
  PRIMARY KEY  (`DocID`)
);

[Idrs-commit] CVS: Idrs/sql_scripts - New directory

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/sql_scripts
In directory usw-pr-cvs1:/tmp/cvs-serv8215/sql_scripts

Log Message:
Directory /cvsroot/idrs/Idrs/sql_scripts added to the repository

[Idrs-commit] CVS: Idrs/dev/lib commons-pool.jar,NONE,1.1

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/lib
In directory usw-pr-cvs1:/tmp/cvs-serv7700

Added Files:
	commons-pool.jar 
Log Message:
Synched Development

--- NEW FILE: commons-pool.jar ---
PK

Â0DïüC~ Á‚§ÞT<è¥Ðû’l4Ðì†tEý{۞Š^<óxÃ\€RÄQluLL­iÜF«ãKæl¯±5\o
ø;:Ï93®0Zu}ŠÉƒÌp¸¶f· ¦ã(O¨hNü ° Z*‚`°û÷đL{[×huÎeÀŒ$ÿ›¾·×~tëR«PK%ÝÛŽ





M·MÓ¶<ͱmC“¦ch×®Ôç$]2Q²7µü¡ð¥N<gҒþ9ÃemQ¢ß9Öû±–ýH\ý]»ÞW‘Æž
+*–T°¯¢„²Š–T.‹R«÷Òa3»\ºù?­êEÞ-ƒ{žð2?ócˆÖ‚Š¿=ô¦ž/L†¬>v]a…Œ·Ò0¤‚éßN˗ŠMÐЀæAÕN{.è
VC[„VºgI«>ð(6žÁ‡3DG3D/ˆÍÂ\ÒÄ1Ǘ§³ð_þB3섑ib°‰màPKçb³g

^+XP‹óm~­,D^ ÁÝé’kíÈpnÙ´\š+tw7¥ýøí¦¹]så¯rlšÊ	t]YsçìœS­:»4¶r8¶ Ýí*­ëôû˛VYùŠ®U‘9éîJ²Ý±|¿…m»öÜ*—­š@OÑÞ®,T›—Õ†½ÅŠ æj`·HVûœZ\7K®Sý[ ûÌ©ndÍ-³´)³%§RqìZvËqÊÙy†çVßȒ;
6òú»¹Ùj®<S·Z¦ræ[Yaòö	H«wO9'O†òO”ªÒt%/¸6”njvx2Æð@Ã︬á\×ð'®j(r÷/¤5˜,«<Vâ±5¾“<6†u
—xì
Ë O\cƒ!ž5X2,Ã<1ÂKFù.‹F[ûúÐñ·ÌîÿԒoÌ3[6íð™ÒßÿPðÓîÿ¼â
ëì±J9¨bÊA­ÓŽÖ+íh©êÿNaJ5«K¾U–:þWÿ"Cé%:Õ
*èю(Ÿ1½¢|Ì~¤“ö#¶é¼ýh„1ÆápÝHȍ†}úPŒ“ÿnÞ¤Þ ºpŠâ9#“T£ÝI5¡ëF$²‡¶þŠ‰;!qŸˆÅQ#3ì!FM¡¦R‹SKPk§¦Që ÖI­ëˆÏÝÐçJèÓcdú¾™ø^\& F1E@*Útýý†GSƒGÖë1]9–˜hÈ fÐcM2L6dˆf`]=–xï葻(þcì!i$Õ:NûzÆ ¬Ž³F´Žn#R‡Î’bé	¦Î±:ÎÓ=
]0h ×ÐcŒ÷1Š2ÜÏ°®0­«ŒëÌ§âŒëí̧4Æ3„ïoî!~
77…$Ý
ãŸÐ÷Úð(ƒGÖyzdîQ.œ=òõÈÏ#7¼<ôì¡ÿ}èv›4AqœþYÜBü+PKNá"‹
–kdKS&5ߚáŽk[¥Ú^³ár[§Fzj÷Çë%YµSêŽÃVª»À^Yѝ9ï«¡á×6
9ºXôfFèOGCh@Ü€4]OÓ=!­Ò>] ’qZ] OFú\l,ƞ# „“žCŽí ¸¸¦šqâ'ÐCЁW@ÇÐÄèdz΁åW@³Ø3HO1&M–‘ß(ã²øË4@Ÿ´,†åm¨„¸ýÄúû¾ßûÛÏý6ýeª ‹8JPí~ßRi‡¥ÊHŠ hˆx9Dh­TʉÝzZrŒGß¹Î'SA{
iÝXõEÚ÷¢‡´'µNÍOÕc¿T÷9Yõ	’ìoˆ§¯º}—çq½vä~¨×<ÚÏR}¯3A4Ñ<ˆªÌU«–gi?Ì°¹÷:Å°Eq»‰ØQ¯ì
¼G™|Š{I‹BڈŽÞýù;<,ïÓÀûhuàû$Âôý€Öô/vœÞƙ]/Hü¾øPKýëqTŒ
?Âvsi6»qw(~+Zŏ'_¨3Ìð yá…Àê8âèŒÃè‹3¼è?à›3þŒçî&mcÃCI§çœû;÷ì9çÞÝßîÿ#‚èÁg1t ?ŠÍØ!ÉÎ(°+†§°[’”‚=ÙÃÓØ'É~Iž‰aC’ÇÈéÀürDÁÁF1E3ž“ži	–Ò‰mÄ8ž—ËcR:îi¥4!ÉÞrÞãD'ñ¢$/)8¥à¯2Ä2šjjÂ0D–bˆ¸9ÝéècèK[öTR-¨ZN$5+Ÿ·L'Y°,#©çFò0…­kG'Ï
Í'xCôø´é愫kg¯nêî>†þÄruž`
[YAQüì‚	‰í¢ÉÐ8%Ü#Åü„p\Çӌrt#ɑ@'ÇlUðG§¨“Ð8² `«Ïª%5i¨æTrä‚&
®n™g0¥ Ç¡ã,Ç9<ÉaÀT`q$òº¼]Â6h·¡å=K‡/NèyJVÍÆUݦDê¢|Ô$ïaCuá(p9Š(qœÇiŽ’LËT.â
Ž7ñ–‚·9ÞÁ»ïa+ÇûRú@’Køã#Ì(ø˜ã\æø—–™øHI×\‹ÒR楦…úù†-б¢iª“Õ¹wy[1l̸TŠ!ážÂô¶£ÎP<ç°n:UÕì>‘³…JóºB+Ú¶0ÝêzM¢3ý+Ë°cQ ™JŒÉ!
g
Þ®;ëÍ¥fÑQðöw’ÃEÛ±lùLiÝ<'²iÝq)\ÿC¸Qug$_p§½¥srô‹Þ€{Ö$W„ý‰Ñ·ɬÃ)ÁÔÃ{Óáʩθ-JºU¤Â‡5Ãr(͆Â<T[d¿{jÚs|ÚqEž¡¹Újnµ“ôðcò’ñ枡-“×ýŽËtF³†Xl±EÞ*Éí3gT9ƒT½äo9K2ŠŸÒAßA¶¿¤E
ÒR/ížeE£‘Ëґµ­éê
hM,*‡leÆ%Ó9Ý*(‚^R]Qõ\U ƒ^ƒ¬¤Dõì" npšu³rý{Ñy¡ƒ2Ja|«nŽj®N:rút ¦	Ý@;½h:ÀðÉ+@‹¼?	ë‚ü…è¿ÛhÝCRÙˆ¯êú¬«û]Á[ހÿëE²bØBfŒx¤+4¯§wIUHQàýÍÒev/:Øu“°P<ô³n"4ýRFc*L<¾3‡ðɊf‘2©°çŽ‡+
·e%Öý
Ú*ȼ"vé26wߟÅb+êš"ô\+”2ÛBF«f±é¶eÒ5ý„æTÃZâ
7±Zø&k¾¼ŠvR¶ú˵R·î;<@¿§¢eüê+âWðCp Zkµž1@6}©…h«Un!©Æ%[£WP¨E
`Û)Æƺ1bu’ë­c¹ÞËcÓëKÖiU®Ýÿ+ö:ʼnÇùjo‚WîocÝ_C‘¼(š°‘þ@C¶» àOüƒ¡°
½/êFÒJ‡êàø\ùñ~ϵË`Uëòú(Tª4j¬Â0R
A¼§£‚˜’óŸtÿ™!ã®}cÈîE'ŠÄ­è.çVÝrÙ_;·r&›îfM¼¦ßR2Va(»kÏ'õ4Lgöñõ›ZGI—	F,Œb̂1†ÿKêÍÐ;Š¥ñäèÌ^íÙ¸'ö¹¼’^(5¯÷•áýGO3°H·ÑÃ0ÝÙ¬ ¥‰µåô¦¥:I]‰Þ3RK°?`¶Á»º…~4UL©i¢†H‡j¦šúÊ<BNô&…¦Ò¤‚(?Ýl:EŠiŽ!ÊN?QJ‰
ŠÈ’®ˆ.2‚u¶ÑANðò¢¬{G·³Ô>¸ßâ]ê^@.¹øü»hÜ&¶|Ə„Æ=PKAU‡µ

rïΤǒã‚ÔX:­gw§´\NÏ	òD'G󙬠5ýGÔGóCÉI=—×&§hIÆï‹öÅ£÷îë<88ÝïîŒõ]‚VB"6¦ó‡´TAwph	ª[°½«§÷ÝL‹EíèfÒ
A5{¢Ý{†â½÷Æc{z¢Pcš"¨¶œÖ¹{(vÔ&¹@&ÓûûîŒ
Aà~Aõz(:8ïï‹wõÀ
ï³!D‡@XCax_¬'j¹­D‰õFã]Ñ¡á(›s(&͈ìŒ÷Æzzbƒ‚6Y{ûöJIƒñсŠÍ|b‡ ëJÆÇLa]¦JC‘%R‰Oj'c‰”ŽLàiçh>y\7ñÃZ2‰Ÿ˜ÐÓѓZ!—×¼#“ÆåÅó¸åþtW&›Íœ˜_èùBôUr=<‘Lé†ü
ñ<£KϟÐ!Žcr
é\o2•J"âéÂä˜rôlÙAñɤÁ¢1ÄqŒY|J|*“IõjSžµãZ{!ŸLµïÓr@vòÊ
=ÉNssO&;Þ®Mi£zûhfr!ˆ1•Ò¥º\ûîB6—ɲžždú¨ž`¶öŽ&]#Õ¨ñ|&¯¥,gùŒ¥qL%>¦q:œt“.6¥ýný”ž8€ë1²¦Ûàê`	º•Q·/)!99•jß«#“£Rš!…en1¢Ü»’édþA·´,ǖm‡9wg8VnY–e¾Qg¤ò[—¥5Ƭ‘å±vígæ]Ëe¾ï>fïX.»´üöesÚ;
þý±ýR†:®ç{çˁ£e[È\ÒÙ"Í­ÇÖa»

&ùúÜdgK³ûMF­
j¬/W†r¶ì/Ûf–ª\Ù¢”¡ŠR)(ÆÕ¹…xg‹<Û<ƒU«æ·Z˜ ï¹z¹
殹%
r¦t-+o"ýv2Ìà„ëJå×X‡²åáØÍʛµÌÛj³Í^LÊä̘ë¶*»7¡)ŒÇÒc¼-åçÌg“éñ•ÎÒÇTÑE¯QÅn:¡Š=ôzUDyÙMoPÅ^ûcÜ~žÝ
ؾ¦Ò[€£·2xôv w0õÞÅà4ÞÍ[Þó÷Òªt†Þ§ÒÃ<{?að(ý‘J ¢{˜72†çnïWv¼0©§ó¥@¶.<IWalLǍÔÙ4
AUôˆ^Ü/ә|0«fÆÓÉWë‰íªè§oá@†ՋžeA7.ã!Fiý5D6æX:Æ¡‰¬®%? ŠAúœ*†èkqP‡pb˜/ã)ú„JgP¤•>IŸRé³ØJs¾Ìà2S¿ÄÔ/ЌGÜ«Šº¤Šû諪x¥¸_ˆW©".Ú»ûmûêà¼Oû2ƒ…щhJ_p›«Ë®<×Çõ¬*4:ïGT1
ãpî„*t>ªN3hÑ*÷g³…)\v™Àf¶!SÈO 6#:‚c™l0‰Äf¤‰ª㪘 çU‘ªâ(=®l^lI–*R؄pÿ„*&EÚ#2ª˜‡UqŒ­ÉÒ¬JγcìÃc쾝WE3z–ÎÔEá<˜×òz™±ë·å‚ZVj)¾éSAÍjpê	¢s÷¡Qâê	ªôË^ê‚}Œ^붵.ÅÕ¥åôE»·^õ±.ßY~‰FÉ*ëî×ØvôžRËï)ý(P+›|µ²ÇoºFG_¿TC¿îjýüÊ?ÜÚԔžN
·,.´‹k¯Q±ð²4¢?Yšªä3fÁ›aɽz÷yKֆr‘8rš*)üêîÑôIö¸éœÍWT$ëò¢š&ÇNu¦pïîQ-=ª§*ö
žÂÕM"ÅGÙ,²¾Ü<ˆ€S…¼<ÃËyèì^f‡–H,ñ ¢½ªÊâÇõîd–Ërå#X¡$Í÷‚vüê=)ÝIí¨n¹dÿò®ÃþYwž‘î:nXWkgý*Y,PT,Vaw2Q†x™mw£SZ.W!leažÍœ²ÖJW“?ûê-oÊê3ñ°¨v1GIë'Áï6.Ù;¡åú$ʙÃKɸHóžÂ×hË*’„6Rš2$hŠ6P€ŽÓ	ÌOò¿·Ð)¬_]¶þ
¬³lý[X?D¯)­_‹õë¬{
ÿïÐëKkôÇô»ô†
}¿·`ýÆë7-àÿý2}€õ›Ëèrr—…¹“-9¢×’#Ú-9¢ã’ã;Íñ]æxÚÜ÷n“ï=æ=˜цÉñasý~sß#或LŽèÊ0¶À¦³ôà‡°ÚBÕ°Žhm¨µFq֑¨Qî:r8fÈuŒ%;K›pð¿úlµ†/’ŸŸ‚ϋχ¯
ŸŠo%¾Uøª+äœ3ål6å4„Z×_Uñ´É°	nŒõ`hªw.¹ÿÃeGSŒ£ûýn¿Ç–ã#e<óüî%4|´Lƒw^Ë÷+¶38D®¡c{h†jB5Ê%Z-aml—hMÈy‰êBŽKägPÏ Á ­
¹/Q
xäá¼Þ9¿ûz¨òc¸"Ê„—‚l‰Èj<AGáÞ)ü>yã›Eƒh€c·ˆv±cQîürG^
Ò7é[f
…‚ P|*w1ÖÌ´)5Èö_mÐRØ`ìyÔعé-]…!ÉÃùæ$Ÿï÷ä$¹¹½¸Bûxñe¢DŽ‰Z‰Î^¨òR•mŽÇ+Ž×»F÷§ô“xtÊà}ŽG=O¥ÿ+ðü¸ß¼aGÞW*ò(
¾~Қ>2Xݾ<éDA0=ÖfX톃0iª”0¡Ðâ¡ê?1äÜú7†|3þ¸mÕÜvªï܌£•é}VS:êCfWj3ýQ “@!oÝúƒ!3³âèýìgeá1ªª<±`aÕÂ#¬Y°±Æ°÷PPØF^'‘þïÅ`z5YðÖüûÛÇò¯ô"9èé-êÿ_SÛ±C?˜	†2ý†yõü
l$b/Ãì
uP
êªÑlÜæq[3
!Ô+؇!ûƒñ’‚—ñªŒ×À¯ã‚Ã8¢à(Ž1¬È‘UؤÝH+ؐLXfBíÓy›fìæ‘6Ͳâ
ÞHoáÖilM¹#vk1Ê]Å;U-AyåÔ*ÍA4èªeqKÆÛ
ÞÁqï"¡à=ANˆÌÞÇI§ð‚ñ‘Œ㴂3"Ì8&È'
>Å2g…á3A>Ç9_ऌ/œÇˆ‚a¨ŸNFƒZØ6)^yBšyóœG†â›ª®¤aˆ­Í}w[aA¯Mµ‘Û{97Òkҙ¨Õ®éºFÅZ¦„ÐMp•Ú¤ œL$¸agÇs**Ûnõ¢F˜aéœÇ©€+ZDÅæ÷ŠˆÚUÒÌvܓ¶¦›T+JJòŸu›’æZÚ~Êϓž+Šç}y·š«
”֓АÖQÜÓÀ*w”šþlڞ°nZ”›U­¾ÏN÷/]@n#=˜º©Î±Ñ’.êx†%·Ûrº¯¯h¾Ï}^g‚jf’*"?>!N*ŒmC–Íct‚Ù ²ÊÖ%Õ"nÕt?2”õÆ4§ÖĂ͝OvÎKð˜9Èŵl›¶ª;•a³¨ž]ªè‰!†•w¼JÓ.j[`;{°Ù™%ÊqPՓ„VœkŸ–ß;$õA„n™„9”mÍ¥9N%Ç9Q/ȚÕ‹Û„Q’ë$©

{mï‰jÎ&‘‚VÕU›gW+ŠÓ}6ESHj‘IŠÿ-7·×È<F:ybÒU@ 7ýÛU;JªöY¢©7Un"暎…ôü¯
ãà
'¿Ö“’Z™ž1xÏJõ¬úʍo
­Ã#ðÆP@Ë.`kõ
‡±„XQGfjÍf^Ŭ×Oß1Ñ¥—ÂbV=Âþ$¿‚ÉxvÝAK±ßI˜3Ì~ Vr¥!ï8æú½£x€;3ü§Îb'ç‰áŽQ”¹#—³Ñͯž~‡.L
c
g½„naOf}’õ¤XOȗb]ŽîáaÖäªõÝùˆîZ_
ËC
­^~‹u±b3n£Ä7Œ¿oQ/qá4öÌÒÿJ"ƒ©Ügn8RRÌ®¦s©¸÷¬¸ój_²¥q(Ÿ•ä—xÎÝõËéú+$î/¼’-;×ðnªÈ¢DIÉbÞ%xQ‚rú‚ºj•ºŒ¿ØZ¶
2ëbýl€xœd‡‰ÿÌ®³?ˆ#ù¥ù¥EÒ
©–ü¤óÒyš’.J_Ә:D¼ÜešªŽšF4UÀ‰¼ò2‡]yÑáeG3ã£ã¨2Ç8~1ÓyۉΣ?¥ô>ýT:Àõˆo¥÷ðWÀþPKoâžâÛ
2&dLªˆc<†k‚L	ò™ Ÿà´
ý	ª`MDz¥U¨~Ø!œÅ9ÊX„-RX‘ØUVV«ˆš˜`$D~FìâäsÇk!¾ÄN†‚wòÝ,ýqñ~‰DúÜsÈÒJ3ý+U‚ø𣏕㏼1ÑkIÃ8„ý…‚F‰/>v…ðJx¤‰Ý¦;„&¢“á‘ä#rME†Gõa©OúӏU-ñRÑ¡H£M$’iî¤N¯¢ç†¾ŠÞ>é¯&bÃâ}‘×ýÑøß#üG†#Ï(—P[4é"ý.¾Åwoä
#íy2ïŠ)AOƒyŽ¶»D„òÓ ïÛwô*5BôýlÐOÝw´—º¿'ÈoC¤4AbãÿþñaûŸ‘›Ý´:‡½‡ð19ö;{€¸ˆ»“j?йGþä;Å!KÅú&)ÊDÜßd˜l’…þ¹î5|í9I¿aßüPKx´¸=÷
ÁSeLîø߁Ôðœb2Áä½@Dûñ †a„5D™Ä˜œd2ʾ}SÁkø.N´V£¦ž˜Sñ¢†ïaLÃ÷±T¶³îɚrFæ9&I€—¨ªÒÊëøª.cÆh11;”–™5+*~ˆÓ®â
ˈkø~¬áW˜”˜·ÊÙí«ˆÓé#EIäkýk*^Ö°ŽŸªø™†Wð’†i$4\Ç
Þ<?ç`¿À/UüJïYá7¸!нñ‰ŽϜ‘4j_Õð[üNÅk~©áuü͗0²¦žÊ|Ìù#AãK¦
f*›0}ÖXé÷	4øγôO´;†$›O!.°¿ÇtZÎèiB۔5¨í¶ß¸àÓóÒ§§óRO.øìyÀÿYàðÍJ%•É9¯gíˆKG x3›ãzAnÒ>ø‹±VÓEM#ÐV}éqɵ)°Mfż¬;W®hZÃætèVïʹ=U
}N–ÇÀ6.‚µÌp§œŸ	’ÍëéT²Fög·HN/êü¶$eÁÌå³RH=Σ9W,ÌÒܞ“£O{9g»½$'ÜRÇà© uºî:õˆÃ'›ŽÍ\
–•çÈ^Õ1kGӌ’mÊˌaý®H»ëhZîªs<”-fØ	UùîÚR àe÷Nã%jäåPÅgÛF¨("ÕD8MXÑ`¨{-‹9Pž5UeϳWÏPºMz.'³IóìÜ<Ní^%Ÿ{èçðæÒÐùuÙ ÞµUìqÜF*Çè‹iÍèÁq„i}R4`ˆÎ'jÎ÷Cái̟<­•f²µF5æ¬'uÄÒo'4̉ŽÒi'ñ­Z@܀hs««hXÿa­1Gki5Ðêµ´öÔ+=T£äª*õÔ);J¤ÂžÜ`›{®ªÆDEÃvC=õN9i’+´NV¡Ä
™4ÚÜ+Pê
™ºVÐÌÄÃo Èâžçáns/Béaµ½Ê%¨*ö²þ:´ÉU´°«ÊÖkG¾
“8M9sä¿¢	´¾*¢kh–°íZc¢÷
Ž­£•ìÚb½$qÓ?õŠNË"#N	í–Io	´ó×±}ÒµŠNf·+˜¼’¤¬áëWi5]w;ÈñÎë|®aW¢"tݖü2¶YüÐv»Àš•)¾<G°ÒÛÞ¯TÂíRJØ£L9ACW	ÐÄéÇ«›.õ°U$4èÊïÃ#ö•E›såؾ)»f'p{9pÏâÅÿ Š“›c9Æ^Ñn]Å:ïsa™,Y®^Bwo¨߄
à”`Èñp{ÅâfЈ[U¬’G/•t’Y&Tæñ$.lÀIàQBÏ.Jn+n¤FráYrjvjKqsU¬;âÄ6—tWM2”ÁRÔµs-YÓJwXk=×å£ó¤Á=ÓQó›[QÙ¶Û²™®t~˜lØï¶)áMkx³Àð"ZTd·ú6zm<÷¯¿Û­déäi)7}9
ª®”‡$ü”Uê(Ëô:‡b‹Øi¡Þ»†€€ó ý
ƒåoÖó‘êþ¤­¾EHâ‡Ø
íÖÈê˜S+ÛfÕsš¯¦;͝‚¹gVwe¡ê4Žíö§^x$_ÉÚ
ÕØay녬zK!5#šµlË»+p{$ŽÁèº@rÑ©I?Ù¢co[;Zɶes±nº®¤eº±¼/d¬Æ^½ð@R«ð!Ç.Ãá
‚u݉•µÄèt<´Xfx6.¼¹ÉøL\<Xù\l:̾ð?ør©xdªMiz’§
äGF/w<ݼ
“˜Óð#nhø	ŸiøŸh¨póŒj0Y¶¸¯Ê}5®Iî›Ä¶†¹ï&Ë0|Ê#<j°äYÆx`œ§Lp­€ÏnÅ8ftBbPKÇ¿ÕìóÀ,ÔM{§Ž
LüÇïèÄ#ΆŸé¶»ïʹwrr!*'צvöêÓÎÞzƒï¸ãr]q×.»áºþu•&FF×i§‡èÝ ð:‘ä}§÷L’·>ˆ´ûA¤D:A4¢˜âX4o<â&¢6
ŠiòŸÄ¤·¨5Œ¼Gñª‘ϪÉ^ˆ¬šHPHõ"‘8BÇÁ»Ž‰Û1MD‚â„‘󑢢PQ©¤©d¨tRѨtQé¦ÒsÆçNäs3òé3ò—&þ:n¢˜#`0—¼pþtÛ£©á£…óõ”®œKÌ´ePN3è©2̶eHŸf`]=—˜‹ˆßè‘{(þj!kdÕÞôƒ°®ÉzD:KŽ¥/ºj¤ZøêÔuÍ Ž~CO1>Àt.Éð ú´®2®w3ŸK3®w2ŸÓÏ~¼¸»¸-nYª
So0ðÜð)ƒOÖ>yúdîS.Ÿœ}òõÉÏ'7Ÿ¼|ôað÷Èí+ÒÅ)ú“ò%Òÿ
ÌU§–
û6Ž­IñµQ¨ãq¾SF%º¿¯¾¨ÁÁé™ê»CÒ¶ºÖ|ÖC:ÌÅÄï
ìF2M²q&§2Œ¤†E–ÀÞìƒMzÃ%zÎ:wG3Á
æ–zÌ-µ™[ê4·­Ò®•¶]Æ­—y¥/ø҈·ÉÛ§o'Ⱦ
¾A…—rV‚Ìe¨/¨dX`ÔõBºT3ø4_Ìpåkþ÷ž”Gnà£öPK(AT+É

’¼‘ˆk
Ëñ¸Ç6<ûBÁD4&hQǞë•`¢;4¬ÄòðÈN9ÄØÞÀs͎–ž®nÏÖÀ¶¯OpʃD,Œ$vÉáQÅÄQ"¨8c¹Û×ÑzÓÄlQÛ;;z™´@PáV϶–_w ½åš€w«Ï^¦Ù¥ÓZZ»½»@­62™ÞáÏØÛâí†À6A¥ºÛÓÕèðܝ°ÄÝYˆžîžN+›AèÝáõyt#W§(ÞvOÀíéîõ°9»¼ªÎW Ýëóy»-3Öú{ÚUI]žÎ‹yÇ&A¥Œ÷êÂZܺJM‘!Ò–xûÊ ¿¶¡}ŠŽï•C	H`ÿñ’Gã	¥ŸWD#8¼@§ÜqGc±èþéy§’ž¯Î{‡BaE“¿$@`¸•Ä~â8f §s4o…Ã!RY 2:Ü
¦øN%–¶@Pe`8¤±È{4qc_N`$
Zç‹Æå98¤4£ÃÈ.Œá°¢JŠ7¶ŽÆâÑ‹ð…"{•~_(žØÀ{9€Ç5fÁÒw0§âÛ4†
ì5=í5ÅȅõsJ

„·+H¡PP“ƲWèY‘–¡H(Ñ,hmí<ÍY½K¹5ÚSBó坯½Z5PU^:_]^æZ7o.wó]q
|»w3çåÀ©šºþB5/ŒµÍÛ¦²KƒJ¢}:-Mµ«½@Æg ͵ª‘¥Xڛ-SÁ„b[Ÿƒl®u3»CÓ¤å<XPëñ4”¹¶-m™^2âi“Pºg”HAQ,ˆgâ͵êÞ¦Œš1½ÔÀ8y͹ˆ3~Þ%åâŸ£¶”Çç¦UófÏQyªãç¦ê;L«‚…ñY(;PÆÝÚ4w¸œ?¥=ªƒ5"
wíjßõò>¹1,G5,W,ρ 2¢VDÔÎ`X‘cêQéÑæŸ.gmªY)ÅÔ#1„—ÔΖÍ" 0×Cc›QVíýʞÑAod šiUW"Šnè.ºWµ”Äj
KÂEc’¨ãi=Ý(‰k×ȸ‹ùíàÀ6%Ñۀ£·3xôN w1õ·2¸	yÉíüv½[¢÷Ð{%º“qï£÷ãv¶Ê‹;cP·ÄG‡•H"å0dQ¦éîс
,ÎrI:%±V\Êà2¼3M8cJ0:	Ý ô¯‘Ä:z
;—£‚^ÀͅzvaWë¼Mo¥{(¦ÈýŒ_/‰+é’h¢)«Ø ‰ð¯ØÄN~”>"чŒÓ#=H•èq,¥cždp‚©I¦>AXE³$6ÓÒØBOrÏÓÖ¬­¤S5y4
7ú£]£Á!OX™q@VÑ"	7=Í[i•ÄV¶~+=‚æ#íp#	%Á1¥l
«ŠŽ&œûQíp®ÎhÌBä;£ª%’ðˆm’ØN§%±Cx%ÑF§ÑN‹MɒÄU¼È'Ú­Â/‰X#v²!WÓc=ÃotT]BÏÒQèžy]	9¡¤YW¡¹#î”cŠSói9e£ëÐòµÉ‰&ԁöóµÉ)Ñs,;ŸgN½	daç€ì–D'ÑZœ]3¿³A{9ƒ[Ž+é—͵0}Ѻªx¨*iýꢬ=ª5ÕÄZSm®4³m•fv­ÕçéQKçjQ+ÎÕ¡æe´ÂydD‰ôª¯]g—G­Æ tW⦟›jKD5LFu6䞻SËîl•«,]vá=ª¾º¶ÊÊ0;;‰K̨+ÆeaGé
Œµ„qږ 	*áëºÆpjÂGc1äsºïrc¿OÙŠqÉk˜W3…khXÞ«fxæ½ûìwœy¿S9ûø³Ÿ—ÙnÙ|5;‘ņò|¬õ§!²Þ Ü/àÃzk^?Â'3æ¶*˜¬~f”·©Z½:ú‹fcaxD9
Æiù$ÕôM’³o‚–-KÒòê$­(Z‰—$]4A«¦\¥f6§Ä–XÙ jg[Jr٘R‰m)Ég#'©ÂV³]'h±ýÐQZœ«…aK&©¾„%ÔÐTP^`NҚò‚$5.ºŽêN]ˆQ`ÌÁò¢Çt2H\ý˜UŸW²ÛÚëŸw%éâúÓãdóןn˜:Žuv*ŸÆy?=Ep±&x)÷£:¹bÙUÞJÍ}«²º¯’Ï
³¸°2ÅÇuÑÃ)¤,Xô¸NF[¬“‹œW
|oxæcY=³ÐðÌ£Ù=³ðüžù8=–Ep‰!MzÊ®ª,,¸Ä°ë“YÙK
öcÙÙK
¯Ïê•Å†WžHye›âmÉF\U×Ø݇ˆC4%é-öá°Åã´E[r­­á…õ*zŽ(ô7p6 áu¡±±Oeux¹±±)‡ÏØX¹±±“Y7Val,™ý¸+íYÝZfh2»[Ëí§è).C8Ó{\u(ÍIZË£%I—òhKÒe<Z“´ŽGG’.ç17IWðˆÔ\Ïc^’®ä1?IM<JIÚÀQe¨›¤§¡„+Ûª³h~’6n'“ðÃl¤Ä¦g©Ù?N9MfÑð0½ÌIÍ¥áª^@É:AU§h‹ &ó$5÷¹ÊÍÔŽ9MµTKKÅËðlTSq¾½“´9éžâ$ã`pÀàÖqÊu1"I[٘xôìµ0·FáÙ¡{Îú™µhÛmŸÊLn6&³D€†´ãygÎaø2…k[€keåôüª¤zaÓÌk¯¸úà
óu¨âŒ=†C³S1•Ñf\ï÷£8yDž¨ÕäÞ?M|¼/åBý »Ô6‚h³æp¿oœ–±–ºSÔ!ð¥ØœÒFæv w
¼ZБ³¯h,Ú‘¢i&'®
ŸiÏfMƒj#ŸK‘‹u²MÖe¬xžNk±
[sԛûˆy—ˆÃ¸L4ûT'ÙL›ÆqÕhÕM¿iSÕ²ša±©ÙÕd.7?¯ù©ÿ¤7â&Ò´ñì~²™›ÇiqÕag Õx¨C8$©»—÷VnFÌmÊÁXž3U}‡¦®];ÜÔ&ø•T‹Ío@w¬=ˆ&éîY~ÿü®íªQOïåÐÐ3}#.0QAz}ÒÒ%]Ìg!\S«çi•	rv=@y“ÔÛWtÍõM©‚ùZŸÉߋSú½ »ÿݹ7ëáê«+ڝTÚÅ
{-Þ{ëŠ^§¡^Ÿ†zzÌ´#
ÜãtI½3M9uE
,(ÏAô$é:u²”g²’¤=šŒz=Œ^ªCJӏ}°{@Ï>ˆ`va
׌ñz¢ÿPK3äa¿
‰‚p(Ä8	@
ŠÙ7;úæÍî¼¼>=£‰!v–-]=}
ë0Îb}$ÐôWƉŠ¤€“Ò­¼Md¨zþà|B	eã`^=`æô.”¹ŽUVÚØp#YêBMßÛúþÏ®z„WQG¤å¯à5ƒê¸ZÛ9•åR¥–À¾*Æ
åÞÈ TiÊ
r¥’à˜JyÉ	’EÇ[ªb*°ù}¢Àp•Í
‹î§ÅÇ&Œ]4xÁ¼G
Lu@E
ugâÆaa&qëʅ&$DLŒì;¥!e:éÔWsáøPÆ;3übmîéwÚ{~¿¾QÁ
.8Zm†Fd¬5ïƒh¢¤chÝþDÌE¨E‡%½cð>¤JÝØ$G‡,«ÜÌ&K«ìJÝ!i±rO³io¤C%èö8ÎH.é½tã9ñšÔJØâ~XT&#êgÊ=
éŒýd¸
úÆÆ¡H…|S¡4Ó)5¦Æèð™6iUþº0èsŽs†«ÿ¬2»ÍíÖZk´œázM_“l–¦Æ:5¤ÊŠ<°‘¼\'{Z«Xè'œZ%<†=ä‹WirT©®Q•ŸŽý-r
¦œÝN™ê°‚ñ¨Û÷©”zVî.¥z)B%<®EŸŒÐo§Š}æéá±idr15©I
-y¾à*}ßˈÔv$ôkîi©N5÷¤¸<äÞ¡p=9Q“n(¥ï¾'¢ÿŽN¼ç‹	'	#œ…ŽƒKp\CFfüDã0”Š:Ø…âfl³ù9Ø@ÝÄ4Ì©ÁÐÉËþœG"®`’ÙÔÁ°z¾1ÊüÏòçƒ×ÓàY=›©·ëûbÀý÷š¦?S·èiU@cp…vjšÖ²ª´3ÚKí3°¯t@‘ár,Z5íUò¬a}ÞC_
uz¾±†%ú€r»sŠ¥/†1Sp5¶™1©Œ¾–è—¿£ðñşç"ª¸žÍ.å±7þƒ]C#a§­Ÿ¢œ_vcÍ”…¶ò«¾(šáý°EÚ2ÝTõͅóHÕ·f앸.$aîw3ÜÆ慐w‰?PK)2Õ3ý

É×T$W%Ý֚õù@C¡ù²Óz&ÀPK
,ˆˆÌ
ñœ¶âùÎ{º÷x–§ç‡GØƚK²ä í`ÙÁ
ƒ½&¡>`0:ÝKóH’ÁÅ<ï
¤¯6:gQ‰¤ÏÇýî×¥Ž‡¾Lu¨’ÜÁ*ƒÈ\gª|mÎ
¢ÐÇÉfˆ)›evRÛÿä‹/,ÔwTñÌ$ÙÄjЗ=ûù.gÎîÏËï(â1vÜ	PÁ]€{ÜØظO¨<ë%=ûœPlî~$”ötGjmmŒþ|Ð>R‘%4š»ûGòX†±Lºá°û”¼>‰Tj{:É°Ê(;0ÉXµÚüSä2D2è·:±ò™-¶y¥R£"iU‡AWÙ·ãó*3_D¶wìFŒa9Š•4¾êŒq)ûFFV›S“æ¾6ÝP¦2ú¤ÂH÷û<b˜j‡ïø!Û±Î3RðXÛ5TÔ°Š:áádòI6HSmx¼ƒTéî›_¼†uGߙ÷Rf£(LXººÂÖ,í´®>ÑåلI·Ǫ+ã÷–ט3J›üµs
êüýnñ
…/Î"'Ñð˜Ü6QðôWGŸ;Gñð¥WËXû«uy–õú[®óÅÿÅ­ðÉ¢gßÈÙ>	£M-‚p·¦,3-o³%~
PKVç´Ûº

Mî2[ƒz7‚nDOí‚ã(dgî´~‰•µ‹ŠÖ å<?#o6›)NYύÒ6Iä¾*µ6VCSšp,'žÆ¿Ý‰³YIè\N#tOèïåuá
ûU«’üjUtMÔ~¯ñðxAðEšW•§sì
ÌȀŠ"Þ6îf–.\¹Ðd"Q#ûRšR¦“NAy5>€e<ÃpƒvӞ/ÿùzÚïŸÏ/p…3
GÕ®6F¿?uRX†‹f{ÀÇÜW<
ýÞ´òˆÁ»û2¶}%.ŽÉc¤™hî¹ÜàÙ`î(”öq4zJ246]¸8¡²Ü­°ý1%ÍVÀPJr3­:tw¦)P—H{υÕfÂpÝlkú<æâMúB‡ô?ÖZùr"{Ïtâ]%3Ϭt.Néyÿ¶f-©€¡¶>C}‰ŸHÊ%}’QkcIKÃÓÀJò|™”’!W/–[¹H8[H—W¤¿A‘êUéîq±½FÊðVH…H5GÊØÉeÖÉ.öfÄ¡	œ«åØþ"7Ÿà
~JÙ Â.5ä¨qFï&ÌçÔÐkš'¢àj
>—¯ù ß#}>tÖ"Çÿ‰z`ô’L¦mÁË&’hc~$Î((°¼•Hòz̃I NÇñŒ•ñqjꋗÙV„záC”iÞƒaÌÇ8ˆõ€Ÿ”{«Ó¥·zV’~+å.çO\ãÏ
èË=ã[žË
‰<î
ì‘í¿ì
8Ù4M5³íÝn7M̲©TOöét2
W¢zù¾ÏÑsž¨ì’ªâ‰Î†ñ}`%ššçkk€k“Ìæé*¨ÛTk&TvVasÛ¿@®±4T‘äù€?&åS—”2)P„‰~ý£ë°Rò+O›‰·k•øª½N^¨0ŘtÉÁz„G®·?֝ԉ—
[
VÊ_Ȇi¨Qu%°Pkœï$:(Ð74ºU(Ý
Ê®)ÔµiN‹£ñ
hœ· ÊyRëmƒ%‡©ï’ôû˜«Q”ÏSý3foQÒùêcLQ\~f2îHeV
ãÏÓ+T¯û›±½AoçfìÐ7J¶ÕH:ZR,XD÷NH






ÌU§–
,ˆˆÌ

[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/utils CleanUp.java,1.1,1.2 DB.java,1.7,1.8 RS.java,1.3,1.4

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils
In directory usw-pr-cvs1:/tmp/cvs-serv21727/dev/src/net/sourceforge/idrs/utils

Modified Files:
	CleanUp.java DB.java RS.java 
Log Message:
Synced development

Index: CleanUp.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/CleanUp.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CleanUp.java	6 Nov 2001 23:03:14 -0000	1.1
--- CleanUp.java	22 Aug 2002 20:06:37 -0000	1.2
***************
*** 11,19 ****
  	}
  	
! 	protected void reset() {
  		statements.clear();
  	}
  	
! 	protected void regStatement(Statement s) throws Exception {
  		statements.add(s);
  	}
--- 11,19 ----
  	}
  	
! 	public void reset() {
  		statements.clear();
  	}
  	
! 	public void regStatement(Statement s) throws Exception {
  		statements.add(s);
  	}

Index: DB.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/DB.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DB.java	5 Apr 2002 14:37:52 -0000	1.7
--- DB.java	22 Aug 2002 20:06:37 -0000	1.8
***************
*** 360,363 ****
--- 360,364 ----
       */
      public void procMethod(ObjectStore obj,String method,String[] vals,IDRSScript idrs) throws Exception {
+         System.out.println("In procmethod");
          Object[] finalVals = new Object[vals.length];
          Class[] clss = obj.getMethodTypes(method);
***************
*** 374,391 ****
          for (i=0;i<vals.length;i++) {
              cls = clss[i];
-             
-             
-             
-             
              val1 = ObjectStore.getValue(cls,vals[i],this.con,idrs);
-             
              cls = val1.getClass();
-             
              finalVals[i] = val1;
-             
-             
-             
          }
          if (direction == DB.OUTPUT) {
              rs = (ResultSet) obj.execMethod(method,finalVals);
              
--- 375,384 ----
          for (i=0;i<vals.length;i++) {
              cls = clss[i];
              val1 = ObjectStore.getValue(cls,vals[i],this.con,idrs);
              cls = val1.getClass();
              finalVals[i] = val1;
          }
          if (direction == DB.OUTPUT) {
+             System.out.println("executing method");
              rs = (ResultSet) obj.execMethod(method,finalVals);
              

Index: RS.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/RS.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RS.java	18 Sep 2001 03:18:57 -0000	1.3
--- RS.java	22 Aug 2002 20:06:37 -0000	1.4
***************
*** 673,676 ****
--- 673,711 ----
        return null; 
      }
+ 
+ public java.net.URL getURL(int param) throws java.sql.SQLException {
+     return null;
+ }
+ 
+ public java.net.URL getURL(String str) throws java.sql.SQLException {
+     return null;
+ }
+ 
+ public void updateArray(int param, java.sql.Array array) throws java.sql.SQLException {
+     
+ }
+ 
+ public void updateArray(String str, java.sql.Array array) throws java.sql.SQLException {
+     
+ }
+ 
+ public void updateBlob(int param, java.sql.Blob blob) throws java.sql.SQLException {
+ }
+ 
+ public void updateBlob(String str, java.sql.Blob blob) throws java.sql.SQLException {
+ }
+ 
+ public void updateClob(String str, java.sql.Clob clob) throws java.sql.SQLException {
+ }
+ 
+ public void updateClob(int param, java.sql.Clob clob) throws java.sql.SQLException {
+ }
+ 
+ public void updateRef(String str, java.sql.Ref ref) throws java.sql.SQLException {
+ }
+ 
+ public void updateRef(int param, java.sql.Ref ref) throws java.sql.SQLException {
+ }
+ 
  }