patch for rearrangement of ibex packages

[org.ibex.xt-crawshaw.git] / src / java / org / ibex / xt / Servlet.java

diff --git a/src/java/org/ibex/xt/Servlet.java b/src/java/org/ibex/xt/Servlet.java
index ff63ab9..fcdbde2 100644 (file)
--- a/src/java/org/ibex/xt/Servlet.java
+++ b/src/java/org/ibex/xt/Servlet.java
@@ -1,14 +1,14 @@
-package ibex.xt;
+package org.ibex.xt;
 
 import java.io.*;
 import java.net.*;
+import java.util.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import java.util.*;
-import ibex.util.*;
-import ibex.util.Collections;
-import ibex.js.*;
+import org.ibex.util.*;
+import org.ibex.util.Collections;
+import org.ibex.js.*;
 
 import org.prevayler.*;
 import org.prevayler.implementation.snapshot.*;
@@ -39,8 +39,10 @@ public class Servlet extends HttpServlet {
     public void doGet(HttpServletRequest rq, HttpServletResponse rs) throws IOException {
         String path = cx.getRealPath(rq.getServletPath());
         Servlet.Scope scope = new Servlet.Scope(cx, rq, rs, prevayler);
-        try { Template.wrap(Template.parse(path, scope), scope).toXML(rs.getWriter()); }
+        rs.getWriter().write("beginning output...");
+        try { Template.wrap(Template.parse(path, scope), scope).out(rs.getWriter()); }
         catch (Exception e) { e.printStackTrace(); System.out.println("e = "+e); }
+        rs.getWriter().write("...output ends.");
     }
 
     public static class Scope extends Template.Scope {