[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/deploy HotDeploy.java,1.2,1.3 InsertToIDRS.java,1.2,1.3 RMLDeploy.java,1.2,1.3

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

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

Modified Files:
	HotDeploy.java InsertToIDRS.java RMLDeploy.java 
Log Message:
Completed initial xml compilation system


Index: HotDeploy.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/HotDeploy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HotDeploy.java	23 Jan 2002 13:54:08 -0000	1.2
--- HotDeploy.java	4 Mar 2002 23:05:34 -0000	1.3
***************
*** 26,30 ****
   */
  public final class HotDeploy extends HttpServlet {
!   String user, pass, url, className;
    String[] servers;
    int port;
--- 26,30 ----
   */
  public final class HotDeploy extends HttpServlet {
!   String user, pass, url, className,parseClass,schemaLocation,rmlTrans;
    String[] servers;
    int port;
***************
*** 50,53 ****
--- 50,59 ----
  
      this.svg = svg;
+     
+     this.parseClass = svg.getInitParameter("parseClass");
+     
+     this.schemaLocation = svg.getInitParameter("schemaLocation");
+     
+     this.rmlTrans = svg.getInitParameter("rmlTrans");
  
      this.numServers = Integer.parseInt(svg.getInitParameter("numServers"));
***************
*** 113,117 ****
  
        dep = new RMLDeploy(con);
! 
        dep.setUpdate(req.getParameter("update").equals("1"));
  
--- 119,126 ----
  
        dep = new RMLDeploy(con);
!       if (dep == null) System.out.println("dep null");
!       
!       if (req.getParameter("update") == null) System.out.println("Update null");
!       
        dep.setUpdate(req.getParameter("update").equals("1"));
  
***************
*** 126,130 ****
        if (req.getParameter("usrc") != null) {
          dep.setCompile(true);
!         dep.setSrc(req.getParameter("src"), out);
        }
  
--- 135,144 ----
        if (req.getParameter("usrc") != null) {
          dep.setCompile(true);
!         //dep.setSrc(req.getParameter("src"), out);
!         
!         
!         dep.setSrc(req.getParameter("src"),out,parseClass,rmlTrans,true,schemaLocation);
!         out.flush();
!         
        }
  

Index: InsertToIDRS.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/InsertToIDRS.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InsertToIDRS.java	25 Dec 2001 06:44:00 -0000	1.2
--- InsertToIDRS.java	4 Mar 2002 23:05:34 -0000	1.3
***************
*** 31,35 ****
      Connection con;
      RMLDeploy dep;
! 
      String propsPath, DBDriver, DBName, User, Pass;
      if (opts.equals("-h")) {
--- 31,38 ----
      Connection con;
      RMLDeploy dep;
!     String schemaLocation;
!     String parseClass;
!     String rmlTrans;
!     
      String propsPath, DBDriver, DBName, User, Pass;
      if (opts.equals("-h")) {
***************
*** 74,78 ****
      User = dbprops.getProperty("dbuser");
      Pass = dbprops.getProperty("dbpass");
! 
      Class.forName(DBDriver);
      if (User.equalsIgnoreCase("NULL")) {
--- 77,84 ----
      User = dbprops.getProperty("dbuser");
      Pass = dbprops.getProperty("dbpass");
!     schemaLocation = dbprops.getProperty("schemaLocation");
!     parseClass = dbprops.getProperty("parseClass");
!     rmlTrans = dbprops.getProperty("rmlTrans");
!     
      Class.forName(DBDriver);
      if (User.equalsIgnoreCase("NULL")) {
***************
*** 99,110 ****
        i++;
        
!       IDRSRep report = (new IDRSCompiler(args[i], true)).setLogger(System.out).buildReport();
          ByteArrayOutputStream baos = new ByteArrayOutputStream();
          ObjectOutputStream oos = new ObjectOutputStream(baos);
          oos.writeObject(report);
!         
        
!       dep.setCompile(false);
!       dep.setSrc(baos.toString(),System.out);
      }
      if (opts.indexOf("g") != -1) {
--- 105,125 ----
        i++;
        
!       /*
!         IDRSRep report = (new IDRSCompiler(args[i], true)).setLogger(System.out).buildReport();
          ByteArrayOutputStream baos = new ByteArrayOutputStream();
          ObjectOutputStream oos = new ObjectOutputStream(baos);
          oos.writeObject(report);
!         */
        
!       BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(new File(args[i]))));
!       String line,src="";
!       while ((line = in.readLine() ) != null) {
!           src += line + "\n";
!       }
!       in.close();
!       
!       dep.setCompile(true);
!       PrintWriter out = new PrintWriter(System.out,true);
!       dep.setSrc(src,out,parseClass,rmlTrans,true,schemaLocation);
      }
      if (opts.indexOf("g") != -1) {

Index: RMLDeploy.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/RMLDeploy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RMLDeploy.java	25 Dec 2001 06:44:00 -0000	1.2
--- RMLDeploy.java	4 Mar 2002 23:05:34 -0000	1.3
***************
*** 17,20 ****
--- 17,21 ----
  import java.io.*;
  import java.sql.*;
+ import net.sourceforge.idrs.deploy.compile.RmlCompiler;
  
  /**
***************
*** 154,157 ****
--- 155,159 ----
        try {
          report = (new IDRSCompiler((String) src, false)).setLogger(logger).buildReport();
+         
          ByteArrayOutputStream baos = new ByteArrayOutputStream();
          ObjectOutputStream oos = new ObjectOutputStream(baos);
***************
*** 162,165 ****
--- 164,198 ----
        catch (Exception e) {
          err = false;
+         exc = e;
+         return;
+       }
+     }
+     else {
+       bytes = src.getBytes();      
+     }
+ 
+ 	bais = new ByteArrayInputStream(bytes);
+     names.add("DocSrc");
+     vals.add(bais);
+   }
+   
+   public void setSrc(String src,PrintWriter logger,String parseClass,String rmlTrans,boolean isFile,String rmlSchema) {
+     System.out.println("Compile : " + compile);
+     if (compile) {
+       try {
+         //report = (new IDRSCompiler((String) src, false)).setLogger(logger).buildReport();
+         RmlCompiler comp = new RmlCompiler(logger,src,parseClass,rmlTrans,isFile,rmlSchema);
+         System.out.println("Report : " + report);
+         report = comp.getReport();
+         ByteArrayOutputStream baos = new ByteArrayOutputStream();
+         ObjectOutputStream oos = new ObjectOutputStream(baos);
+         oos.writeObject(report);
+         bais = new ByteArrayInputStream(baos.toByteArray());
+         bytes=baos.toByteArray();
+       }
+       catch (Exception e) {
+         
+         e.printStackTrace(logger);
+         err = true;
          exc = e;
          return;