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

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

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

Modified Files:
	HotDeploy.java RMLDeploy.java 
Log Message:
Added setprops tag

Index: HotDeploy.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/HotDeploy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HotDeploy.java	4 Mar 2002 23:05:34 -0000	1.3
--- HotDeploy.java	23 Mar 2002 04:48:27 -0000	1.4
***************
*** 110,113 ****
--- 110,116 ----
      RMLDeploy dep;
      PrintWriter out;
+     StringWriter buff = new StringWriter();
+     PrintWriter results = new PrintWriter(buff, true);
+     
      try {
         
***************
*** 115,119 ****
  
        out = resp.getWriter();
!       resp.setContentType("text/plain");
        con = DriverManager.getConnection(url, user, pass);
  
--- 118,122 ----
  
        out = resp.getWriter();
!       resp.setContentType("text/html");
        con = DriverManager.getConnection(url, user, pass);
  
***************
*** 138,143 ****
          
          
!         dep.setSrc(req.getParameter("src"),out,parseClass,rmlTrans,true,schemaLocation);
!         out.flush();
          
        }
--- 141,147 ----
          
          
!         dep.setSrc(req.getParameter("src"),results,parseClass,rmlTrans,true,schemaLocation);
!         results.flush();
!         out.print(toHTML(buff.toString()));
          
        }
***************
*** 248,251 ****
--- 252,282 ----
    }
  
+   protected String toHTML(String txt) {
+     StringBuffer buff = new StringBuffer();
+     boolean inTag = false;
+     char c;
+     for (int i = 0;i<txt.length();i++) {
+         c = txt.charAt(i);
+         if (c == '<') {
+             buff.append("<B>").append("&lt;");
+         }
+         else if (c == '>') {
+             buff.append("&gt;").append("</B>");
+         }
+         else if (c == ' ') {
+             buff.append("&nbsp;");
+         }
+         else if (c == '\n') {
+             buff.append("<BR>");
+         }
+         else if (c == '&') {
+             buff.append("&amp;");
+         }
+         else buff.append(c);
+     }
+     
+     return buff.toString();
+   }
+   
    public void destroy() {
  

Index: RMLDeploy.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/RMLDeploy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RMLDeploy.java	4 Mar 2002 23:05:34 -0000	1.3
--- RMLDeploy.java	23 Mar 2002 04:48:27 -0000	1.4
***************
*** 183,187 ****
          //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();
--- 183,187 ----
          //report = (new IDRSCompiler((String) src, false)).setLogger(logger).buildReport();
          RmlCompiler comp = new RmlCompiler(logger,src,parseClass,rmlTrans,isFile,rmlSchema);
!         
          report = comp.getReport();
          ByteArrayOutputStream baos = new ByteArrayOutputStream();