reorganise for new collections

darcs-hash:20041116130812-2eb37-27146d833b7d691e0a4ecfb7df92ada0057ce360.gz

diff --git a/src/ibex/xt/JSElement.java b/src/java/ibex/xt/JSElement.java
similarity index 98%
rename from src/ibex/xt/JSElement.java
rename to src/java/ibex/xt/JSElement.java
index 1cd6879..d3f8cd8 100644 (file)
--- a/src/ibex/xt/JSElement.java
+++ b/src/java/ibex/xt/JSElement.java
@@ -1,10 +1,9 @@
 package ibex.xt;
 
-import ibex.util.XML;
-import org.ibex.js.JS;
-import org.ibex.js.JSScope;
+import ibex.js.JS;
+import ibex.js.JSScope;
 
-import ibex.collection.*;
+import ibex.util.*;
 import java.util.*;
 
 import java.io.StringReader;

diff --git a/src/ibex/xt/Prevalence.java b/src/java/ibex/xt/Prevalence.java
similarity index 97%
rename from src/ibex/xt/Prevalence.java
rename to src/java/ibex/xt/Prevalence.java
index 4904bbd..ce60a19 100644 (file)
--- a/src/ibex/xt/Prevalence.java
+++ b/src/java/ibex/xt/Prevalence.java
@@ -1,16 +1,16 @@
 package ibex.xt;
 
-import org.ibex.js.*;
+import ibex.js.*;
 import ibex.util.*;
-//import org.ibex.io.*;
+import java.util.*;
+
 import java.io.*;
 import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-//import com.thoughtworks.xstream.*;
+import javax.servlet.ServletContext; // FIXME: remove references
+
 import org.prevayler.*;
 import org.prevayler.implementation.snapshot.*;
+//import com.thoughtworks.xstream.*; // FIXME find
 
 public class Prevalence {
 

diff --git a/src/ibex/xt/Servlet.java b/src/java/ibex/xt/Servlet.java
similarity index 98%
rename from src/ibex/xt/Servlet.java
rename to src/java/ibex/xt/Servlet.java
index 94d3e29..33803db 100644 (file)
--- a/src/ibex/xt/Servlet.java
+++ b/src/java/ibex/xt/Servlet.java
@@ -1,14 +1,11 @@
 package ibex.xt;
 
-import ibex.util.XML;
-import org.ibex.js.JS;
-import org.ibex.js.JSArray;
-import org.ibex.js.JSDate;
-import org.ibex.js.JSExn;
+import ibex.js.*;
+import ibex.util.*;
+import java.util.*;
 
 import java.io.*;
 import java.net.*;
-import java.util.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
 

diff --git a/src/ibex/xt/Template.java b/src/java/ibex/xt/Template.java
similarity index 96%
rename from src/ibex/xt/Template.java
rename to src/java/ibex/xt/Template.java
index 076251b..ac6ea78 100644 (file)
--- a/src/ibex/xt/Template.java
+++ b/src/java/ibex/xt/Template.java
@@ -1,14 +1,7 @@
 package ibex.xt;
 
-import ibex.util.XML;
-import ibex.util.Vec; //FIXME remove
-
-import org.ibex.js.JS;
-import org.ibex.js.JSScope;
-import org.ibex.js.JSArray;
-import org.ibex.js.JSExn;
-
-import ibex.collection.*;
+import ibex.js.*;
+import ibex.util.*;
 import java.util.*;
 
 import java.io.BufferedReader;
@@ -178,6 +171,7 @@ public class Template extends JSElement {
         public Children(XML.Element e) { super(e); }
     }
 
+    // TODO: finish
     public static final class Transaction extends JSElement {
         private final Template.Scope scope; // FIXME: HACK. unstatisise all tags, or do this to all
         public Transaction(XML.Element e, Template.Scope s) { super(e); scope = s;} // TODO: check kids
@@ -185,7 +179,7 @@ public class Template extends JSElement {
         public void toXML(Writer w) throws IOException {
             super.toXML(w);
 
-            // FIXME: what about scope import? <xt:use /> children?
+            // TODO: <xt:use />
             List c = getChildren();
             StringWriter sw = new StringWriter();
             for (int i=0; i < c.size(); i++) ((XML.Block)c.get(i)).toXML(sw);