httpunit-commit — CVS commit logs

[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/parsing NekoDOMParser.java, 1.4, 1.5

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/parsing
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13025/src/com/meterware/httpunit/parsing

Modified Files:
	NekoDOMParser.java 
Log Message:
refactor to allow dom-based-scripting

Index: NekoDOMParser.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/parsing/NekoDOMParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NekoDOMParser.java	28 Mar 2006 00:52:15 -0000	1.4
+++ NekoDOMParser.java	9 Oct 2006 03:16:26 -0000	1.5
@@ -121,7 +121,7 @@
 
 
     public boolean supportsScriptLanguage( String language ) {
-        return getScriptableDelegate().supportsScript( language );
+        return getScriptableDelegate().supportsScriptLanguage( language );
     }
 
 

[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit/dom DomScriptingTest.java, 1.1, 1.2

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/dom
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13025/test/com/meterware/httpunit/dom

Modified Files:
	DomScriptingTest.java 
Log Message:
refactor to allow dom-based-scripting

Index: DomScriptingTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/dom/DomScriptingTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DomScriptingTest.java	6 Jul 2006 04:02:07 -0000	1.1
+++ DomScriptingTest.java	9 Oct 2006 03:16:26 -0000	1.2
@@ -1,14 +1,36 @@
 package com.meterware.httpunit.dom;
-
+/********************************************************************************************************************
+ * $Id$
+ *
+ * Copyright (c) 2006, Russell Gold
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ *******************************************************************************************************************/
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.html.HTMLBodyElement;
 import org.w3c.dom.html.HTMLAnchorElement;
 import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.Context;
 
 /**
  * Tests basic scripting via the DOM.
- */
+ *
+ * @author <a href="mailto:rus...@ht...">Russell Gold</a>
+ **/
 public class DomScriptingTest extends AbstractHTMLElementTest {
 
 
@@ -23,7 +45,7 @@
         assertEquals( "title", "something", _htmlDocument.get( "title", null ) );
 
         Node body = createElement( "body" );
-        assertEquals( "title", "something", ScriptingSupport.evaluateExpression( body, "document.title" ) );
+        assertEquals( "title", "something", evaluateExpression( body, "document.title" ) );
     }
 
 
@@ -32,7 +54,7 @@
         assertEquals( "title after put", "right here", _htmlDocument.getTitle() );
 
         Node body = createElement( "body" );
-        ScriptingSupport.evaluateExpression( body, "document.title='new value'" );
+        evaluateExpression( body, "document.title='new value'" );
         assertEquals( "title after script", "new value", _htmlDocument.getTitle() );
     }
 
@@ -44,7 +66,7 @@
         scriptableBody.put( "title", scriptableBody, "right here" );
         assertEquals( "title after put", "right here", body.getTitle() );
 
-        ScriptingSupport.evaluateExpression( body, "title='new value'" );
+        evaluateExpression( body, "title='new value'" );
         assertEquals( "title after script", "new value", body.getTitle() );
     }
 
@@ -53,9 +75,9 @@
         HTMLBodyElement body = addBodyElement();
         body.setBgColor( "red" );
 
-        assertEquals( "initial background color", "red", ScriptingSupport.evaluateExpression( _htmlDocument, "body.bgcolor" ) );
+        assertEquals( "initial background color", "red", evaluateExpression( _htmlDocument, "body.bgcolor" ) );
 
-        ScriptingSupport.evaluateExpression( _htmlDocument, "body.id='blue'" );
+        evaluateExpression( _htmlDocument, "body.id='blue'" );
         assertEquals( "revised foreground color", "blue", body.getId() );
     }
 
@@ -66,12 +88,13 @@
         body.appendChild( anchor );
         anchor.setTabIndex( 4 );
 
-        assertEquals( "initial tab index", new Integer(4), ScriptingSupport.evaluateExpression( anchor, "tabindex" ) );
+        assertEquals( "initial tab index", new Integer(4), evaluateExpression( anchor, "tabindex" ) );
 
-        ScriptingSupport.evaluateExpression( anchor, "tabindex=6" );
+        evaluateExpression( anchor, "tabindex=6" );
         assertEquals( "revised tab index", 6, anchor.getTabIndex() );
     }
 
+
     private HTMLBodyElement addBodyElement() {
         HTMLBodyElement body = (HTMLBodyElement) createElement( "body" );
         _htmlDocument.setBody( body );
@@ -80,7 +103,7 @@
 
 
     public void testCreateElement() throws Exception {
-        Object node = ScriptingSupport.evaluateExpression( _htmlDocument, "createElement( 'a' )" );
+        Object node = evaluateExpression( _htmlDocument, "createElement( 'a' )" );
         assertNotNull( "No node returned", node );
         assertTrue( "Node is not an anchor element", node instanceof HTMLAnchorElement );
     }
@@ -91,13 +114,13 @@
         appendLink( body, "red", "red.html" );
         appendLink( body, "blue", "blue.html" );
 
-        assertEquals( "number of links", new Integer(2), ScriptingSupport.evaluateExpression( _htmlDocument, "links.length" ) );
-        Object second = ScriptingSupport.evaluateExpression( _htmlDocument, "links[1]" );
+        assertEquals( "number of links", new Integer(2), evaluateExpression( _htmlDocument, "links.length" ) );
+        Object second = evaluateExpression( _htmlDocument, "links[1]" );
         assertNotNull( "Did not obtain any link object", second );
         assertTrue( "Object is not a link element", second instanceof HTMLAnchorElement );
         assertEquals( "Link ID", "blue", ((HTMLAnchorElement) second).getId() );
 
-        assertEquals( "red link href", "red.html", ScriptingSupport.evaluateExpression( _htmlDocument, "links.red.href" ) );
+        assertEquals( "red link href", "red.html", evaluateExpression( _htmlDocument, "links.red.href" ) );
     }
 
 
@@ -122,4 +145,14 @@
         assertTrue( valueType.getName() + " should be convertable to " + parameterType.getName(), ScriptingSupport.isConvertableTo( valueType, parameterType ) );
     }
 
+
+    private Object evaluateExpression( Node node, String expression ) {
+        try {
+            Context context = Context.enter();
+            context.initStandardObjects( null );
+            return ((NodeImpl) node).evaluateExpression( expression );
+        } finally {
+            Context.exit();
+        }
+    }
 }

[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/scripting ScriptingHandler.java, NONE, 1.1 ScriptableDelegate.java, 1.10, 1.11 ScriptingEngine.java, 1.7, 1.8 ScriptingEngineFactory.java, 1.4, 1.5

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13025/src/com/meterware/httpunit/scripting

Modified Files:
	ScriptableDelegate.java ScriptingEngine.java 
	ScriptingEngineFactory.java 
Added Files:
	ScriptingHandler.java 
Log Message:
refactor to allow dom-based-scripting

***** Error reading new file[Errno 2] No such file or directory: 'ScriptingHandler.java'
Index: ScriptableDelegate.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting/ScriptableDelegate.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ScriptableDelegate.java	9 Mar 2004 21:49:18 -0000	1.10
+++ ScriptableDelegate.java	9 Oct 2006 03:16:26 -0000	1.11
@@ -1,11 +1,8 @@
 package com.meterware.httpunit.scripting;
-
-import com.meterware.httpunit.HTMLElement;
-
 /********************************************************************************************************************
  * $Id$
  *
- * Copyright (c) 2002, Russell Gold
+ * Copyright (c) 2002-2006, Russell Gold
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
@@ -22,28 +19,29 @@
  * DEALINGS IN THE SOFTWARE.
  *
  *******************************************************************************************************************/
+import com.meterware.httpunit.HTMLElement;
 
 /**
  * An interface for objects which will be accessible via scripting.
  *
  * @author <a href="mailto:rus...@ht...">Russell Gold</a>
  **/
-abstract public class ScriptableDelegate {
+abstract public class ScriptableDelegate implements ScriptingHandler {
 
     private ScriptingEngine _scriptEngine;
 
 
     private static final ScriptingEngine NULL_SCRIPT_ENGINE = new ScriptingEngine() {
         public boolean supportsScriptLanguage( String language ) { return false; }
-        public String executeScript( String language, String script ) { return ""; }
-        public boolean performEvent( String eventScript ) { return true; }
-        public String evaluateScriptExpression( String urlString ) { return null; }
+        public String runScript( String language, String script ) { return ""; }
+        public boolean doEvent( String eventScript ) { return true; }
+        public String evaluateExpression( String urlString ) { return null; }
         public ScriptingEngine newScriptingEngine( ScriptableDelegate child ) { return this; }
         public void clearCaches() {}
     };
 
 
-    public boolean supportsScript( String language ) {
+    public boolean supportsScriptLanguage( String language ) {
         return getScriptEngine().supportsScriptLanguage( language );
     }
 
@@ -53,7 +51,7 @@
      **/
     public boolean doEvent( String eventScript ) {
         if (eventScript.length() == 0) return true;
-        return getScriptEngine().performEvent( eventScript );
+        return getScriptEngine().doEvent( eventScript );
     }
 
 
@@ -62,7 +60,7 @@
      * @return the replacement text, which may be empty.
      **/
     public String runScript( String language, String script ) {
-        return (script.length() == 0) ? "" : getScriptEngine().executeScript( language, script );
+        return (script.length() == 0) ? "" : getScriptEngine().runScript( language, script );
     }
 
 
@@ -71,7 +69,7 @@
      **/
     public String evaluateExpression( String urlString ) {
         if (urlString.length() == 0) return null;
-        return getScriptEngine().evaluateScriptExpression( urlString );
+        return getScriptEngine().evaluateExpression( urlString );
     }
 
 
@@ -121,7 +119,7 @@
     protected ScriptableDelegate[] getDelegates( final HTMLElement[] elements ) {
         ScriptableDelegate[] result = new ScriptableDelegate[ elements.length ];
         for (int i = 0; i < elements.length; i++) {
-            result[i] = elements[i].getScriptableDelegate();
+            result[i] = (ScriptableDelegate) elements[i].getScriptingHandler();
         }
         return result;
     }

Index: ScriptingEngine.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting/ScriptingEngine.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ScriptingEngine.java	9 Mar 2004 21:49:18 -0000	1.7
+++ ScriptingEngine.java	9 Oct 2006 03:16:26 -0000	1.8
@@ -2,7 +2,7 @@
 /********************************************************************************************************************
  * $Id$
  *
- * Copyright (c) 2002, Russell Gold
+ * Copyright (c) 2002-2006, Russell Gold
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
@@ -25,31 +25,7 @@
  *
  * @author <a href="mailto:rus...@ht...">Russell Gold</a>
  **/
-public interface ScriptingEngine {
-
-
-    /**
-     * Returns true if this engine supports the specified script.
-     **/
-    public boolean supportsScriptLanguage( String language );
-
-
-    /**
-     * Interprets the specified script, which may include global function definitions.
-     */
-    public String executeScript( String language, String script );
-
-
-    /**
-     * Interprets the specified script and returns a boolean result.
-     */
-    public boolean performEvent( String eventScript );
-
-
-    /**
-     * Evaluates the specified string as JavaScript. Will return null if the script has no return value.
-     */
-    public String evaluateScriptExpression( String urlString );
+public interface ScriptingEngine extends ScriptingHandler {
 
 
     /**

Index: ScriptingEngineFactory.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting/ScriptingEngineFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ScriptingEngineFactory.java	8 Aug 2004 17:38:18 -0000	1.4
+++ ScriptingEngineFactory.java	9 Oct 2006 03:16:26 -0000	1.5
@@ -1,5 +1,6 @@
 package com.meterware.httpunit.scripting;
 import com.meterware.httpunit.WebResponse;
+import com.meterware.httpunit.HTMLElement;
 
 /********************************************************************************************************************
  * $Id$
@@ -65,4 +66,6 @@
      */
     public void clearErrorMessages();
 
+
+    ScriptingHandler createHandler( HTMLElement elementBase );
 }

[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/dom DomBasedScriptingEngineFactory.java, NONE, 1.1 ElementImpl.java, 1.2, 1.3 HTMLElementImpl.java, 1.2, 1.3 NodeImpl.java, 1.2, 1.3 ScriptingSupport.java, 1.1, 1.2

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/dom
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13025/src/com/meterware/httpunit/dom

Modified Files:
	ElementImpl.java HTMLElementImpl.java NodeImpl.java 
	ScriptingSupport.java 
Added Files:
	DomBasedScriptingEngineFactory.java 
Log Message:
refactor to allow dom-based-scripting

--- NEW FILE ---
package com.meterware.httpunit.dom;
import com.meterware.httpunit.scripting.ScriptingEngineFactory;
import com.meterware.httpunit.scripting.ScriptingHandler;
import com.meterware.httpunit.WebResponse;
import com.meterware.httpunit.HTMLElement;

import java.util.logging.Logger;

/**
 * The scripting engine factory which relies directly on the DOM.
 */
public class DomBasedScriptingEngineFactory implements ScriptingEngineFactory {

    public boolean isEnabled() {
        try {
            Class.forName( "org.mozilla.javascript.Context" );
            return true;
        } catch (Exception e) {
            Logger.getLogger( "httpunit.org" ).warning( "Rhino classes (js.jar) not found - Javascript disabled" );
            return false;
        }
    }


    public void associate( WebResponse response ) {
        //To change body of implemented methods use File | Settings | File Templates.
    }


    public void load( WebResponse response ) {
        //To change body of implemented methods use File | Settings | File Templates.
    }


    public void setThrowExceptionsOnError( boolean throwExceptions ) {
        //To change body of implemented methods use File | Settings | File Templates.
    }


    public boolean isThrowExceptionsOnError() {
        return false;  //To change body of implemented methods use File | Settings | File Templates.
    }


    public String[] getErrorMessages() {
        return new String[0];  //To change body of implemented methods use File | Settings | File Templates.
    }


    public void clearErrorMessages() {
        //To change body of implemented methods use File | Settings | File Templates.
    }


    public ScriptingHandler createHandler( HTMLElement elementBase ) {
        return (ScriptingHandler) elementBase.getNode();
    }
}

Index: ElementImpl.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/dom/ElementImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ElementImpl.java	6 Jul 2006 04:02:06 -0000	1.2
+++ ElementImpl.java	9 Oct 2006 03:16:26 -0000	1.3
@@ -23,6 +23,9 @@
 
 import java.util.Hashtable;
 
+import com.meterware.httpunit.scripting.ScriptingEngine;
+import com.meterware.httpunit.scripting.ScriptableDelegate;
+
 /**
  *
  * @author <a href="mailto:rus...@ht...">Russell Gold</a>

Index: HTMLElementImpl.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/dom/HTMLElementImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HTMLElementImpl.java	6 Jul 2006 04:02:06 -0000	1.2
+++ HTMLElementImpl.java	9 Oct 2006 03:16:26 -0000	1.3
@@ -118,6 +118,7 @@
         return super.getElementsByTagName( ((HTMLDocumentImpl) getOwnerDocument()).toNodeCase( name ) );
     }
 
+//---------------------------------------------- protected methods -----------------------------------------------------
 
     final protected String getAttributeWithDefault( String attributeName, String defaultValue ) {
         if (hasAttribute( attributeName )) return getAttribute( attributeName );

Index: NodeImpl.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/dom/NodeImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NodeImpl.java	6 Jul 2006 04:02:07 -0000	1.2
+++ NodeImpl.java	9 Oct 2006 03:16:26 -0000	1.3
@@ -2,7 +2,7 @@
 /********************************************************************************************************************
  * $Id$
  *
- * Copyright (c) 2004, Russell Gold
+ * Copyright (c) 2004-2006, Russell Gold
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
@@ -20,16 +20,19 @@
  *
  *******************************************************************************************************************/
 import org.w3c.dom.*;
-import org.mozilla.javascript.ScriptableObject;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
 
+import com.meterware.httpunit.javascript.ScriptingEngineImpl;
+import com.meterware.httpunit.scripting.ScriptingEngine;
+import com.meterware.httpunit.scripting.ScriptableDelegate;
+
 /**
  *
  * @author <a href="mailto:rus...@ht...">Russell Gold</a>
  **/
-abstract public class NodeImpl extends ScriptableObject implements Node {
+abstract public class NodeImpl extends ScriptingEngineImpl implements Node {
 
     private DocumentImpl _ownerDocument;
     private NodeImpl     _parentNode;
@@ -52,6 +55,14 @@
         return getClass().getName();
     }
 
+//------------------------------------------ ScriptingEngine methods --------------------------------------------------
+
+    public ScriptingEngine newScriptingEngine( ScriptableDelegate child ) {
+        throw new UnsupportedOperationException( );
+    }
+
+    public void clearCaches() {}
+
 //----------------------------------------------- Node methods ---------------------------------------------------------
 
 

Index: ScriptingSupport.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/dom/ScriptingSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ScriptingSupport.java	6 Jul 2006 04:02:07 -0000	1.1
+++ ScriptingSupport.java	9 Oct 2006 03:16:26 -0000	1.2
@@ -1,10 +1,7 @@
 package com.meterware.httpunit.dom;
 
 import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.JavaScriptException;
-import org.mozilla.javascript.Context;
 import org.mozilla.javascript.FunctionObject;
-import org.w3c.dom.Node;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
@@ -129,23 +126,12 @@
     }
 
 
-    static Object evaluateExpression( Node node, String expression ) throws JavaScriptException {
-        try {
-            Context context = Context.enter();
-            context.initStandardObjects( null );
-            return Context.getCurrentContext().evaluateString( (Scriptable) node, expression, "httpunit", 0, null );
-        } finally {
-            Context.exit();
-        }
-    }
-
     public static boolean isConvertableTo( Class valueType, Class parameterType ) {
         if (valueType.equals( parameterType )) return true;
         if (parameterType.equals( String.class )) return true;
         if (valueType.equals( String.class ) && isNumericParameter( parameterType )) return true;
         if (Number.class.isAssignableFrom( valueType ) && isNumericParameter( parameterType )) return true;
-        if (valueType.equals( String.class ) && parameterType.equals( Boolean.class )) return true;
-        return false;
+        return valueType.equals( String.class ) && parameterType.equals( Boolean.class );
     }
 
     private static boolean isNumericParameter( Class parameterType ) {

[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/javascript ScriptingEngineImpl.java, NONE, 1.1 JavaScript.java, 1.64, 1.65 JavaScriptEngineFactory.java, 1.8, 1.9

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13025/src/com/meterware/httpunit/javascript

Modified Files:
	JavaScript.java JavaScriptEngineFactory.java 
Added Files:
	ScriptingEngineImpl.java 
Log Message:
refactor to allow dom-based-scripting

***** Error reading new file[Errno 2] No such file or directory: 'ScriptingEngineImpl.java'
Index: JavaScript.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript/JavaScript.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- JavaScript.java	6 Jul 2006 04:02:07 -0000	1.64
+++ JavaScript.java	9 Oct 2006 03:16:26 -0000	1.65
@@ -2,7 +2,7 @@
 /********************************************************************************************************************
  * $Id$
  *
- * Copyright (c) 2002-2004, Russell Gold
+ * Copyright (c) 2002-2006, Russell Gold
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
@@ -24,7 +24,6 @@
 import com.meterware.httpunit.scripting.*;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
 import java.io.IOException;
 import java.net.URL;
 
@@ -39,12 +38,8 @@
  **/
 public class JavaScript {
 
-    private final static Object[] NO_ARGS = new Object[0];
-
     private static boolean _throwExceptionsOnError = true;
 
-    private static ArrayList _errorMessages = new ArrayList();
-
 
     static boolean isThrowExceptionsOnError() {
         return _throwExceptionsOnError;
@@ -56,16 +51,6 @@
     }
 
 
-    static void clearErrorMessages() {
-        _errorMessages.clear();
-    }
-
-
-    static String[] getErrorMessages() {
-        return (String[]) _errorMessages.toArray( new String[ _errorMessages.size() ] );
-    }
-
-
     /**
      * Initiates JavaScript execution for the specified web response.
      */
@@ -110,102 +95,12 @@
     }
 
 
-    abstract static class JavaScriptEngine extends ScriptableObject implements ScriptingEngine {
+    abstract static class JavaScriptEngine extends ScriptingEngineImpl {
 
         protected ScriptableDelegate _scriptable;
         protected JavaScriptEngine   _parent;
 
 
-        public boolean supportsScriptLanguage( String language ) {
-            return language == null || language.toLowerCase().startsWith( "javascript" );
-        }
-
-
-        public String executeScript( String language, String script ) {
-            if (!supportsScriptLanguage( language )) return "";
-            try {
-                script = script.trim();
-                if (script.startsWith( "<!--" )) {
-                    script = withoutFirstLine( script );
-                    if (script.endsWith( "-->" )) script = script.substring( 0, script.lastIndexOf( "-->" ));
-                }
-                Context.getCurrentContext().evaluateString( this, script, "httpunit", 0, null );
-                StringBuffer buffer = getDocumentWriteBuffer();
-                return buffer.toString();
-            } catch (Exception e) {
-                handleScriptException( e, "Script '" + script + "'" );
-                return "";
-            } finally {
-                discardDocumentWriteBuffer();
-            }
-        }
-
-
-        protected StringBuffer getDocumentWriteBuffer() {
-            throw new IllegalStateException( "may not run executeScript() from " + getClass() );
-        }
-
-
-        protected void discardDocumentWriteBuffer() {
-            throw new IllegalStateException( "may not run executeScript() from " + getClass() );
-        }
-
-
-        private String withoutFirstLine( String script ) {
-            for (int i=0; i < script.length(); i++) {
-                if (isLineTerminator( script.charAt(i) )) return script.substring( i ).trim();
-            }
-            return "";
-        }
-
-
-        private boolean isLineTerminator( char c ) {
-            return c == 0x0A || c == 0x0D;
-        }
-
-
-        public boolean performEvent( String eventScript ) {
-            try {
-                final Context context = Context.getCurrentContext();
-                context.setOptimizationLevel( -1 );
-                Function f = context.compileFunction( this, "function x() { " + eventScript + "}", "httpunit", 0, null );
-                Object result = f.call( context, this, this, NO_ARGS );
-                return (!(result instanceof Boolean)) || ((Boolean) result).booleanValue();
-            } catch (Exception e) {
-                handleScriptException( e, "Event '" + eventScript + "'" );
-                return false;
-            }
-        }
-
-
-        /**
-         * Evaluates the specified string as JavaScript. Will return null if the script has no return value.
-         */
-        public String evaluateScriptExpression( String urlString ) {
-            try {
-                Object result = Context.getCurrentContext().evaluateString( this, urlString, "httpunit", 0, null );
-                return (result == null || result instanceof Undefined) ? null : result.toString();
-            } catch (Exception e) {
-                handleScriptException( e, "URL '" + urlString + "'" );
-                return null;
-            }
-        }
-
-
-        private void handleScriptException( Exception e, String badScript ) {
-            final String errorMessage = badScript + " failed: " + e;
-            if (!(e instanceof EcmaError) && !(e instanceof EvaluatorException)) {
-                e.printStackTrace();
-                throw new RuntimeException( errorMessage );
-            } else if (isThrowExceptionsOnError()) {
-                e.printStackTrace();
-                throw new ScriptException( errorMessage );
-            } else {
-                _errorMessages.add( errorMessage );
-            }
-        }
-
-
         void initialize( JavaScriptEngine parent, ScriptableDelegate scriptable )
                 throws SAXException, PropertyException, JavaScriptException, NotAFunctionException {
             _scriptable = scriptable;
@@ -338,10 +233,10 @@
         }
 
 
-        protected ElementArray toElementArray( ScriptableDelegate[] scriptables ) {
+        protected ElementArray toElementArray( ScriptingHandler[] scriptables ) {
             JavaScriptEngine[] elements = new JavaScriptEngine[ scriptables.length ];
             for (int i = 0; i < elements.length; i++) {
-                elements[ i ] = (JavaScriptEngine) toScriptable( scriptables[ i ] );
+                elements[ i ] = (JavaScriptEngine) toScriptable( (ScriptableDelegate) scriptables[ i ] );
             }
             ElementArray result = ElementArray.newElementArray( this );
             result.initialize( elements );

Index: JavaScriptEngineFactory.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript/JavaScriptEngineFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JavaScriptEngineFactory.java	8 Aug 2004 17:38:18 -0000	1.8
+++ JavaScriptEngineFactory.java	9 Oct 2006 03:16:26 -0000	1.9
@@ -20,7 +20,10 @@
  *
  *******************************************************************************************************************/
 import com.meterware.httpunit.WebResponse;
+import com.meterware.httpunit.HTMLElement;
 import com.meterware.httpunit.scripting.ScriptingEngineFactory;
+import com.meterware.httpunit.scripting.ScriptableDelegate;
+import com.meterware.httpunit.scripting.ScriptingHandler;
 
 
 /**
@@ -76,11 +79,18 @@
 
 
     public String[] getErrorMessages() {
-        return JavaScript.getErrorMessages();
+        return ScriptingEngineImpl.getErrorMessages();
     }
 
 
     public void clearErrorMessages() {
-        JavaScript.clearErrorMessages();
+        ScriptingEngineImpl.clearErrorMessages();
+    }
+
+
+    public ScriptingHandler createHandler( HTMLElement elementBase ) {
+        ScriptableDelegate delegate = elementBase.newScriptable();
+        delegate.setScriptEngine( elementBase.getParentDelegate().getScriptEngine( delegate ) );
+        return delegate;
     }
 }

[Httpunit-commit] CVS: httpunit/jars quicksite.jar,NONE,1.1

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/jars
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11018/jars

Added Files:
	quicksite.jar 
Log Message:
depend on quicksite jar

--- NEW FILE ---
PK

œ¡4

ƒ0à=pßáâÔB¢U±nj‡vpêÏôJ1ƒoßt(¸~çpN«¬hñüMó¢'[b,$°Êî¤rªûa.2`ÍLÊSÏëí×OE³Qåœ!l¦Ñ­žæÞm'¢#°)C}‰ƒ2
»yï^Vï¤(€Õ«6=¿†á[µaŒ‰”ùߟz_Î	0`_PK





íÔ^ðºËps|—û®ù¥´çÖÚÿyY†^ˆsT=ꈹ¥Ì¨’ƒF9·‘ÿ»cyÎ#Ø´ÛmÛ*µx›º€î›äh"êϐ;+&6ÿ¸5ZaÙ1š‚28,¹²µ]z¾±[º÷`èĽx$€×5Z$1ñº
݉\$µ<nÐ]Ÿ
85U¦ŽÓ6ІiZÍa@™ð)>e§Lø”i,
(¢µHd=w5ÜCìG$5U!:*…¤NޟqCSãdâ7Ìÿ쿀KÕ^A=]˜L‘‚yâ¾K¬kÄ+TÞö¸|•ë¾Êud(‡PßÒȚè[¹~^Ëô‡ÁÓ[$Œ@EN±Ê}o†âgûLIå3EL!qb•±âšúƨ#öb®Põ×bÆý˜ñAL†wû{ÞûPK

J³•(*_ÉÀš²
‡!sà‡ž+E0dkÇî‰ëønÐvê2Aû-Cê@
ésRä‘èå*…švœ—<:u#îœòfOHîl‰ˆ{2ŒÎ¼Óõ]É);S?ä—Â#€w"ò=C3?5ÂõMc)ì3èÕ°E§ž­‰€ïö;M5ܦª#[£‚ý}7j?2êª8†tí²ÖNð¨ê»½'Ïú´GÎý… ê“£Öi-1ÌEœÄ	“Ì´¹ïò…IHSPcdÖÃ~äñm¡6‹×¸Ë*ÛÂ<*æpËÂ,nRÜUÌÍþá!¼°°Ž—6ðÊÂk,[¸¡â+ÿZ)•6¦ØkSÃÊd”:‰qž–W£Z’êw=÷èVèîýÏ5šØé”Ûíò ÅPÊO“1죚‡<z†t{ !¡ÚIo3¡Æ@kV̈́|Y¨O#m$oÓî½Í$­¶}
fHØ¥
4ûôH×¾!ucI'qŽô

h¦)íѼî8ÒˆÞtea)¯»ê¡}ò–~GO-»F>uÚ¶õµIÃq‡B#†i¸§½}W‚£VV
´L¦œZ.ÌKûŠ>ŸçN›R“¿ªÛ†zö7ƒî¢Aì¾ÉŒUH¤+íݖ©9ï®L5l™q-{íŠÏƒúZm™£fâú{½ußW#nåfsNºå³1Ë8Ù[23¯›¹ÔŒkfnx;ì„Áÿu˜tÔ^ð߄È󜤧=‹[±¿¤çäù’˜eo!4á¢ÿ92žåÑs«¹¤bí„q[ fʕ1[Ϥé
${·ci]wٲܩŠ¡;y¿†©Ñ¬\`2(k~üŒ­×Žžrî×;֔+S8Ps‘³¥@O=¶°Ô¦ÀžçYÅ´ÉWjõèöm$·%’µL—
gÝ58ó»7™~fyaA*SÚã
Þ%›q\8X³Dj>5è¶VbŒ¶ãVÛLؑîÝ¡¹‡j`ՎDTÏd¤ãô¤Óiéú¾N®
«i5aÈgÖLwQºF†îÉäý–íŒ3TÛêؤgPajÃy
Ýاáe$4Øp4¸XÖp+´¶NÒŽc(ŒU
k
àU¼&ÐY%}yÙt‚¬Ô2ùԎ À¾)+Qîv‰Rf–°Y¹	Õ£Èò.>Òð1†óOÂøTÃgø\ÃjøRùJÃ=\`cKiøߨß
ì¨ñ>`¸«T¦çoÑ.ôvµŒmX©‰é
fôl–/¢9SÒ1ÜwÝ« »Ò{
±ÿ˜uJt¢o³ð?H–üÅט¼½¬çY!}iIšYï­RGîTj%âZe¬öZ7™Ãûþ½[I¿ê*ãRϪ(Þ،ç«ý=PU:‚bµAá³B)ŒÑ{Õ`쯣ﱵTÛüiº>BHgÎp·pÖÕ;º¥?ƒÝüÐéâç+OÕW×,-ŽûùtŒ³àÜØ¿Ž†G\4 ‡c”3Ќ N B8ˆCœ›Ð‹>à8%ÕYÓcú‹Î=²´o

†O^ûÿÊýˆËÀïhÊàUrt$æ,ý*6-¸0î3¬åÅ¥Ù¥„Ôf :Œ¥™íµ@v'NÔ@¼
Í ÝéQîolcÇÁ.v,xVÑ`Øüÿ]`ظÙÉ4¦ËU 4ƒErÒ¤¯qS‚Ur¸¬!‡vº_3Û}`K£GO©L¯Ë|E0Ó’‹ôç“f¤ËÍo`g´)À&YI5TI:Ò·HÓíÀR> U2¶«Àõ؜f@³»7=§Yâ.!Ìn÷ҜVq?û™ÈÒ}¶÷¼yŽ­âw”ʸ¤±Sð¬OQ¹T.Öð ¥r/¨\<Ä£”ª–ÆyüPK

–
܏!„eÒÊddc0S&¯LÁ@Ñ@ÉÀðÏu}xõÀúl•l·T±Û²,ya;¶ÿR`*}þ*³+ o¸
)0Yµ¹yÔ©IïUkódºêÖ­ö®åÙ*>9ÔývW S­»RGúÒëYž,õd­kû2@ݶZòt¤gù®Gv}¨ÊlÈ&)Ôí+†+'RږÓ*íøží´Ê£'JàD›:|Ûu”¤‘rÃu|éø”¦7m%Tköfϵ»çQ¢R{ý¥.d×ÀCÆ;î‘W—• p~¤‡¢1‘Àª‰8&Éø?ªºxdb
M<ÁSŠåT9S&žá¹‰u¬²ûKŽO qÖñVí@Ö9ºÔøâ…3ÿd¼Ý:mW ”V#M]؃ñƒ¿Ú’þ68™D:3²YO
Ûë¸ï¹=Õ®Àܘ«Ãõ¶Û•Xär› 
M”‹¯Ñçh§Uk|Dzˆlî´oAÎmœ Kˆb³Œæ‡Ù˜£‡À»FTÁßu$y§0¿²"Ìwî¡ýìwh¹
ôÍBá>"{Ç0öL¬ëI=ßG4©÷;#½m†’³$Éa
yR
kCèS
9VÜ$½ònÑÓXy·)*ÄZ“þåÜå½Î¬E>÷®Ô_PK

neÝUžyo;ÃúGØ‰\!¨¦ªRKµé*™Ú”uOËԂrËUéëµ6
–ëöåæž[`2‘<~jÄ­¯ÉçÌdV¹½e©W‚@ç© ïVI¯OÉ2URCE`êØ\M7¢z?±‡è{gÈ&Þ'ñ
júJG|Âão‰Uý}Ñl¡Ò¾{5h¨‚\ðL㇎"Î.Fð±ƒ38ë`	·,#çàòçGÌÁyLX¸ëàžÉÃggd®4|íUåüó‚¬i/ð†ö`®Q*I¶g,Ä÷º/Êç©/*®xEq£0îà>V¬bÂ_c©UÎÔeÍU®”…ÖñÐÁ)œè0Àìã
»Od®[,²E‡ïg÷(“ü3[÷~’­qg«C¼Uº”|?øì]qBù´áVêfk5é³ÎtÇ9èܖŒ©`k¨Sæú»e·8¾UþmÈóž
jRé-^æ±Jf£ühó{Ôő`¹³ÍpÐZfV¸~·­ =1¹
ñª•pŽk¤åü”àì ŽQ ,Ìd´ì8&hÃflxÃ$Ú W‰brb¯Ñ5ÙDèá
°Mk¾’QV>

)¤—¥ÕÄP¥pS¢¼¯Ý©ëʗhc·ßÅ‚>€BÌ:&AEnó°ëÙÙ9çÌÅûë÷Ÿ
ڡܤýâùwT*˜³×s̾dßùGÁž)Øxˆ­\Áž)Øx„ǹB+çÙþPK

1ì$¡`W†’Š=û*Êɞé_86C®52Ý4ì¡Þö]aOb=ás‹!~&lá7¢ÕZ—A9wî8C¦%l~3¶úÜí}“Kò3»†+ä}VTü{á1´Ž¥[ÜçîÄp¹>á}Üõkn;†;ä>
LSjý0嫵0ª´÷»©P]‰ùn*¹^‹¨Þ÷I™n–j;cwÀ/…$ÍÌYÒSC
i
*’H0”ÿ[!;‡¹íø€J•pU›Â…É-nûJ…þLô¡¡—B>É Ë:qPÔè¦Sf²Z{¢C+ãA±„UŠÚ´
d)3¬!·$~FäqA|*^G~&nlÔ]?zAd>:Tk¤©Åi×ÌAž
´‡\‰.‚4BA6ÂA¢‹ Ǥ9ùds²h¶¿

fäã¼ÌÊð´dxF†/׳2<'Ãex^†/iøC
/hø²AœÓqQæ¯èø#™¿*Ë~ÔcVÃ×t|]tý±‚?Õñg2¿¤ã2SÃË~¬Á·D鷅úŽŽïÊÇ÷t|_ǟëø©ã:~¨ã¯tü¨¿Ññ·~ü?ñã§ø™œöw~îÇõ8§áþޏ͢óüƒ,þ£ÿ¤ãŸkñ/ø×Zü~©ãßuü‡¯Ôâ?ñ_räõ?2ü¯ØöB½*¯Õ((ÅOUU«ªñK^ѕGW^2*Ÿš®t™kdðËP«+Cæ:]-Ññ _-U
êýÔ¤KÔ2ù\ؐ¬­Ï•šjÐT£‚v8›ÎgF-…`ÿQó¸Kš©±Øž\&‘Ûª ¶¦rs4§à=œI§9/qøéXo"i‘ÇיH%rÛª[×íSðt§ãT·´?‘²ó#Vf¯9’´HšÉ}f&!ßî¢'7žÈ*\Õ?šžˆMX9+sÂÌX±ÖH6‘³bCæ˜Õ›1Ç&¬TŽGiY+7l[Qß:ßûdÇ@m¬Èh]w‰±fv/¯¤°¼¸7ÿÂ-­—®VdôMÒÎyŽ$ä"Šÿ—õ§3c±©‰d,kNÅöt虵&s‰tŠ¡’)}»Ë׍Œ•4s‰ã–csM"{`"Ùkë¼ä’w(øÙ]¹"ÃR^U®St‘š…"•l¯:’¡æ1[fÜÊÈ^vD¡á©ù#Gì}߈M‘ñP7/ŸM¼Y.ßGÃJ—b<Cæ䤕Šw§Sñ„,YqÇëW\ê^Wó¡î>‰¡å?«„Bm"% ڑ±Ì{¸ÂË/sԊºÇMÁ¥XÒ´¨ÒnQ¹œN‰f֊ÏyJ˜ñ;j£'‰Ô”uO:6Nޘ³™íÜ=0d“’ñôhÞ^a˜Ø8‹·;Ýuq_*¹pwùПÈÊncÿžüH.cÑoÝжØ]*ë´}v”°IqeŸ™ÌSk™£àH>ç$Ý1šá/1d‹ -q˜V\ØÌIrzRv2û&3֑Ä%GÇI{Ÿ’FʲâÙAë„D‰1¯”:š.:D/ãÇPè_	=gML2ÈкH(2ïu9iZ
kÁ·vU<šžñ‹›ŸÌ=ÅJ¦•jšßQàf[y±Y/ú$pÔÀÆ
äq‚7.OqXÂòyC]¦V‘RM†ºœ”º9oïx÷¸W¨
õ¸ÙµX•`0æ®1œOåVÙæŠÊÈ`IîÉdҙfÁ,W›
µZ5Š6u¥¡Öà8}_¡ü”D™bqGt-Žkê*C]-2žõ4ÓP-xLh&†¡®Q­DÕ¥¥CqÌÀûð~C­Saö‹:çä6ÆGèò–TÜ̎K	o™(QÉì±|Ú¦2%*/­¹”Þ2n%“	£¯%5’Üª©ˆ¡¢ª©ß›Î§âÍù”55i±ěG‹u¡£YSë
S×jê:Cm0­VÙkÞHº+¬,R_j2_BÛÊòÛ;;LgsB°ÉP׫vCÝ 6Óe#éøIMm1T‡¢Ñ†ºQ±O‚±i¦«oRÛ5Õe¨ªÛÀÇðˆ¡vªCõ⸡nV»ÕG
ÓxLS·êV‚Mõ«
M
RþÆ5:c†Ú­®5ԐKñë6<f¨aµMÖ÷pÉ4Ô^	žÑÔí†Ú§öê€:h°˜2ԛä¤;Õ]Ž’óòyXÝÍ.òÿwcv×98î9jI>ù¬)¥¬ý`æ¯]Ќ*'im"»3‘¡|:s’%’%bÈn­NVúœ’©}C¹Ô§æ±;ö½»žK;+ÎûÁ)W…ì46—îOŸ°2Ý,a”¢eÙý‰Ü8¥©¸5µûÈ"ŨOž'LæEë¡nù,W~2ËH¯¥ó¹ò‡Âe]lÑÄú9¾TΐҜ]ÖTѸPk_Å~¿¬‚BZ<)_IU­Ý¯ãš†¹(–Ý×λ/’-N„éѝ¥ÞÙÀ—×"Ýsy¥u§ƒ÷$-ùÈî8¹×s®ˆˆEZïòJëì"TÝo¥Æ$„­„)aÇÂöe…ÞX¸æ@¶»¬/.¼`™â	ùÜ{rÒ²d’îšÛ½RyÛte2&ÓÁÓºNÞYE9çâ-o¬I²¿õ÷
öÞ1ÜÓu«cfWYãoZhæüÖ߰؞´ÞüHÖŜ‡ó„4؜™É¹¹àKº]ÑÚW‘
ëXÞLfûÆRéŒåäÒÚù—,°Çš0ÙGit¸9h´\òÞ]Zµî¯'dáÖÊ|C¾Ä~e;>íM3ë:+ï
¿\äÕÞ5’M'‡!SüäÉ>
7.bÖ¥¥¬r)­§fçs(“ž´29"hóë¿1-[q%”Žò}5ªä©CªJg¿¼‰8ØÊøDâx¿bœÙÝà
Ï@=a³'9úìÅu˜àh8H!͹“8æ
o,	?‰ª9a?g`Ùoœ§ cŸ¯#‹œ« ÉÞ
<gQuÒd翁#»›Ëy-uʪ/¬
¨>³ÀÐβs|®¡"}‘Vï¢-®½p
žƒásðÎÀ7-@{AYâñΪî®F#ÑêîD¸<ØV@ÍCÐ9ùe½­ÈŽÎ öjd6ÎÈXç~-±¿–ž¸€úƒ<8ƒeÁå„D”Sp·²€†4>7oÕâ|¼!p˜>ànÞ[æ”íӀ½þ1\f¯Ë,ë2;¾Ú†¥wÐOÝXƒhC¶ —ãÍFîÀ-”¼•Qê§ä 5ч·QÃ0ÁÛÇÛxú4bŠ\ÕÔ4Ž“ü¯"ß5x3ÞBê›ú5/¸±ê­D!ß?òÄvcÚÅ/᪋ÐTÀåÁ+
Xý¹¡=h»Âa,©«³u÷–Ôõ¹êBEuÍ\ùqhžixªª½«Lm¨¤6TRËG?GQû‘#ßr
kkÜ
Ö{ðŒ·ÃSÝî
yÆÊp[£'DL\môpu»wúµŸ/
s`]CðƒéYÃÔ¬§;˜š«˜–Í<t“r,:™–ÌÚâšUÃ4x;z´âøM† )ÿNÀWá
¼ïa¢½WRŠüx>î]ÿ¼Lnsou»cóå§Ñ
y7µûB¾@Ý'àçä
!Ï)ø¦q™§Ý	¶|û§QG¡p$ä›Á5÷{Õôk/Ì¥ûzÔrœ¤öcDA‚®™ài%("Làë	–ͼÁMÜï!0䆻hI
yÅ·ÃBï’ë÷ÂÒèYÜR°«Wh4ÐI¸Û² $߃%å³è§1Ø"êg1@kôh Ydô¢Lpƒ|Úv…kT¶ÏGÛä#ì†DŽv9ð‹ÊINH¢ÁÝ¢¡d„+Tnô²¢ÑŒÞØy¿GM¿ú­9èîcMÎ`	ëhÎb-žä›ã:ð;Ð9PÏ
œg٘%°Ÿ&ˆ/0&Ï0Ê_À×H¿DÀ~_Ä+x^ÕáK*‚3ê:xÂ.9µ|e4àã,	µ®Â'ye¯fÊv`·svßǽÓđ
j±ôI"¥Z­·ËŽGb\Ä©O۝J(AT•M}†VɛŠ¿ìÝrú ]|€!zï¶þHp¸€=§`D<¶'ܕէŒT“c¯'^ÀíÎú¾ö?„ÆHð€M"Áƒ6±°Sí7ËWié‹XIoÄðõ²®5TBùsÁ魏—’UZƒHoˆœÇÑó8dí<Þ4m£=wžÇ]|_þ
ü,VwO£V¾ÚÎÃ<³àü—xþ7H“þ}Ù>?ìh.¿ÁÍ2/ºäV¹›ñY|Ž6s+ÀìRø}|ÞõÞ6·Yû‘§à]øvüu}¿ì®¾ÒY>ü}WELUÔux¡®P×Ñõ„«ë¬-óä¯

Â@D«ã'~²=‚uãÀ•Aˆp?‰mÑÇÏÙ\x

Úø
䔡&¹þùPÜ&4;O
ÝA)vqيBm'‚+ˆÎ%M®

%³¯qqN‡Åqž+×5ÜÔpK@}åïx2ÈÕ6ì׶ղ½¦U×k.ðéªɐ’hÝ
ókŽ¿imÊH;v ­ÙÝHZuZ©ïzѺŒ\‡0]ύ&‹§J+}UU
ô×\O.mo6dðÜn´$«ò»µb.ï“b‹¡^Uk÷™Û\̧¹¨¶ì0d¹Ó§4,t`¬·)£%Ÿäíp±ÔkJØ;vòh{mMt®År{†zØIGŠÇ¹Øi:7£·g˨$M'ã6êþvàÈ'.ÛÍ°ê9f31„Û&0(0Ú[À ûØ_~Ú¡t!oâîšèG–ÜÌÒö,²&îaBÃ}ÂÿŒJ`à°ßrcC:TJّjomIoU`¶—åSæùíŠÀøÉp™ž¬Iï;…uS¦°Š9荀?•²!Ó:B»Eº¥P4ÊåÊ(ßbährxƒs´Ž¶oab#ᤇŽ‰„ËI¸f~!õò
ï4œIê˜Ä%ú¹a¾ÓЊ÷@ši÷ºtˆiÌö…„FД¦ºœ«ì:sèڈ«	ó鈵ã\Å̍=…hÝB>÷rµ·­[ÈÂ|=AÈt,D¡)1¦ˆñ%è!ÜÀyˆPK

p®	·ã]âónïÁ{¼ïWð
|P?$zrŸÊøX3ZðqŸPЊ‡ÄŸ”ñ)m8§Ðȧe|FA»0ÿYEû9Î2‹ÏyŸW°‰ÁüxDÁñ%¡ûeÑûJ3ÅWýøZ¾ŽoøñM1þ–ßVð<æÇã~<áÇwýxR¨\ðc֏‹~\p.ûñ”€wŏ§e|OÆ3Z†3©T&=’ÔSzڒ Ž¥Óº9œÔr9='¡i8“9hÄœj=-—ål{ä„6¥…ò–‘
™¦61rÖV=–3,½$×d÷j)]B›£“ÔÒñиeé8¼Ç’™xF‚Â%Šë­Žp½PJ·tó´fê¡Óú¤0çgUµ}a#mXƒ{×–àÎĸPkÄHë{ó©IݜÐ&“öҙ¨–<¬™†»?z¬„Aˆuãþ¸Î°h¦zë‰:Þ™Ð.#ÉQmÉ	=•MjVM™ýZ\ßí,š1·
¿šË‚*aeÛ®qKÿÇ襘£¢È$̹)ç,‘„U7ƒ›Û/à“ÐsSnp•X&šw<XɘñÐé
ÑPŒª;Ýß)£ŒLGõ¬edÒ9ߗqUÂ-QS碇umïšúg¤Lšve½ üoÔgmቄå5—<¢O
*ÌqÁò?ž1gœzJ1*ÎÕb1=6^¾Í£õN[
c½(”üðdm\t#ӔNkIæYMtׯfGs<«EigeMµ;ôtÞ:qÝ/&ÿ|êTIÿæ\¹P{ïõ2âüûK$"ÓjÄf9Wèy
i-œ”ìŒéðHïNI‰ITÚ-g<-›ÕÓ1áþ„a‰¬Ùv=¶ùãÇu³^ªÚ§Ùö¢!7)aQ-+"ÈyÓä†9Ç­^&Í2®Ðá
~^R­@Ò½6›LjØ=	þGKœVu•\AFгëgÁNgòfÔ¥§&ao0£b'FÈ
ðz ‡C¶7âÆ0™‰Í°£†Ã؝3£ÂÜ)a®1âŒ'œXÏÆKõƒ*^Ãý<³á˜1ÕmÄ"¼
þüw<(¬…ø;…׎/ɽ”û&OèQfÜ"Q
¢wG™ÆöN¥wñWçîÆ)û&¼Ùß~J	ùWÐz”1œ¡z7ïHßcE¼s(lA¶2ˆaÛGÏ
Zšq÷Ъ
“®õ×»»ÓÊíhãvÜ2‹ùWÑV2쳧‡Êv¡Õ5(!ŠX3í4³À6Ó^ifW3qpÍSZ`nÛTé¢bOí¡#‘2÷š]3¢ç&÷0ªàZH\‹l\+q¨êÞ	œ¬b¦ƒfÛf:*Í®j†Þ5²Ñ1•èޒJå»Ë”½Eå42®ò _°ï–”Nª–{¨£•…ÅW‹Yf§XøTU •@ôª@Ìê@:+œ ÎÉ@r.y×Ö6n¿Xg»TœîeÐEP]•Ûž! l°yE`SEcå^uUz•¯êÕiL»Êÿä‹:ß×Ö=Kž˜Å
6sÙ_¹ö2VIਭ‡Ÿ'°šß#}m
6œêå5kÍ%Å|_ùüÚòAù`]Q“Z!W÷Ör‰õŽ„»ìm¥©R¸—Ù´w/¸ã·YÎð܏·ã
<Œ·Úîv;.·à<f¨!Ù½û¨ÓÀþê8!8ñ ßžÆNÁ16c.½N›0[÷öÓÁ
gH•¯•€,°éŽ|ŠgÑÁ×Ç2öWá9@;8ÿ


»2n	;ã5°°Ÿ´g5qs
ú'	ëßϹéØȂ@H•¤„R ø<zh1Gö
PK

•{Wšâ¼]­ÄÍ2mkU‹·a'j#‹ÇҋÊCûë–Y;´fvvÿCpn­‚GŸÐ•˜6oXaÜi!¾mù—^jÂm·ãßø¿(²—ÛÖi™—UðscÜIÝTìeù„ÓîÀß̐vûûz±íûB±’„°ƒ$,„ݯÙGú1FpzûïPK

ÍG“EÔXSZ¡U4š¶ÐR*?6Ém»L>êîªOÎÈ8>ó„ƒO¼8þ,ŒŒŒÏþ2ッxîn†ª]±3{î¹çþι¿ß¹'ýõϟž
¥æÄ:/ÌÛœUpN…d-³(¶ïï]áWðžXßW0¥ ¢àùŒÕ¶Üy†H&{™AZì48Ã`Õjóån«ÆíKf­I‘dµS7›—MÛû^Prw,‡a¢Zﴌw¹}Ó´¹q“×ËåÆ™u×j:³ý6oš®uƒ¯¯Vf2Õëæ
Óhšímc͵­ööìÁHö`ˆYôU¨`½kÛ¼í^0·}z!ÐX›ïõÎ÷ÑîCjóp
ˆ×L‡WÚ
¾Gᖹ×sûœÃèÜ…îÖ·©Âà6wW{:ƒBS!B³¡·Gºv“!ºkÚ.µT ]êžqζÍ/ª–ã*ê¸ 4o7ÔµN×®óó–xŒçí.Š\
£Óð!ª
(*XÒ°Œ
p‘a8\.

«X撆uÐT¤BȈÒTmi¸‚‹Â»ªa×ÿ.®ác|ÂpäÆä™+µë¼NJKô~e‹¦-SÉÒÃìc–üGZV›:“©øÇ2ÿ¼kŠZúß[T›Í^%€¹»ëwo:ìmþûqg_ps;A„a(:¸q§[szaA6t
ÌFCP?•ëKîÿTI¨âvüÇ`Èd6C¤†Ä0AÿJF þ"`b@ȾL;ƒVFk4÷ìGrúp˜¬ì1NV

§ý˜ðãŒge4`,€s<žçõ
LòÃEªŒ
	
“¶Èæ2ªMóÎXÒÈF³ÂæŒjŠèŒHXš-¢ƒš)’¶a^/BÉÞgOkVû6	m5ŒN‰Ä
ºÑ£`Â
:YÆ+~¼®`/謪R&Jh‘„±¼nkYQ¶ØZÉЁüԔ zn2MÃ+L¡Ô!!Õ)xo*8ˆC<»Ç·¼Cœæ.ïð,‚.*xù.ýxWÁ{xŸQ,б•ÈRð!>Rð1û†R†°Bºa‡Ä¬fQOúDÁ§øLÁçø/|ÅÞ¿Æ7
¾Åw
¾ÇÖÔ¢˜v÷’SM‹7¢àG\/iM¡¦XëÇOtžà:SÉ;š¸DZ	ua¾4[–y¤¨!¨¹œÐSº«5„‡Tnuú*ànðGÁ¶áj(i:ÿÚi•Ý”Mµ¯î°©¦Ýï'»1àYÓÂÅZ<ºmᥚêÍÍç”ÓrX:Cu&û–‘ÉÛÂíymKáj.ܬ¸Èªtx“d½‚)KW±£"xg­«ÙXܨ󈄫㖚3–L›*u®7ž¹MzeY[憸·jA—ßkêy-“rüTMóáú×x£Ð{ä€jQŠ[ªdTÝ&˜£©·ÕäåqSM’íÆÇ^l¤OúªñÂÃ
ŠfîQÎH€Æfî^è»‡>šE±äóôÔO(rdR¤ë<·ËíE$µƒd«‹ÂN¼äx‘‹>%ôbW…/û©[ô#;Ú]¨Çî2_¾’/éί¾ê¾¼•¾úÉ×¾¾ö}Qk.úú¸©§±—öXßÕÝS€ï&zv{ï"0q
s›P"¬ ¡y%‰µÞ‚4Íá©¿o;<ÈXAŸgn­Ž¿AÒ$킦ø‡œŒvÒZr؇—).E-å֋ý8àøêÅ

ñwä)_×¤*E¨JñÌgäCά[ñ—ÙîžîÓgzÎìëÿúÀ,6’xs>M"†¹†ñ™…Ï“0ñ…Ž|©—ùŠ¸®—¯ôƂŽÝH2õkíÞLaKnY¸-¸å)Y	šjGÀ^ö}©–ên«%[tŸT£=O»£¥§în¡xõÂM¥Ü’×
Š}×=ßâÙ܆€±Ô¬J¡’ç˕v£,Õº[®3’.5+n}ÃUžö£ lyľ\ª4…†¤zæ*Yx&Ë-/…G²¼ä²Fzì4TQ’^ãB6wråän
1Õ½ê™w¬í¯I·;[Ù#jWݚ¼ÛMkªâIk\Öec»N¬ãrŠz ý4B4‘ž+XŽ¢úLµ·
¦Nŋ¨AÔ_`ò4,yU:(pþ8¾ƒîö¶ô«÷¤ß&ÆÀƒl—tÝõk…µ@y~m±½¹)O9œýµáHb­²ÀÙ£pµPÚJI?Њ¼¦¯Åw
zä”\k¶UEÞñ´4‡{d0««mŒá}3‡<#pÞAO펍»øÆÆe,[øÖÆw(Ù¸‡¸dã>Vm<ÀCkxha݆ƒï&Nì"pñð}-뮪É@àÊQî}tzÚq·Zåóï½Çûå§<E1÷ƒÀŸà¡ªLŒ
X[nkEþ„V~茼éEgNHt4»|è®ÅÝ®Æþ_¾{¿)&ìIàÒÉr;V­œ&’ÛàUó—
P¶Z%´ڔ׳ô§çŸCä_"öø9âÂø±ƹ2Ì7è
áÎѳ»5ø
¸ÊÚ
뉌~¢~ÂI曼¡4ÄPK

:ÐÉÐärA(#¢`?ÚB·‚cb¡aÏ¿W»‚·ð¶‚Sˆ1lqÏ[Æ;
ÞÅ]ïគ÷ñ‚ñ‘‚ûøXÆ'
>¡?÷ñ¹‚/Ð-ãK_áëÆ«a[1ÒH>chi^²¹y@׳z낮Ä¡UCk›ðýPሂq|«àô+˜Ä†o6†V÷}qâcªNWÓºB‰“-Yµ:3Sv×
ǯó„Ñ+î§
.Ɯ­·ŠMð:ÃÕN~忔[¥½ÂfáQ·ß¶®Pj j3×æÐPûÚ¨
ÕÜ¿i^¬.Eìö>¬l:6„pu¿;ù•’,ʈ
˜>12Ðv•vƒÔ¹B»–ÐÉ
a|FÖZaØ»ËŒ:n†ÏÒ;U¬ö“m.Y¹·w‡[M¬O¬Â
³€n°›>EöÞ¨¦Ïºè«©J\æLÍ
íÓ-Bcýë#KFs}x	,¼ŒªÉ%T?‚硉ˆÒ(>”€VxÈë
OöxÏÒÌpݶ¯(ÍbÏþÞ’¹Ø^ö:àC.à%Håà.Wðaq²¨2YJáÈ#x˹$L·éa‹ee{OGI#ø˜CäEš…U#‘c‘'# ¯NÉò{”ü+ñÛhûõÒGbí·Ç×ply_9Ç>B=¿ÇçH<᫏,Ö*íû¡L¬“®bÑEiƒ‡m"MËðÓibäÄ) f"RÌ°–ê8†Ð@š™5Ù.}¨Á	
&˜œÂ€íü…ôÐìG::Y
Jy¢Ã¼`º[†N¢~â´ÉÚO‡Lk?…>k–(½š¬lŽp>Ú[\Æ&â_Ûãíz;ÏQçAõa©YùPÿ=Ââ©Y* áwø{ä 7(i§±€¦Ÿ°™Æ‰»{ð÷Ÿ6¾Ùƒp
[z¤ ç	vÚÞ ©>ZÀSArÔTÀÖ)”‚^zzŒ`5`ww-“6 q;™‰íd±„¿=4sºG/Ëm¶=$¯ÊOï°&L`^"E&IÌ	Êû
F1Eÿ®â¦	'ä5zï©*a*7KZ ä9BÈt,qžt•ÈßÒö"Á$5ø• D¸íäoŒÖH1GëEGëEGëE[kñt‰°Ú'FÖÁNÙÛÐé$•v	¥£Õ‹òNÒÝ0WrÀ
NГ3ŸV‚6Pêmæ
O:ÝÜo¨Ÿbì¦ÂÜS"EçŸ.)ÉÒºl7Þóò?PK


[ZÖ6mÊhݖÍIÀqJI¡†˜¥3Óe:P¦3Ði§̾tJúŸûždÙV––|¾ï.çž{öEo|øÓDTË#:EéWý³F¿Ö©€þE§Bz_§ú@§ý«ÿ¦Ñ¿kôý§NÅô›þK¾ÿí¦ÿÑ©ˆþWÿ'ÃotÒé}þ_§ôÛbúÎ31ËPàæB`eG%Øéf³¦³›‹äX/”!ÃYN•Ói2+‘Y)ftVf7O—ïËx¦³d˜­³—ç€.—å\
™'/]öøR™ùt¾Œçk¼@ã…:­¤ßºy‘ý¾À.Ö¹‚+e¨’¥_.Ü\-×h\[DÔx‰Nô¾.uó2—ë´k^ÁAÃån^YÌWð•‚h•Rãæ:Y¬–;ktàµ"Ú߸¹ÞÍët¾ŠdX¯s#oиÉÍÍnÞ(ÀW-Å|
o’¡U†67·Ëöf7_+ëëܼE¾2tºy«›·¹y»Î;¸Kãë5Þéæð(t»˜ô֖ö¦Ýë·45lbò´î	í£¡X_°#ŒÄúV3Mmß¼»aËÆݍ­
M€Ú™Ö
¥R€Ò,(OÏ=ÞܽÇ§q^¼¡¡³iwóæ-m
Ls-´y ìˆ$¢æ†PÚlŽ'B<3,X
ÌBA³ÐBÃTšç墎ƒ±t¿™Ž„ó\´¸`š‘s0˜ŽDÊ{L®5‘X$]ÏTXYµÉÑïÁî´ÖHÌlè6“¡î¨)‚‰‡CÑm¡dDÖö¦#ÝI1-j
Ç‚fÚLî%ÍàhpC<<8`ÆÒæ@(ʄNg÷`$Úô¶²5žìî_öàbtõd©MֆÉxº&ç(iöF
l‰í‘éH<ÖJö™é¦a3!K¼]–Ÿ»ïî±_‡èòSÅdd`¶Äãéñ6’Õn¦=4
Çäc¦ÒfO“ÅS[å$¿9—µM`n²€Eœ.X{¼Gxžl‡mêLxN
vgI¸,²=Þ1î·àr­q^.³fx0IÌ=Ÿ³jLšð\ë®Å½[,ƚ¤º™fOÙúÁÞ^3)n‚8„K§Ré3µWþÁâÈï£F"£Ye¨cKË=@Æòø¤§ò?>%óÚ¶PtÏé=f*œŒ$Òñ$Ó¥¹¨3DlȬÎ!¶ó`BˆÝ5؇{"´À)fÙnC²O¹sC27Wž×Ô2TæME¢H›f‰ c"ººò"RuAî܉,VݞFLpäÛyÁ«¥ ÉzgŒ²+óølž”Ï‹=‰IÀ³’fj0
q§M¤E•¤¦$Bɔ¹!©3q"6G¢æ„8š¹—(¸*#)Ip¦¾p‚ÞHß`R¥‹\sôF$µMÿ‚Æ7iRZ‰™¸dîhkeZS™'ómk‘ü(ñßöþüü_ôm	x‰„‹g“¥nûøùp‚èÊüŽSq‘·‘?öÀb¹A֎E*§$ÍØÛyÑØ<“0¥&”QY¡ifF.ÄùÞ¢þÔqÙ
,eš?ñ =žnŽÆƅî‚KðԚpÔ®§ôŽø`2l6+kš9©ª”wÓ{ð¼¡gº$7w( 
f¯”LƓ‡¹Ç ²‰n7è3ôYƒ¢‡™¿G„t6½e„˜9‡3ó›Җ"—M¾8òeê¡:ŸÁ½Œ´@fý‘åƒ÷2‚éô<E™ÁQº]ã
ƒc×8aðÍSŒúۑ£¯?”òÅâ¾$¼Ä'QÓà4tna*¬µ‚µÖ
?½Kïi¼Ïàý|Ààƒ|‹Æ1øV¾ÍàòíL¤w”ž2ø™½D#}…†¤ÂEnÐ1:®ñœ|ßmð=|¯Æ÷ü	þ¤0ô)Ùþ´AÏ
¥(mðýüƒiŸÆŸ5ø
~‰çùŸ©ü<Ù_ŒWe~ƒ^¥×4~Èà‡ùƒ¶_¡ÓÝ:wKGŽ?oïç†dƒ|éØ~Ô×g&
ºM¦*DÒ)ÔZ‚ÚÊFP64þ‚Á_ä#PŠ/뢓´/5˜Hēðg¿dðcü¸ÁOˆ¶Éà'A2í'(á(?…>ckLb/÷Á}Ƚ¾LV¨óiü´Á_æ¯<Ä_ÕøkÞdªýý‚:š…±g,úB>릯v‹P”5×T†¾fûö
3XZ»¤Â·®Þ ›	âù>ý@ãg~¦ÂÏñó¿Àðïµ}—Î èT|L.X4ø¸@œàQ%û|@^Dt˜Š0aÖ¦LPBÚÓø%Q«HdB,ȸdÞFQ*›š¶¶¶šƒøiÁE´a¨Cs²<TžŒ§0‡ñˉH-ѨÙŠ6„Ãf*•2[R®<‘‚*:väMϤΖÍ9»Dmåºn¶P3*óæƲ|
Z
o+2U_T¯-|=xsR´›5îíÎþd|¿ØÉê	ØÏYÃd±»ÓñLŸ=-/ª¤Pxog2ó'Hé ¥9’L¥­.L‘§å+™¸g•†2³ÊS4î0(كtDº£Š·´
–M¯Ì—Úfåµ)ÁÿúlÏ·ê¼õ¬µQ•·:µxlȦ¹yß#Î>×Jc`j5c}é~Å1ºW
‰
1”–¼rËÉ29Ã^ÙÅuÉDMJÍ -äæ^ Fà/Bó–²gV¶´ä5SW¸?”lH[—Ç%´Fœ„ÂiɏÅéøV˜m²1”’_M*´Ÿó4j•ù,R¾cµ"WåqÉ¿L墙ԡÎ>×X‹ LØkN0
Š ó}b¢óŠDûÊꌆÇ[:$‡®1þ@Õüʪ÷UšX§²Sq˜-f¨'«„^;Ð/´	Ìæßs´“Sc&⬗ßÌdsHœÙ¢8fîo‰¥Ò¡˜©j[îs×*Ø÷O8”¢ú"p¬¶3Ðy˜œê8/ª…°i\#Ršzì¾ ¬²*oO1ýD4ŽŒ]9G
ºÞŠ,Ù–¢¬oMö[¥÷Sª_Ì÷KÀÅvI¹Që 0Ðe” "ÒhŽÔ&˜Í‘êS}Q{â«Kµ…¯[Jcbú‘ZÝ:nu[Ϊ3ô?†U_TnäôŸ$×1L
èŒ.µYCwb4,
f³±9töWØw†…+WhÏÊÓ£äÔ
§×y†½N‹Ã' \rŽRÅ]fﺧ©öT{‚Š5~Oå(UÉÖlÁ0töô˜5ÕÓ4Œ-PÃ5à~TÑJÕÔµS3m†¢Ú¨›¶@Ì0ÔNXØVú"m£§°÷u)Imš›!¯G $¶œ¥Ï
ãj¢ÏcÏ)RÒ#5;¬Ôé¤gèÀY€w
yô<—UIÆ66‰<Wž¤U­
aVôÛ~‡%úíP‹gLî3•}ìø¶x€æ"\.9c²ÐóJöÓpöìGdŒŽÛ²‚¡¡Úòåd+Å¿,_(µ§Úãä¢R?üőq­c2§p}sÌ)æ(eÞNSðÀbì,1+°¾
a6µÜˆc"+xˆÔHÍDj¬f'pZ f/‚|K~.ìXýØ¼‚3‰–— ª:‹þb±‡Õ¯“ã˜LÖÀíe]çò:kFimæuù½Œjûї¨Ht/Æû¨Qk.âÖ„Î
¾‚þŒþߌý}Dü%ý•mB;ì¨:Wԝ¨Ç鼋°êÙ<J»Æ‡QëÅïP	t=š3Ô¹0Æ¿Æ·¯gÂç÷éÖ+»Áª
‹Xç—
¯d
B5Š¦™T¤>E»™ÚW:Ê50ßU5eŽeu΀Ô7À%æûK|¸áuŠVC#RxÀçºe‡0í3Ž•`êɔ/ˀÏ_R/IÁ¯nn÷{Lhæ]uf1»}ˆ†°>±ÎU¸R+Cä7y]eÚ²:wÀë>E}(Š
Wêeº·gõÞ¢2}Y]q™
"û’Íï-¶U¨êÙ~+@˜‡túê!
ãcê¦ßÁa–ˆùJ<ç&s,߂HL°¥°¦r¨zÔ€¢WBÁ[±Þ	ß…ôB	{¡†ýÑåGhþiøoáæoÁÚ߆}þ±ôXçßÁ0~
È¿Ä?ÐÏè=úÞa½Å:ýœ§Ñ/øRú%×Ó¯•Òï‡)à)R¯8AËZÀQ‹8öC˜äk¨r„=o\œId…Ó¨p~Œ×‹Pݘꆟ# åm	F¼N™©ÙO€…Õì•3Êy!h|x#hü)þàîÇ 5©å» Øò«vÛ¤=,,UØ+vœ$§åB”
Æõ9×d
Ù3ýý£ÚõÐϕ÷fš¨_d›¦Ê
P<yöŒÒÞtCá+=AKñi8AË_¦.Oì$ÅOÐu¢2Î)ý‚@´Qu)ž[†“R*ýåï


Š5ñLè†ù
YMëK3d¦5í |›>€2¾)$hìÂYÌÍ{9÷¾»ùú\aâ,D_ —‘²”»‰²$p1Œâ…zWÒ¨<“3Wê<»0wçxJ–Ž<Y	\£y{®«ñêÍèTï-žþËF/¼çä	UŽ^ô¨¶íyw۔1ÓÂJKŽÊU’\Y#ŸJíH%†ž㝝‹u9ò¾ÈÝ6¬3+–eJÚp»«ÇÈ߸þW¼@_mš,(u€@þm´
ÖCµ†8ªõx7wЭõÄsì<必Þ7PK

	Ě…¸vš#…Í\ϝ{ÎýÆ3óãç—o
Ü+Ñú==ã=2ónØçޏd2×IC½’1CÛ퇾ã%¢·<Αï9Ï#©DRõbÇÝö„/õˆÇb¡6jS©Hö†Jt¹/È¡aÙûî!Ïg—Vƒ
ÕÖe¼}ôړ}y"Iªÿ®µ_2Ìðqۄ9DzAí»"Vâ@ci„Z6O¹¼Fû“í–ZUÄIšQƒ­0P#ëËΣ3U¸EüÚî=TÒs\«ÿélx$`8›µ`(ï†Ã¨/Ëäü–þqJDVÅ4Ê䑥dXžÃD»ŠUÜ®b	krz{âët
ïiïPôi׳§7M#–ïEz߇5~ÓFšu;'g4aÒã!½$“"ý+4s(2Š¥Ög°OôQ@•Æ©4y34VG˜ÅEâD-+.~EácFÜÌÏ£®Å÷(ñ!£\I•‹£U­L¾ÐH.NÐÎ8‡óZ|_$âbV|gŒ¡ô‡¡„šá".i›UÍP`Y»c

œ¡4

[Httpunit-commit] CVS: httpunit build.xml,1.83,1.84

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11018

Modified Files:
	build.xml 
Log Message:
depend on quicksite jar

Index: build.xml
===================================================================
RCS file: /cvsroot/httpunit/httpunit/build.xml,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- build.xml	4 Apr 2006 22:58:36 -0000	1.83
+++ build.xml	2 May 2006 01:14:17 -0000	1.84
@@ -23,7 +23,6 @@
     <property name="build.dir" value="build" />
     <property name="build.classes" value="${build.dir}/classes" />
     <property name="test.classes" value="${build.dir}/testclasses" />
-    <property name="quicksite.classes" value="${build.dir}/qsclasses" />
     <property name="website.classes" value="${build.dir}/siteclasses" />
     <property name="example.classes" value="${build.dir}/examples" />
     <property name="javadoc.dir" value="${docs.dir}/api" />
@@ -314,28 +313,14 @@
 
 
     <!--  ===================================================================  -->
-    <!--  Compiles quicksite library                                           -->
+    <!--  Compiles the website generator                                       -->
     <!--  ===================================================================  -->
-    <target name="compile-quicksite" depends="prepare">
-        <mkdir dir="${quicksite.classes}" />
-        <javac srcdir="${quicksite.dir}" destdir="${quicksite.classes}"
-               debug="${debug}" deprecation="${deprecation}" optimize="${optimize}">
-             <classpath>
-                 <path refid="base.classpath" />
-             </classpath>
-        </javac>
-    </target>
-
-
-    <!--  ===================================================================  -->
-    <!--  Compiles the website generator                                             -->
-    <!--  ===================================================================  -->
-    <target name="compile-site" depends="compile-quicksite">
+    <target name="compile-site">
         <mkdir dir="${website.classes}" />
         <javac srcdir="${website.dir}" destdir="${website.classes}"
                debug="${debug}" deprecation="${deprecation}" optimize="${optimize}">
              <classpath>
-                 <pathelement location="${quicksite.classes}" />
+                 <pathelement location="${jars.dir}/quicksite.jar" />
                  <path refid="base.classpath" />
              </classpath>
         </javac>
@@ -353,7 +338,7 @@
         <classpath>
             <path refid="base.classpath" />
             <pathelement location="${website.classes}" />
-            <pathelement location="${quicksite.classes}" />
+            <pathelement location="${jars.dir}/quicksite.jar" />
         </classpath>
         <arg path="${web.dir}"/>
     </java>

[Httpunit-commit] CVS: httpunit/src/com/meterware/pseudoserver WebResource.java,1.10,1.11

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/pseudoserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21513/src/com/meterware/pseudoserver

Modified Files:
	WebResource.java 
Log Message:
support response w/o content-type header

Index: WebResource.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/pseudoserver/WebResource.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WebResource.java	6 Mar 2005 20:20:10 -0000	1.10
+++ WebResource.java	4 Apr 2006 23:08:10 -0000	1.11
@@ -82,6 +82,11 @@
     }
 
 
+    public void suppressAutomaticContentTypeHeader() {
+        _hasExplicitContentTypeHeader = true;
+    }
+    
+
     public WebResource( String contents, int responseCode ) {
         this( contents, DEFAULT_CONTENT_TYPE, responseCode );
     }

[Httpunit-commit] CVS: httpunit/test/com/meterware/pseudoserver PseudoServerTest.java,1.15,1.16

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/test/com/meterware/pseudoserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21513/test/com/meterware/pseudoserver

Modified Files:
	PseudoServerTest.java 
Log Message:
support response w/o content-type header

Index: PseudoServerTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/pseudoserver/PseudoServerTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PseudoServerTest.java	16 Jun 2004 00:10:53 -0000	1.15
+++ PseudoServerTest.java	4 Apr 2006 23:08:10 -0000	1.16
@@ -200,6 +200,27 @@
     }
 
 
+    /**
+     * Verifies that it is possible to disable the content-type header.
+     * @throws Exception
+     */
+    public void testDisableContentTypeHeader() throws Exception {
+        defineResource( "simple", new PseudoServlet() {
+            public WebResource getGetResponse() {
+                WebResource resource = new WebResource( "a string" );
+                resource.suppressAutomaticContentTypeHeader();
+                return resource;
+            }
+        } );
+
+        SocketConnection conn = new SocketConnection( "localhost", getHostPort() );
+        SocketConnection.SocketResponse response = conn.getResponse( "GET", "/simple" );
+        assertEquals( "Response code", 200, response.getResponseCode() );
+        assertEquals( "Response", "a string", new String( response.getBody() ) );
+        assertNull( "Found a content type header", response.getHeader( "Content-Type" ) );
+    }
+
+
     public void testChunkedRequest() throws Exception {
         super.defineResource( "/chunkedServlet", new PseudoServlet() {
             public WebResource getPostResponse() {

[Httpunit-commit] CVS: httpunit/doc release_notes.txt,1.401,1.402

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21513/doc

Modified Files:
	release_notes.txt 
Log Message:
support response w/o content-type header

Index: release_notes.txt
===================================================================
RCS file: /cvsroot/httpunit/httpunit/doc/release_notes.txt,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- release_notes.txt	29 Mar 2006 02:53:49 -0000	1.401
+++ release_notes.txt	4 Apr 2006 23:08:08 -0000	1.402
@@ -14,6 +14,12 @@
 
 
 Revision History:
+31-Mar-2006:
+    Additions:
+        PseudoServer:
+            1. Added WebResource.suppressAutomaticContentTypeHeader to permit generation of responses without the
+               Content-Type header.
+               
 28-Mar-2006:
     Notes:
         1. The build now uses the ant-dependencies task (see http://www.httpunit.org/doc/dependencies.html) rather than

[Httpunit-commit] CVS: httpunit .cvsignore,1.4,1.5

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15683

Modified Files:
	.cvsignore 
Log Message:
ignore web directory and archive

Index: .cvsignore
===================================================================
RCS file: /cvsroot/httpunit/httpunit/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Aug 2002 17:57:47 -0000	1.4
+++ .cvsignore	4 Apr 2006 23:00:16 -0000	1.5
@@ -1,9 +1,12 @@
 build
 *.ipr
+*.iml
 *.iws
 savejars
 dist
 lib
 bin
+web
 .project
-.classpath
\ No newline at end of file
+.classpath
+*.zip
\ No newline at end of file

[Httpunit-commit] CVS: httpunit/site/com/meterware/httpunit/site SourceForgeSiteTemplate.java,NONE,1.1 SourceForgeWebPage.java,NONE,1.1 WebSite.java,1.2,1.3

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/site/com/meterware/httpunit/site
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14236/site/com/meterware/httpunit/site

Modified Files:
	WebSite.java 
Added Files:
	SourceForgeSiteTemplate.java SourceForgeWebPage.java 
Log Message:
restore website format

***** Error reading new file[Errno 2] No such file or directory: 'SourceForgeSiteTemplate.java'
***** Error reading new file[Errno 2] No such file or directory: 'SourceForgeWebPage.java'
Index: WebSite.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/site/com/meterware/httpunit/site/WebSite.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebSite.java	29 Mar 2006 01:27:26 -0000	1.2
+++ WebSite.java	4 Apr 2006 22:58:36 -0000	1.3
@@ -2,7 +2,7 @@
 /********************************************************************************************************************
  * $Id$
  *
- * Copyright (c) 2003, Russell Gold
+ * Copyright (c) 2003,2006, Russell Gold
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
@@ -19,11 +19,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  *******************************************************************************************************************/
-import com.meterware.website.FragmentTemplate;
-import com.meterware.website.Site;
-import com.meterware.website.FilePageGenerator;
-import com.meterware.website.PageGenerator;
-import com.meterware.website.BasicSiteTemplate;
+import com.meterware.website.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -36,6 +32,8 @@
  **/
 public class WebSite extends Site {
 
+    private int _groupId;
+
 
     public static void main( String[] args ) {
         try {
@@ -62,7 +60,7 @@
 
     public static void generate( File siteFile, PageGenerator generator ) throws SAXException, IOException {
         Site site = new WebSite();
-        BasicSiteTemplate template = new BasicSiteTemplate();
+        BasicSiteTemplate template = new SourceForgeSiteTemplate();
         generate( site, siteFile, template, generator );
     }
 
@@ -72,4 +70,74 @@
         System.out.println( "Usage: " + WebSite.class.getName() + " <target-directory>" );
     }
 
+
+    public WebPage createPage() {
+        return (WebPage) addedSiteElement( new SourceForgeWebPage() );
+    }
+
+
+    public ProjectPage createProjectPage() {
+        return (ProjectPage) addedSiteElement( new ProjectPage() );
+    }
+
+
+    public void setProject( String project ) {
+        setSiteName( project );
+    }
+
+
+    private String getBugEntryURL() {
+        return getTrackerURL( 100000 );
+    }
+
+
+    private String getFeatureEntryURL() {
+        return getTrackerURL( 350000 );
+    }
+
+
+    private String getTrackerURL( int trackerType ) {
+        return "http://sourceforge.net/tracker/?group_id=" + _groupId + "&atid=" + (trackerType + _groupId);
+    }
+
+
+    public int getGroupId() {
+        return _groupId;
+    }
+
+
+    public void setGroupId( int groupId ) {
+        _groupId = groupId;
+    }
+
+
+    public void appendSourceForgeHostingNotice( StringBuffer sb ) {
+        if (_groupId != 0) {
+            sb.append( "  <div class='sourceforge'>Hosted by <IMG SRC='http://sourceforge.net/sflogo.php?group_id=" );
+            sb.append( _groupId ).append( "&type=1' width='88' height='31' border='0' alt='SourceForge Logo' " );
+            sb.append( "naturalsizeflag='0' align='TOP'></div>" );
+            sb.append( "</div>" ).append( FragmentTemplate.LINE_BREAK );
+        }
+    }
+
+
+    public class ProjectPage extends ExternalPage {
+
+        public void setType( String type ) {
+            if (type.equalsIgnoreCase( "bugs" )) {
+                super.setLocation( getBugEntryURL() );
+            } else if (type.equalsIgnoreCase( "enhancements" )) {
+                super.setLocation( getFeatureEntryURL() );
+            } else if (type.equalsIgnoreCase( "donations" )) {
+                // xxx link from image: http://images.sourceforge.net/images/project-support.jpg
+                super.setLocation( "http://sourceforge.net/project/project_donations.php?group_id=" + _groupId );
+            } else if (type.equalsIgnoreCase( "cvs" )) {
+                super.setLocation( "http://sourceforge.net/cvs/?group_id=" + _groupId );
+            }
+        }
+
+
+        public void setLocation( String location ) {}
+
+    }
 }

[Httpunit-commit] CVS: httpunit build.xml,1.82,1.83

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14236

Modified Files:
	build.xml 
Log Message:
restore website format

Index: build.xml
===================================================================
RCS file: /cvsroot/httpunit/httpunit/build.xml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- build.xml	29 Mar 2006 03:00:30 -0000	1.82
+++ build.xml	4 Apr 2006 22:58:36 -0000	1.83
@@ -316,7 +316,7 @@
     <!--  ===================================================================  -->
     <!--  Compiles quicksite library                                           -->
     <!--  ===================================================================  -->
-    <target name="compile-quicksite">
+    <target name="compile-quicksite" depends="prepare">
         <mkdir dir="${quicksite.classes}" />
         <javac srcdir="${quicksite.dir}" destdir="${quicksite.classes}"
                debug="${debug}" deprecation="${deprecation}" optimize="${optimize}">

[Httpunit-commit] CVS: httpunit/sitedocs/doc citations.xml,1.4,1.5

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/sitedocs/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14236/sitedocs/doc

Modified Files:
	citations.xml 
Log Message:
restore website format

Index: citations.xml
===================================================================
RCS file: /cvsroot/httpunit/httpunit/sitedocs/doc/citations.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- citations.xml	13 Jun 2004 21:01:17 -0000	1.4
+++ citations.xml	4 Apr 2006 22:58:36 -0000	1.5
@@ -1,11 +1,8 @@
 <?xml version='1.0' ?>
 <citations>
     <section title='HttpUnit Extensions and Wrappers'>
-        <citation name='Canoo WebTest' url='http://webtest.canoo.com/webtest/manual/WebTestHome.html'>
-            Provides an XML wrapper to simplify web testing for non-Java programmers
-        </citation>
         <citation name="WebWalker" url="http://webwalker.sourceforge.net">
-            Another XML wrapper for HttpUnit
+            Provides an XML wrapper to simplify web testing for non-Java programmers
         </citation>
         <citation name="jWebUnit" url="http://jwebunit.sourceforge.net">
             A Java wrapper for HttpUnit which simplifies common, repetitive test steps
@@ -16,6 +13,10 @@
     </section>
 
     <section title="Articles">
+        <citation name="Test Web applications with HttpUnit"
+                  url="http://www.javaworld.com/javaworld/jw-04-2004/jw-0419-httpunit.html">
+            19 April 2004: Balazs Fejes, javaworld.com
+        </citation>
         <citation name="Build a Java Web App Using HttpUnit and the Test-driven Methodology, Part II"
                   url="http://www.devx.com/Java/Article/17991">
             4 December 2003: Wellie Chao, DevX.com

[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit HttpsProtocolSupport.java,1.1,1.2

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14236/src/com/meterware/httpunit

Modified Files:
	HttpsProtocolSupport.java 
Log Message:
restore website format

Index: HttpsProtocolSupport.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/HttpsProtocolSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpsProtocolSupport.java	4 Feb 2003 19:17:26 -0000	1.1
+++ HttpsProtocolSupport.java	4 Apr 2006 22:58:36 -0000	1.2
@@ -28,7 +28,7 @@
  *
  * @author <a href="mailto:rus...@ht...">Russell Gold</a>
  **/
-abstract public class HttpsProtocolSupport {
+abstract class HttpsProtocolSupport {
 
     /** The name of the system parameter used by java.net to locate protocol handlers. **/
     private final static String PROTOCOL_HANDLER_PKGS  = "java.protocol.handler.pkgs";

[Httpunit-commit] CVS: httpunit build.xml,1.81,1.82

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17635

Modified Files:
	build.xml 
Log Message:
comment out specific proxy tag

Index: build.xml
===================================================================
RCS file: /cvsroot/httpunit/httpunit/build.xml,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- build.xml	29 Mar 2006 02:53:49 -0000	1.81
+++ build.xml	29 Mar 2006 03:00:30 -0000	1.82
@@ -74,7 +74,7 @@
 
     <target name="prepare_repository_classpath" depends="check_jars_dir" unless="have.local.jars">
         <echo message="using repository classpath"/>
-        <setproxy proxyhost="www-proxy.us.oracle.com" proxyport="80"/>
+     <!--   <setproxy proxyhost="specify your proxy host if needed" proxyport="80"/>  -->
         <typedef classpath="${jars.dir}/ant-dependencies.jar" resource="dependencies.properties" />
         <dependencies pathId="base.classpath" fileSetId="distributed.jars">
             <dependency group="rhino"      version="1.5R4.1" />

[Httpunit-commit] CVS: httpunit/doc release_notes.txt,1.400,1.401

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14092/doc

Modified Files:
	release_notes.txt 
Log Message:
switch to ant task to obtain dependencies

Index: release_notes.txt
===================================================================
RCS file: /cvsroot/httpunit/httpunit/doc/release_notes.txt,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- release_notes.txt	28 Mar 2006 00:52:15 -0000	1.400
+++ release_notes.txt	29 Mar 2006 02:53:49 -0000	1.401
@@ -14,6 +14,11 @@
 
 
 Revision History:
+28-Mar-2006:
+    Notes:
+        1. The build now uses the ant-dependencies task (see http://www.httpunit.org/doc/dependencies.html) rather than
+           keeping the dependent jars in cvs.
+           
 27-Mar-2006
     Additions:
         Content and Parsing:

[Httpunit-commit] CVS: httpunit/jars ant-dependencies.jar,NONE,1.1 jars.txt,1.12,1.13 Tidy.jar,1.5,NONE js.jar,1.6,NONE junit.jar,1.4,NONE nekohtml.jar,1.9,NONE servlet.jar,1.5,NONE xercesImpl.jar,1.4,NONE xmlParserAPIs.jar,1.4,NONE

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/jars
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14092/jars

Modified Files:
	jars.txt 
Added Files:
	ant-dependencies.jar 
Removed Files:
	Tidy.jar js.jar junit.jar nekohtml.jar servlet.jar 
	xercesImpl.jar xmlParserAPIs.jar 
Log Message:
switch to ant task to obtain dependencies

--- NEW FILE ---
PK


÷GŠIéAdQîeÊÙɓšÉˆr}÷™Lîx-¦°iµÕ~k˜ipvZn9kHõdrèTè³_ÑDΐӖÂï厳r±½U¼Èá2>ihÉCr„1ûÚ«¢Å#ƞ³PK








­ZÖ)Š;]0&
‹ýw;s-ÃL3skxßÁ?%ÑÄð¡Œçΰ”HäMzΜåžõ»÷÷Ÿ¿
ŠLè˜LAS
SIL+>£È¬"¦"Es:žê˜gH,9ž#Wz;ZÙ·ÃpÍñÄfû !‚mÞpI“©ùwwxà(ùX©É]'d
ÒTj~Ð4y‹[»Â”¾ï†&÷¤)y¸o‹/¡é·¤ã{Ü5mÑž-<Ë¡Yéòs‹I×çö†£R-.¹ø{’‹µ=þ•›Žo*÷cÉÒü𾶨Ó[±#Ãèÿ1Ø"”ŽÇU‰Cç#ÓÄB¿XâÔr’…r4…ܦr—ôÿF¨D©ê¡%¢I„:^\"Ç
tOcVe20Œ´Ž—^ᵁPˆ±KóXÂ2-¨{ÒV°j`
ëJ(¨ ÍPºúÎÒÑL\î5Íw
5PU†ê•C×e»A€‹YîÂp¥¶ãÚ§#¥–»Ç0HÛÙâðd,§ÿ¬ö`ßv‚0ºŸi!8ÍØ%
¾vՉâ!z9ÆôŒôПÀEÒ}™ÄéV£oòì{dÎMDÊ\#jĸŽ[P÷ÿ6²ä¥#ÞG¼8ÝAO½Bût„¾-«MuÈj½ƒdV#{V›é •Õ:8Ë3Ž$ÑU¢kq2”0Š2òÓIT©¼¨†ù8Ïq
êëîFuq÷£¦Štò
z)Î(5<Fß8i5òʑ=å|„›Ä3ôe þ
áž'úÿPK

¦Ò¢ªbäµ¼â¸%•:—H¥K8ºbLË£S»[Ü.ꎧ̙óÜC ÚÄ1³h©ü®æ²R»?ÍEB²’8& OÂ-ôK¨C½„6¤ú7$n㎄ŽJhÅ9†æ=F̱¢:3¤ó9n8C*/”HjÛ«mÜ°‹…‚i9<?Zp)%‡²§€
†ñÿÒ7†šƒӔýy¨•J7C+{$w»uð"F5{Èpg5ÏВúÇøÓ$ô¶T4Ó¤4"à6™þD
·9ž¤	 ¢·
äuœ´'d’LdÖÁ2í«d²2¬"ôÚûª‰Ö:ï«Ï´~A_	÷N¥¹ô-N’OkÁBvµ³-@:M…ë9í$û—ÑœYAhUïÎeiXƒð‘Lv•–D> ^ò‰2,í|rMï!„–
¾,ç•D­Û”Åwªûe±.ìx¹%K±üÜjè9O<0zhîýŒû5eÖ .!¶‰ØÃuH[n´\†Q*ÙW¿“ÀBˆ³*$XLبɔ€€´(ƒ¬¨Ó£ˆl¢š"Ù*£†];“<$©äã#Ðî­pš¤HgqÜÀ)D~
PK


žuqëðœÛSñ¼Û{
ßPð¢!)^ßLoø–ÝSðm¾ãÇwñ=)äA¾/¿?÷¾äÃË
~¨àG~4:ù±ìýDÁO}ø™«ñsÙüBÁ/ýX‹ƒrð+i„_Ëæ7
n–À¯Èƒ¿µo+B'~çë
~¯àkô!=Õ½1=Ùbé¦f¦€Ú’HèfS\K&õ¤‚?
äµ[Ûª"Í­mÍ=‘æõmí-m‘îžõ‘¶õ͑ŽnòðÚ-×ý¡vˌ%úW7‰¤¥%¬.->¬ä6·…fö˜ú aé}ÈHÆx'¯Xµ1l˜ý!mHëÐC–aē!žYZrsTïK†Œ!+f$´x(ê;”ÙÎûJˆ<>ǒ–€Ò3¤Y-Q
O_,®·ë–÷xA*釭X<´Ê45û4
ó{’¶êç“l^û.’6$bÁÊX"f5ÒuKºhÚ&#JԄc	}Ýðà&ÝìÐ6ÅuiO£W‹wifLŽÝÉ<k FiWO[
r~ݛ¤“­†c¦Â¤n­wí]Yw8#äւq‡¨Ü¼6ã’B{ʸ™äÉ“][Úkꚥ§ÚNÃÔ-™žR’Dþ¨ñœéã)ú6½wØ¢ûüÍÛzuû
]6›ùgyúT\MÅ&ôª¸©è‘Í¥¸H qz‰AÅíø“Šòú«es­lދëUü¯	tN[¿lUŠ¿à¯Rß¿)ø»ŠàŸ*þ…Ì?r†$ñ³Ê³z8Ϥ5ÿÁ%úëÿ¼)0+ûS Ð਱Œš¨±5!•k@¯é3âqc+7ÖxoZ.¥¤¼Kwbð	!rT‘‹×T‘Ç¢"Ÿ¤>J:–Û
T¡Ÿ"
UáEž„U¡ŠbUÌ%¼Ø5’á¤n6È´«ˆRU”‰r²¿aPÛ¢'B™œ"b#.a~$|ƒSG6x³ñ1Ñ3â
h:€V)iÄ#èGðQ)m…Àœ)“mPnªTÅ,‘3n7-¨â8é”ÙbŽ*ªDµ*æŠy*>€’¸b>“3†ÞÔ™¦:àœéEÍ
ÑAæ7åa›T¶mº‚oìŠ%³,܍™I».æÐÏìºÞ4ä2똩ÞUwSèužG¦‰Üç´,8Ž|NæçòÃË'&	}/®¯
¼Ò2_Ë(sˆÛ<ý*ږ¢È­Nœh¯Jáñ-mÑ:Lc«ÌS(œ>gWàڐ¼] ˜íQŸºè”>I§M“þŧhÉu¶í|–áÌ
,Ërϐ³v
Ûz½§:ºtN½±h*wdJIyjî‘p%h4Ñ©4DUgÿpKËòw‹]T–M*äbɸ¨évñ¥/]åÙR
”
Ÿé‚ûè±-Øjƒo£¯slðí1PM•¸ð
À; à*b'WßÅõ«¹óîºçã=Œ¬ëM;©ÌõTë[ñeŽJ®â…´û•xžÃèz;ñr°'s'½³’q{qó8{u:ÖnáXznõêº)è’^ËÔ;–)M[†
ǵ|•–J§q²!ã¦*Ò¸‘:݄øµ¸	§ñ¦Uø°-us£+µÊµkðnÊ3'¸RçÈC®„·º6!Dú®·=x²GÈS²yªWÈe’N…œOc'-w‘K·b!nCˆß3qÖàN Íi¯¤®£X҂úä6WÐ.Û´T§u—Ÿ¾g¤pær(?+…åáÃÂåS(Ƨ1w§Ã¥˜ÿoÀû8šÍÑûٓÌf±ëÞrÃ%Ÿ
ù2pöäç=ÁŸéi}'Ö^à>@:¯8ˆKø):
çډlçí:ôJ08Š–G°vçïÇ
®ìg{Œéìqzê	Êõ$êØá€GêF|Ì~àŠp*¹µ‹’ÍD=Y¥©š¾½«^©n§´ã¡˜o³¢ÑqO¹ë†zÇ

9»/ïrεÊnn0מًpÐîÔ·‚Ü9™áO³}†?ËðŽÉày2ü>Ÿ/zޘ&K#9w'å©¥…?Á'<‡ý»ðIWˆŠ¥©Vþ­«gµåaòûò#êe~i¿”œw8]JæßmGÐgÒ¡^k¯0‘•¯'@­†×ñÀˆ}ÙgÑÁïB
TÁ7¤0üv2§ªx§}Îþ÷?PK

Ü¡à	dIÒ¢ Œãq†›¸Õ-ð‰>k’xé}‡'Ht lF;HnFŠÄVåR‡‰S¨‡'è/$&:è -ƒ…¬¢¼ë@#½ƒk{Ÿ{dÔ¸†û„3fÂN–#´n'RºM>z§X£~s”=JCMà.¤-`’$9ò=ªu¼bàü¸©p¼|09{


.Ç»ÂxwÚñnÞËÍû¸¹ƒ›÷só
nîäæƒ,—Œ…ñawã#
TÜƽþ ÷)hÀý2P0›‘äþ O>ÆGyð1–}˜›³Â¡iø>ƧøÛ§¹9Æ#
ÅgÂxLƘ‚Åx\Ágñ„Œ#¬–©"´qÖ}’qŸ
ãiåæsa|^Á1Wð¾ à|QÁ—ðeÏℌ“2¾"¡n›©
¢ßê±´x×ޘH:ºeJP»MS؝†–J‰”„ÐÀm¥“j{†µÝZÔÐÌ¡hŸcëæP‡„à€3šª4ÛÑZ̑Ø-씋0µÁS{Ä`ŸîÐëÆNtÛÖ‚¨Ð䁴iˆ\¡›º³Š>44n—è´â¤VÝ£›¢7=2(ì~v›ý±bš±]³uwÞdÀÙ¥ƚËŠjI-¶KDË2RQÍt¢Ž–º>.©¨å®U3¢q‘f\˜1]¤¢ë³ƒQr+œÎFoåu
/_:»ô™‘I´ß¥!à±1&ÖæùÈS£Ð‡íYräMÐëðøb¹YÆf6L¤ŒMË9>ƒ$ÚM4“»*nË2™¥43,“dg74¬dóఈ9´T%ý”Œ¯’Ãeĝùìj˜“4pý
°‚„uSG£%xÏ??›t+Êcú¨Ú"i¥tDzuÎÞµ×¼*‹[³ œ	’NO7=doqi¸uiÝÈ×»!lÛ²7ûÚ©Í}Y­K'Âîñ-HOu¹µ—°°á[lˍVãÕü¤7pÞé…ɏ!áôäéªÉ&@ž°™$‘Oü-š³‹¾³±TµOO‰¤fkÄKl—f#Åú^O̳œº2TýӇò5ÒMWµ$ƒô[žõå
,e/¯’®ôÂI…©(Y´Ë#Âtd|&¶ä'$´NQ_ NpÕY™Ç>AžÖe_Ì«ÞDV§þLTˆ¹>+mDŽÄê<Ým̲Šõè¢írX³U¬@‡Šåܬäf7«¹Yƒµ*Öñ['7×⍝A2Óºz­H®:F#î¦ÑŠê`Ú‘TRÄô„.â2žWñu|ƒýù¦„ƉjþfWJQ…ƒ´ŠoáÛæ”.ÚÌ6Xi3Qñ|WÅ÷°_BsD7#îfÉUýh[d‡nÓr"qkÉ[YDwÚT|ûUü
¿¦),\¿aÊ~‹Q»±‡EG®¤TìãeÞà:Ö&ã%§ð{PñGüIşñUñ7üCÆ¿Tô£Gª©yOÛJñ¡B‰Ÿêäç×rúÒɤe;¢0·Î˝l›4#aÙ#"NG\@ó+¨J:÷§z¼Ð®àù…´“•Ä̊Pq^Zâz0‰o!±WO9)÷žC›zÈÛO$´”ºm”;?h/ÊÞŽå}#HâvN	¤n6]G:[ň刭NËΆƳp^¾ªtÊ#xGCaz=r.!½
;K3Lï‚RÇg.`jáeŽn0ŽÕµ×6¹¿ò_¶)®v´ŒWçœîªàå=
’Âvˆò%g”„^*¹Œ|
µè*{FXHÿ“—Óor|¯ ·
¾d¸ýJ¿_å÷«ýžîn¿Îwºý,H|S¡vVÒ¼Dý´¦qHMµGP9æ
o¤v*©]„
c-'¬Ž2X¯÷±¶–Æ
c­&¬5e°ú|¬þÒXr1ÖzÂê*ƒµÍÇڎ¥°ÂÅX݄ue¬«(Ikgi¿ªŠ±z	ks¬«}¿®)¥cõV¬7¸X
¾!Ó7ƊºØ@RuÚc9¨;yUAr}˜
z4sõ=é~ª!™fN5=ÀIÌ<
ugíôæfŒ£ú8M†Nb.urö[
}›é~Gí¦–fݍú棘½suµs2x
ÍÍ¥®v5Ìe°`Œ”Îé­l¾ֺÀÅÍ-lŽžJB9—­°‰§p^c˃uÀu­ÇD7£Öž?ŽÈòм[ӖÁÂ$>ùóBµÐ2XÄFë©Ùq‹w6Í#ÃóDZäø!Tސê­Çþï¶1b@ÇÛñbÇc¬—ö
ZýÜጠà- ðrbp0[³ãq´yÉTläöÇ[sŽ·b/F]ÇéÇÃ77èoíË8ÓN@áîZ²Æ)
9¹Z=kQ¶~‘—Y•¥-(XÞ²ÜònÈÙk'‚ù›ÊÙ]ÓZ3ÁÒbŒ;
0Ôƍ9Œ•~Ï"Œ çsðdfªê®¨Y¹ãè͸ɇê'iŽøªÄ‹7µpñfpIñávE÷^LÇ}.ZÄÓÈÑ:o¡¨J$Æ[q›Kèíx›oa#IsªÉÂ¥~ZdpYñ.w`*ˆZu¾Ú-KŽÚ;]x-õó	v1±¹ŒÞoÁ3T6žÅ?ñwHÿPK



µmxiœ@Àš@¤J•ÐÄ;›®w¬Ý1U	$0R+õ+?
õÎÚlœÇ'‚¬¹sgæÜsïœþòÏ
ÃðËP´eä)n¿}rT·ø+îB¹/V«³æ]/ðÔÃ…ÝSÅu㾬†‘ªˆ•NkC„Ïù†Ož\UÖ¸¿ÎCOûNCmzC¥*æËÛ¼¶)\%¥¹<P®âÑ_uш\ÙVž¸ïÖE[uÔ<¹•j¯&\‰ØÑ=ÌÍH¨žÑ죅âÞlNÐܪhI%*_Á·ŸqµÉ°ÕOÏçAÓ]S¡4g¿—g
{ñMMÄiF)¢µCˆáïÂ7Õ¨20èÓð¤»äù⻥r@rZšÃÂáY3d}-M:Qã×$ÒÍPvÚZ_ûxhÛmÚdóPy
^SËuë•#
J³
oÑìPGKÃ^“°&zQÆvkkZC;8†%9Œ98‡	<Ä2ÃøÞÀFC„G*òuàK^õ	ðØBÕÁ¬"'¡l‘÷GœµðÔÁ3¬8ø]7«X£ºþBÚwˆ=ÝØ5Å0÷-¸ƒ˜gÝ>á~C†-Q'
'â¥jôñÏöØ	ˆn

¡˜ï®Ò9D_Mç&©rÎë:@(5Ù&ׂ׹}¯F.…®ãå`TïVƒßGt‘˜UôRÇ~Ch§Žðä1"qã]Sú¢'Z*œN¦ê¸@–cÄêèþܬÒÜSºö¼ŸµY{·u—!Ô¡Ñ(¡NÆ4'<õòµû— -¨jLþ ŠŸ0Ú`«HƧ‰ß´bÛC"ð	¶²34»?K“]JWõُ6Ø¥4§NF4;†	-õPK


Ã0Ð=O‰þ [è–ý_S[–(ôïK;Ïéx÷¸ƒ$Țám±ñºƒBµ8±û3áá¤Y…¥nCsÆ¡ò25˜zmïSäòEî‡1};U6Cûûë5ܸbùqPK






















Index: jars.txt
===================================================================
RCS file: /cvsroot/httpunit/httpunit/jars/jars.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jars.txt	9 Mar 2004 20:32:31 -0000	1.12
+++ jars.txt	29 Mar 2006 02:53:49 -0000	1.13
@@ -1,13 +1,5 @@
 Jars used:
 
-(runtime)
-junit   3.8
-servlet 2.3
-xerces  2.5
-jtidy   04aug2000r7
-rhino   1.5R4.1
-NekoHTML 0.9.1
-
 (for testing HttpUnit only)
 mail        (javamail 1.2)
 activation  (jaf 1.0.1)

[Httpunit-commit] CVS: httpunit build.xml,1.80,1.81

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14092

Modified Files:
	build.xml 
Log Message:
switch to ant task to obtain dependencies

Index: build.xml
===================================================================
RCS file: /cvsroot/httpunit/httpunit/build.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- build.xml	29 Mar 2006 01:27:26 -0000	1.80
+++ build.xml	29 Mar 2006 02:53:49 -0000	1.81
@@ -37,16 +37,62 @@
     <property name="servlet.test.class" value="com.meterware.servletunit.ServletUnitSuite" />
 
 <!-- =================================================================== -->
-<!-- Defines the classpath used for compilation and test.                -->
+<!-- Defines the classpath used for testing.                             -->
 <!-- =================================================================== -->
-<path id="base.classpath">
+<path id="test.classpath">
     <fileset dir="${jars.dir}">
-        <include name="*.jar"/>
-        <exclude name="nekohtml.jar" if="use.jtidy" />
+        <include name="activation.jar"/>
+        <include name="mailapi.jar" />
     </fileset>
 </path>
 
 
+
+
+<!--  ===================================================================  -->
+<!--  Prepares the build directory                                         -->
+<!--  ===================================================================  -->
+
+    <target name="check_jars_dir">
+        <path id="check.path">
+            <fileset dir="${jars.dir}"/>
+        </path>
+        <condition property="have.local.jars">
+            <or>
+                <available classname="org.cyberneko.html.HTMLConfiguration" classpathref="check.path"/>
+                <available classname="org.w3c.tidy.Tidy"                    classpathref="check.path"/>
+            </or>
+        </condition>
+    </target>
+
+    <target name="prepare_local_classpath" depends="check_jars_dir" if="have.local.jars">
+        <echo message="using local classpath"/>
+        <path id="base.classpath">
+            <fileset id="distributed.jars" dir="${jars.dir}"/>
+        </path>
+    </target>
+
+    <target name="prepare_repository_classpath" depends="check_jars_dir" unless="have.local.jars">
+        <echo message="using repository classpath"/>
+        <setproxy proxyhost="www-proxy.us.oracle.com" proxyport="80"/>
+        <typedef classpath="${jars.dir}/ant-dependencies.jar" resource="dependencies.properties" />
+        <dependencies pathId="base.classpath" fileSetId="distributed.jars">
+            <dependency group="rhino"      version="1.5R4.1" />
+            <dependency group="junit"      version="3.8.1" />
+            <dependency group="nekohtml"   version="0.9.1" unless="use.jtidy"/>
+            <dependency group="servletapi" version="2.4" />
+            <dependency group="jtidy"      version="4aug2000r7-dev"/>
+            <dependency group="xerces"     version="2.6.1" artifact="xercesImpl"/>
+            <dependency group="xerces"     version="2.6.1" artifact="xmlParserAPIs"/>
+        </dependencies>
+    </target>
+
+<target name="prepare" depends="prepare_local_classpath,prepare_repository_classpath">
+    <tstamp />
+    <mkdir dir="${build.dir}" />
+</target>
+
+
 <!-- =================================================================== -->
 <!-- Check to see what optional dependencies are available               -->
 <!-- =================================================================== -->
@@ -54,7 +100,7 @@
     <available property="jsdk.present"     classname="javax.servlet.http.HttpServlet"
                                            classpathref="base.classpath" />
     <available property="javamail.present" classname="javax.mail.internet.MimeMultipart"
-                                           classpathref="base.classpath" />
+                                           classpathref="test.classpath" />
     <available property="jaxp.present"     classname="javax.xml.parsers.DocumentBuilderFactory"
                                            classpathref="base.classpath" />
     <available property="rhino.present"    classname="org.mozilla.javascript.Context"
@@ -69,15 +115,6 @@
 
 
 <!--  ===================================================================  -->
-<!--  Prepares the build directory                                         -->
-<!--  ===================================================================  -->
-<target name="prepare">
-    <tstamp />
-    <mkdir dir="${build.dir}" />
-</target>
-
-
-<!--  ===================================================================  -->
 <!--  Compiles the source code                                             -->
 <!--  ===================================================================  -->
 <target name="compile" depends="prepare,check_for_optional_packages">
@@ -134,6 +171,7 @@
            debug="on" deprecation="off" optimize="off">
         <classpath>
             <path refid="base.classpath" />
+            <path refid="test.classpath" />
             <pathelement location="${build.classes}" />
         </classpath>
         <exclude name="**/servletunit/*" unless="jsdk.present" />
@@ -152,6 +190,7 @@
     <java classname="${test.class}" fork="yes" >
          <classpath>
              <path refid="base.classpath" />
+             <path refid="test.classpath" />
              <pathelement location="${build.classes}" />
              <pathelement location="META-INF" />
              <pathelement location="${test.classes}" />
@@ -240,13 +279,17 @@
             <include name="test/**" />
             <include name="examples/**" />
             <include name="lib/*.*" />
-            <include name="jars/*.*" />
             <exclude name="**/activation.jar"/>
             <exclude name="**/mailapi.jar" />
             <include name="doc/**/*.*" />
             <include name="doc/api/package-list" />
         </fileset>
     </copy>
+    <mkdir dir="${archive.dir}/jars"/>
+    <copy todir="${archive.dir}/jars">
+        <mapper type="flatten"/>
+        <fileset refid="distributed.jars" />
+    </copy>
 </target>
 
 

[Httpunit-commit] CVS: httpunit/sitedocs news.xml,1.3,1.4 site.xml,1.4,1.5

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/sitedocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2404/sitedocs

Modified Files:
	news.xml site.xml 
Log Message:
finish preparing for 1.6.2

Index: news.xml
===================================================================
RCS file: /cvsroot/httpunit/httpunit/sitedocs/news.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- news.xml	23 Jun 2004 09:53:45 -0000	1.3
+++ news.xml	29 Mar 2006 01:27:26 -0000	1.4
@@ -1,11 +1,8 @@
 <?xml version='1.0' ?>
 <news>
-    <item date="16-June-2004" url="http://www.httpunit.org/prerelease/httpunit-1.5.5-d-16Jun.zip">
-Prerelease: Massive reworking of target functionality, PseudoServer handles large messages</item>
-    <item date="29-Apr-2004" url="http://www.httpunit.org/prerelease/httpunit-1.5.5-d-29Apr.zip">
-Prerelease: ServletUnit now supports filters and listeners, PseudoServer emulates proxy server</item>
-    <item date="19-Sep-2003" url="http://www.httpunit.org/prerelease/httpunit-1.5.5-d-19Sep.zip">
-Prerelease: Added attributes for HTMLElement, improved PseudoServer</item>
+    <item date="27-Mar-2006">HttpUnit 1.6.2 released</item>
+    <item date="6-Mar-2005">HttpUnit 1.6.1 released</item>
+    <item date="3-Oct-2004">HttpUnit 1.6 released</item>
     <item date="21-Aug-2003">HttpUnit 1.5.4 released</item>
     <item date="16-May-2003">New web site format created</item>
     <item date="4-Apr-2003">HttpUnit 1.5.3 released</item>

Index: site.xml
===================================================================
RCS file: /cvsroot/httpunit/httpunit/sitedocs/site.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- site.xml	3 Oct 2004 14:03:32 -0000	1.4
+++ site.xml	29 Mar 2006 01:27:26 -0000	1.5
@@ -1,6 +1,6 @@
 <?xml version='1.0' ?>
 <site project="HttpUnit" group-id="6550" logo="doc/images/HttpUnit.jpg">
-    <copyright owner="Russell Gold" dates="2000-2004"/>
+    <copyright owner="Russell Gold" dates="2000-2006"/>
 
     <page location="index.html" title="Home" mainPage="true">
         <fragment source="sitedocs/welcome.html"/>
@@ -11,7 +11,7 @@
         <fragment source="sitedocs/doc/license.html"/>
     </page>
 
-    <external location="http://prdownloads.sourceforge.net/httpunit/httpunit-1.6.zip?download" item="Download 1.6"/>
+    <external location="http://prdownloads.sourceforge.net/httpunit/httpunit-1.6.2.zip?download" item="Download 1.6.2"/>
 
     <space/>
     <page location="doc/cookbook.html" title="Cookbook">

[Httpunit-commit] CVS: httpunit/site/com/meterware/httpunit/site WebSite.java,1.1,1.2

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/site/com/meterware/httpunit/site
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2404/site/com/meterware/httpunit/site

Modified Files:
	WebSite.java 
Log Message:
finish preparing for 1.6.2

Index: WebSite.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/site/com/meterware/httpunit/site/WebSite.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebSite.java	18 May 2003 05:20:47 -0000	1.1
+++ WebSite.java	29 Mar 2006 01:27:26 -0000	1.2
@@ -21,14 +21,20 @@
  *******************************************************************************************************************/
 import com.meterware.website.FragmentTemplate;
 import com.meterware.website.Site;
+import com.meterware.website.FilePageGenerator;
+import com.meterware.website.PageGenerator;
+import com.meterware.website.BasicSiteTemplate;
 
 import java.io.File;
+import java.io.IOException;
+
+import org.xml.sax.SAXException;
 
 /**
  *
  * @author <a href="mailto:rus...@ht...">Russell Gold</a>
  **/
-public class WebSite {
+public class WebSite extends Site {
 
 
     public static void main( String[] args ) {
@@ -40,7 +46,7 @@
                 FragmentTemplate.registerTemplate( new News() );
                 FragmentTemplate.registerTemplate( new Citations() );
                 FragmentTemplate.registerTemplate( new Developers() );
-                Site.generate( new File( "sitedocs/site.xml" ), new File( args[0] ) );
+                generate( new File( "sitedocs/site.xml" ), new File( args[0] ) );
             }
         } catch (Throwable e) {
             e.printStackTrace();
@@ -48,6 +54,20 @@
     }
 
 
+
+    public static void generate( File siteFile, File directory ) throws SAXException, IOException {
+        generate( siteFile, new FilePageGenerator( directory ) );
+    }
+
+
+    public static void generate( File siteFile, PageGenerator generator ) throws SAXException, IOException {
+        Site site = new WebSite();
+        BasicSiteTemplate template = new BasicSiteTemplate();
+        generate( site, siteFile, template, generator );
+    }
+
+
+
     private static void printUsage() {
         System.out.println( "Usage: " + WebSite.class.getName() + " <target-directory>" );
     }

[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit PutMethodWebRequest.java,1.3,1.4

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2404/src/com/meterware/httpunit

Modified Files:
	PutMethodWebRequest.java 
Log Message:
finish preparing for 1.6.2

Index: PutMethodWebRequest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/PutMethodWebRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PutMethodWebRequest.java	26 Nov 2001 14:20:12 -0000	1.3
+++ PutMethodWebRequest.java	29 Mar 2006 01:27:26 -0000	1.4
@@ -39,8 +39,8 @@
 
     /**
      * Constructs a web request using a specific absolute url string and input stream.
-     * @param urlString the URL to which the request should be issued
-     * @param source    an input stream which will provide the body of this request
+     * @param url         the URL to which the request should be issued
+     * @param source      an input stream which will provide the body of this request
      * @param contentType the MIME content type of the body, including any character set
      **/
     public PutMethodWebRequest( String url, InputStream source, String contentType ) {

[Httpunit-commit] CVS: httpunit build.xml,1.79,1.80

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2404

Modified Files:
	build.xml 
Log Message:
finish preparing for 1.6.2

Index: build.xml
===================================================================
RCS file: /cvsroot/httpunit/httpunit/build.xml,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- build.xml	6 Mar 2005 20:30:44 -0000	1.79
+++ build.xml	29 Mar 2006 01:27:26 -0000	1.80
@@ -5,7 +5,7 @@
 <project name="httpunit" default="jar" basedir=".">
     <property name="name" value="httpunit" />
     <property name="Name" value="HttpUnit" />
-    <property name="version" value="1.6.1" />
+    <property name="version" value="1.6.2" />
 
     <property name="debug" value="on" />
     <property name="deprecation" value="off" />
@@ -200,7 +200,7 @@
     <javadoc packagenames="${packages}" sourcepath="${basedir}/${src.dir}"
              destdir="${javadoc.dir}" author="true" version="true"
              windowtitle="${Name} ${version} API" doctitle="${Name}"
-             footer="Copyright &amp;copy; 2000-2004 Russell Gold. See &lt;a target=&quot;_top&quot; href=&quot;../license.html&quot;&gt;license agreement&lt;/A&gt; for rights granted." >
+             footer="Copyright &amp;copy; 2000-2006 Russell Gold. See &lt;a target=&quot;_top&quot; href=&quot;../license.html&quot;&gt;license agreement&lt;/A&gt; for rights granted." >
         <classpath refid="base.classpath"/>
     </javadoc>
 </target>

[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit FixedURLWebRequestSource.java,1.5,1.6 FormControl.java,1.50,1.51 HTMLPage.java,1.33,1.34 ParsedHTML.java,1.63,1.64 WebForm.java,1.102,1.103 WebImage.java,1.13,1.14 WebLink.java,1.47,1.48 WebRequestSource.java,1.43,1.44

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11573/src/com/meterware/httpunit

Modified Files:
	FixedURLWebRequestSource.java FormControl.java HTMLPage.java 
	ParsedHTML.java WebForm.java WebImage.java WebLink.java 
	WebRequestSource.java 
Log Message:
Created custom DOM

Index: FixedURLWebRequestSource.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/FixedURLWebRequestSource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FixedURLWebRequestSource.java	23 Jul 2004 01:31:04 -0000	1.5
+++ FixedURLWebRequestSource.java	28 Mar 2006 00:52:15 -0000	1.6
@@ -39,8 +39,8 @@
     private String    _characterSet;
 
 
-    public FixedURLWebRequestSource( WebResponse response, Node node, URL baseURL, String destination, FrameSelector frame, String defaultTarget, String characterSet ) {
-        super( response, node, baseURL, destination, frame, defaultTarget );
+    public FixedURLWebRequestSource( WebResponse response, Node node, URL baseURL, String attribute, FrameSelector frame, String defaultTarget, String characterSet ) {
+        super( response, node, baseURL, attribute, frame, defaultTarget );
         _characterSet = characterSet;
     }
 

Index: FormControl.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/FormControl.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- FormControl.java	26 Dec 2004 20:33:34 -0000	1.50
+++ FormControl.java	28 Mar 2006 00:52:15 -0000	1.51
@@ -87,7 +87,7 @@
 
 
     private static Node newEmptyNode( WebForm form ) {
-        return form.getNode().getOwnerDocument().createElement( "httpunit-supplied" );
+        return form.getElement().getOwnerDocument().createElement( "httpunit-supplied" );
     }
 
 

Index: HTMLPage.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/HTMLPage.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- HTMLPage.java	8 Aug 2004 17:38:18 -0000	1.33
+++ HTMLPage.java	28 Mar 2006 00:52:15 -0000	1.34
@@ -25,8 +25,8 @@
 import com.meterware.httpunit.parsing.DocumentAdapter;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.w3c.dom.html.HTMLDocument;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
@@ -142,8 +142,9 @@
 
 
         private NamedDelegate getNamedItem( NamedDelegate[] items, String name ) {
+            if (name ==  null) return null;
             for (int i = 0; i < items.length; i++) {
-                if (items[i].getName().equals( name )) return items[i];
+                if (name.equals( items[i].getName() )) return items[i];
             }
             return null;
         }
@@ -253,7 +254,7 @@
 
     public void parse( String text, URL pageURL ) throws SAXException, IOException {
         HTMLParserFactory.getHTMLParser().parse( pageURL, text, new DocumentAdapter() {
-            public void setRootNode( Node rootNode ) { HTMLPage.this.setRootNode( rootNode ); }
+            public void setDocument( HTMLDocument document ) { HTMLPage.this.setRootNode( document ); }
             public String getIncludedScript( String srcAttribute ) throws IOException { return HTMLPage.this.getIncludedScript( srcAttribute ); }
             public ScriptableDelegate getScriptableObject() { return HTMLPage.this.getScriptableObject().getParent(); }
         });

Index: ParsedHTML.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/ParsedHTML.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ParsedHTML.java	9 Mar 2006 01:52:28 -0000	1.63
+++ ParsedHTML.java	28 Mar 2006 00:52:15 -0000	1.64
@@ -23,6 +23,7 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Document;
+import org.w3c.dom.html.HTMLImageElement;
 
 import java.net.URL;
 import java.util.*;
@@ -315,7 +316,7 @@
     }
 
 
-    private void interpretScriptElement( Element element ) {
+    void interpretScriptElement( Element element ) {
         String script = getScript( element );
         if (script != null) {
             try {
@@ -762,7 +763,7 @@
 
 
     private WebImage toWebImage( Element child ) {
-        return new WebImage( _response, this, _baseURL, child, _frame, _baseTarget, _characterSet );
+        return new WebImage( _response, this, _baseURL, (HTMLImageElement) child, _frame, _baseTarget, _characterSet );
     }
 
 
@@ -988,7 +989,8 @@
 
 
     /**
-     * Specifies the root node for this HTML fragment.
+     * Specifies the root node for this HTML fragment.  It will be either an HTMLDocument or an HTMLElement
+     * representing a page fragment.
      */
     void setRootNode( Node rootNode ) {
         if (_rootNode != null && rootNode != _rootNode )

Index: WebForm.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebForm.java,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- WebForm.java	26 Dec 2004 20:33:34 -0000	1.102
+++ WebForm.java	28 Mar 2006 00:52:15 -0000	1.103
@@ -765,7 +765,7 @@
 
 
         public ScriptableDelegate[] getElementsByTagName( String name ) throws SAXException {
-            return getDelegates( getHTMLPage().getElementsByTagName( getNode(), name ) );
+            return getDelegates( getHTMLPage().getElementsByTagName( getElement(), name ) );
         }
 
 
@@ -782,7 +782,7 @@
      * from that page.
      **/
     WebForm( WebResponse response, URL baseURL, Node node, FrameSelector frame, String defaultTarget, String characterSet ) {
-        super( response, node, baseURL, NodeUtils.getNodeAttribute( node, "action" ), frame, defaultTarget );
+        super( response, node, baseURL, "action", frame, defaultTarget );
         _characterSet = characterSet;
     }
 

Index: WebImage.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebImage.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WebImage.java	13 Oct 2004 15:11:51 -0000	1.13
+++ WebImage.java	28 Mar 2006 00:52:15 -0000	1.14
@@ -25,6 +25,7 @@
 import java.net.URL;
 
 import org.w3c.dom.Node;
+import org.w3c.dom.html.HTMLImageElement;
 
 
 /**
@@ -34,34 +35,30 @@
  **/
 public class WebImage extends FixedURLWebRequestSource {
 
-    private Node       _node;
-    private ParsedHTML _parsedHTML;
-    private Scriptable _scriptable;
-    private String     _src;
-    private String     _alt;
+    private HTMLImageElement _element;
+    private ParsedHTML       _parsedHTML;
+    private Scriptable       _scriptable;
 
 
-    WebImage( WebResponse response, ParsedHTML parsedHTML, URL baseURL, Node node, FrameSelector sourceFrame, String defaultTarget, String characterSet ) {
-        super( response, node, baseURL, NodeUtils.getNodeAttribute( node, "src" ), sourceFrame, defaultTarget, characterSet );
-        _node = node;
+    WebImage( WebResponse response, ParsedHTML parsedHTML, URL baseURL, HTMLImageElement element, FrameSelector sourceFrame, String defaultTarget, String characterSet ) {
+        super( response, element, baseURL, "src", sourceFrame, defaultTarget, characterSet );
+        _element = element;
         _parsedHTML = parsedHTML;
-        _src = NodeUtils.getNodeAttribute( _node, "src" );
-        _alt = NodeUtils.getNodeAttribute( _node, "alt" );
     }
 
 
     public String getName() {
-        return NodeUtils.getNodeAttribute( _node, "name" );
+        return _element.getName();
     }
 
 
     public String getSource() {
-        return _src;
+        return _element.getSrc();
     }
 
 
     public String getAltText() {
-        return _alt;
+        return _element.getAlt();
     }
 
 
@@ -70,11 +67,11 @@
 
             public boolean matchesCriteria( Object link, Object parentNode ) {
                 for (Node parent = (Node) parentNode; parent != null; parent = parent.getParentNode()) {
-                    if (parent.equals( ((WebLink) link).getNode() )) return true;
+                    if (parent.equals( ((WebLink) link).getElement() )) return true;
                 }
                 return false;
             }
-        }, _node.getParentNode() );
+        }, _element.getParentNode() );
     }
 
 
@@ -115,7 +112,7 @@
 
         public void set( String propertyName, Object value ) {
             if (propertyName.equalsIgnoreCase( "src" )) {
-                if (value != null) _src = value.toString();
+                if (value != null) _element.setSrc( value.toString() );
             } else {
                 super.set( propertyName, value );
             }

Index: WebLink.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebLink.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- WebLink.java	29 Sep 2004 17:15:25 -0000	1.47
+++ WebLink.java	28 Mar 2006 00:52:15 -0000	1.48
@@ -70,7 +70,7 @@
      * @since 1.6
      **/
     public String getText() {
-        if (getNode().getNodeName().equalsIgnoreCase( "area" )) {
+        if (getElement().getNodeName().equalsIgnoreCase( "area" )) {
             return getAttribute( "alt" );
         } else {
             return super.getText();
@@ -167,7 +167,7 @@
      * from that page.
      **/
     WebLink( WebResponse response, URL baseURL, Node node, FrameSelector sourceFrame, String defaultTarget, String characterSet ) {
-        super( response, node, baseURL, NodeUtils.getNodeAttribute( node, "href" ), sourceFrame, defaultTarget, characterSet );
+        super( response, node, baseURL, "href", sourceFrame, defaultTarget, characterSet );
     }
 
 

Index: WebRequestSource.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebRequestSource.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- WebRequestSource.java	29 Oct 2004 00:41:24 -0000	1.43
+++ WebRequestSource.java	28 Mar 2006 00:52:15 -0000	1.44
@@ -39,6 +39,9 @@
 
     private FrameSelector _frame;
 
+    /** The name of the destination attribute used to create for the request, including anchors and parameters. **/
+    private String         _destinationAttribute;
+
 
     /**
      * Returns the ID associated with this request source.
@@ -171,14 +174,14 @@
      * @param response the response from which this request source was extracted
      * @param node     the DOM subtree defining this request source
      * @param baseURL  the URL on which to base all releative URL requests
-     * @param destination the relative URL to which requests will be directed
+     * @param attribute the attribute which defines the relative URL to which requests will be directed
      **/
-    WebRequestSource( WebResponse response, Node node, URL baseURL, String destination, FrameSelector frame, String defaultTarget ) {
+    WebRequestSource( WebResponse response, Node node, URL baseURL, String attribute, FrameSelector frame, String defaultTarget ) {
         if (node == null) throw new IllegalArgumentException( "node must not be null" );
         _baseResponse  = response;
         _node          = node;
         _baseURL       = baseURL;
-        _destination   = destination;
+        _destinationAttribute = attribute;
         _frame         = frame;
         _defaultTarget = defaultTarget;
     }
@@ -190,20 +193,20 @@
 
 
     protected String getDestination() {
-        return _destination;
+        return getElement().getAttribute( _destinationAttribute );
     }
 
 
     protected void setDestination( String destination ) {
-        _destination = destination;
+        getElement().setAttribute( _destinationAttribute, destination );
     }
 
 
     /**
      * Returns the actual DOM for this request source, not a copy.
      **/
-    protected Node getNode() {
-        return _node;
+    protected Element getElement() {
+        return (Element) _node;
     }
 
 
@@ -321,9 +324,6 @@
     /** The URL of the page containing this entity. **/
     private URL            _baseURL;
 
-    /** The raw destination specified for the request, including anchors and parameters. **/
-    private String         _destination;
-
     /** The DOM node representing this entity. **/
     private Node           _node;
 

[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/parsing ScriptHandler.java,NONE,1.1 DocumentAdapter.java,1.2,1.3 HTMLParserFactory.java,1.3,1.4 JTidyHTMLParser.java,1.2,1.3 NekoDOMParser.java,1.3,1.4 NekoHTMLParser.java,1.4,1.5 ScriptFilter.java,1.5,1.6

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/parsing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11573/src/com/meterware/httpunit/parsing

Modified Files:
	DocumentAdapter.java HTMLParserFactory.java 
	JTidyHTMLParser.java NekoDOMParser.java NekoHTMLParser.java 
	ScriptFilter.java 
Added Files:
	ScriptHandler.java 
Log Message:
Created custom DOM

***** Error reading new file[Errno 2] No such file or directory: 'ScriptHandler.java'
Index: DocumentAdapter.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/parsing/DocumentAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DocumentAdapter.java	25 Dec 2002 15:23:11 -0000	1.2
+++ DocumentAdapter.java	28 Mar 2006 00:52:15 -0000	1.3
@@ -2,7 +2,7 @@
 /********************************************************************************************************************
  * $Id$
  *
- * Copyright (c) 2002, Russell Gold
+ * Copyright (c) 2002,2004, Russell Gold
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
@@ -21,7 +21,8 @@
  *******************************************************************************************************************/
 import com.meterware.httpunit.scripting.ScriptableDelegate;
 
-import org.w3c.dom.Node;
+import org.w3c.dom.Document;
+import org.w3c.dom.html.HTMLDocument;
 
 import java.io.IOException;
 
@@ -36,7 +37,7 @@
     /**
      * Records the root (Document) node.
      */
-    public void setRootNode( Node rootNode );
+    public void setDocument( HTMLDocument document );
 
 
     /**

Index: HTMLParserFactory.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/parsing/HTMLParserFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HTMLParserFactory.java	26 Dec 2002 04:59:35 -0000	1.3
+++ HTMLParserFactory.java	28 Mar 2006 00:52:15 -0000	1.4
@@ -111,7 +111,6 @@
      */
     public static void setPreserveTagCase( boolean preserveTagCase ) {
         _preserveTagCase = preserveTagCase;
-        if (preserveTagCase) _returnHTMLDocument = false;
     }
 
 
@@ -119,7 +118,7 @@
      * Returns true if the current parser will return an HTMLDocument object rather than a Document object.
      */
     public static boolean isReturnHTMLDocument() {
-        return _returnHTMLDocument && getHTMLParser().supportsReturnHTMLDocument();
+        return _returnHTMLDocument && !isPreserveTagCase() && getHTMLParser().supportsReturnHTMLDocument();
     }
 
 

Index: JTidyHTMLParser.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/parsing/JTidyHTMLParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JTidyHTMLParser.java	25 Dec 2002 15:23:11 -0000	1.2
+++ JTidyHTMLParser.java	28 Mar 2006 00:52:15 -0000	1.3
@@ -2,7 +2,7 @@
 /********************************************************************************************************************
  * $Id$
  *
- * Copyright (c) 2002, Russell Gold
+ * Copyright (c) 2002,2004, Russell Gold
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
@@ -20,6 +20,10 @@
  *
  *******************************************************************************************************************/
 import org.w3c.tidy.Tidy;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Node;
+import org.w3c.dom.html.HTMLDocument;
 import org.xml.sax.SAXException;
 
 import java.net.URL;
@@ -27,6 +31,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.UnsupportedEncodingException;
 
+import com.meterware.httpunit.dom.HTMLDocumentImpl;
+
 
 /**
  *
@@ -37,7 +43,14 @@
 
     public void parse( URL pageURL, String pageText, DocumentAdapter adapter ) throws IOException, SAXException {
         try {
-            adapter.setRootNode( getParser( pageURL ).parseDOM( new ByteArrayInputStream( pageText.getBytes( UTF_ENCODING ) ), null ) );
+            Document jtidyDocument = getParser( pageURL ).parseDOM( new ByteArrayInputStream( pageText.getBytes( UTF_ENCODING ) ), null );
+            HTMLDocument htmlDocument = new HTMLDocumentImpl();
+            NodeList nl = jtidyDocument.getChildNodes();
+            for (int i = 0; i < nl.getLength(); i++) {
+                Node importedNode = nl.item(i);
+                if (importedNode.getNodeType() != Node.DOCUMENT_TYPE_NODE) htmlDocument.appendChild( htmlDocument.importNode( importedNode, true ) );
+            }
+            adapter.setDocument( htmlDocument );
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException( "UTF-8 encoding failed" );
         }
@@ -55,7 +68,7 @@
 
 
     public boolean supportsReturnHTMLDocument() {
-        return false;
+        return true;
     }
 
 

Index: NekoDOMParser.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/parsing/NekoDOMParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NekoDOMParser.java	5 Oct 2004 11:29:52 -0000	1.3
+++ NekoDOMParser.java	28 Mar 2006 00:52:15 -0000	1.4
@@ -1,6 +1,26 @@
 package com.meterware.httpunit.parsing;
-
+/********************************************************************************************************************
+ * $Id$
+ *
+ * Copyright (c) 2002-2004, Russell Gold
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ *******************************************************************************************************************/
 import com.meterware.httpunit.scripting.ScriptableDelegate;
+import com.meterware.httpunit.dom.HTMLDocumentImpl;
 
 import java.net.URL;
 import java.io.IOException;
@@ -13,18 +33,18 @@
 import org.apache.xerces.xni.XNIException;
 import org.xml.sax.SAXNotRecognizedException;
 import org.xml.sax.SAXNotSupportedException;
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.html.HTMLDocument;
 
 /**
  * 
  *
- * @author <a href="rus...@ac...">Russell Gold</a>
+ * @author <a href="rus...@ht...">Russell Gold</a>
  * @author <a href="mailto:Art...@ly...">Artashes Aghajanyan</a>
  **/
-class NekoDOMParser extends org.apache.xerces.parsers.DOMParser {
+class NekoDOMParser extends org.apache.xerces.parsers.DOMParser implements ScriptHandler {
 
-    private static final String HTML_DOCUMENT_CLASS_NAME = "org.apache.html.dom.HTMLDocumentImpl";
+    // private static final String HTML_DOCUMENT_CLASS_NAME = "org.apache.html.dom.HTMLDocumentImpl";
 
     /** Error reporting feature identifier. */
     private static final String REPORT_ERRORS = "http://cyberneko.org/html/features/report-errors";
@@ -43,9 +63,6 @@
 
     private DocumentAdapter _documentAdapter;
 
-    /** The node representing the document. **/
-    private Node _documentNode;
-
 
     static NekoDOMParser newParser( DocumentAdapter adapter, URL url ) {
         final HTMLConfiguration configuration = new HTMLConfiguration();
@@ -64,8 +81,8 @@
         try {
             final NekoDOMParser domParser = new NekoDOMParser( configuration, adapter );
             domParser.setFeature( DEFER_NODE_EXPANSION, false );
-            if (HTMLParserFactory.isReturnHTMLDocument()) domParser.setProperty( DOCUMENT_CLASS_NAME, HTML_DOCUMENT_CLASS_NAME );
-            javaScriptFilter.setParser( domParser );
+            if (HTMLParserFactory.isReturnHTMLDocument()) domParser.setProperty( DOCUMENT_CLASS_NAME, HTMLDocumentImpl.class.getName() );
+            javaScriptFilter.setScriptHandler( domParser );
             return domParser;
         } catch (SAXNotRecognizedException e) {
             throw new RuntimeException( e.toString() );
@@ -76,21 +93,9 @@
     }
 
 
-    ScriptableDelegate getScriptableDelegate() {
-        if (_documentNode == null) {
-            Node node = getCurrentElementNode();
-            while (!(node instanceof Document)) node = node.getParentNode();
-            _documentNode = node;
-        }
-        _documentAdapter.setRootNode( _documentNode );
-        return _documentAdapter.getScriptableObject();
-    }
-
-
-    private Node getCurrentElementNode() {
+    private Element getCurrentElement() {
         try {
-            final Node node = (Node) getProperty( CURRENT_ELEMENT_NODE );
-            return node;
+            return (Element) getProperty( CURRENT_ELEMENT_NODE );
         } catch (SAXNotRecognizedException e) {
             throw new RuntimeException( CURRENT_ELEMENT_NODE + " property not recognized" );
         } catch (SAXNotSupportedException e) {
@@ -100,7 +105,13 @@
     }
 
 
-    String getIncludedScript( String srcAttribute ) {
+    NekoDOMParser( HTMLConfiguration configuration, DocumentAdapter adapter ) {
+        super( configuration );
+        _documentAdapter = adapter;
+    }
+
+
+    public String getIncludedScript( String srcAttribute ) {
         try {
             return _documentAdapter.getIncludedScript( srcAttribute );
         } catch (IOException e) {
@@ -109,9 +120,20 @@
     }
 
 
-    NekoDOMParser( HTMLConfiguration configuration, DocumentAdapter adapter ) {
-        super( configuration );
-        _documentAdapter = adapter;
+    public boolean supportsScriptLanguage( String language ) {
+        return getScriptableDelegate().supportsScript( language );
+    }
+
+
+    public String runScript( final String language, final String scriptText ) {
+        getScriptableDelegate().getScriptEngine().clearCaches();
+        return getScriptableDelegate().runScript( language, scriptText );
+    }
+
+
+    private ScriptableDelegate getScriptableDelegate() {
+        _documentAdapter.setDocument( (HTMLDocument) getCurrentElement().getOwnerDocument() );
+        return _documentAdapter.getScriptableObject();
     }
 
 

Index: NekoHTMLParser.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/parsing/NekoHTMLParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NekoHTMLParser.java	9 Mar 2003 20:35:47 -0000	1.4
+++ NekoHTMLParser.java	28 Mar 2006 00:52:15 -0000	1.5
@@ -2,7 +2,7 @@
 /********************************************************************************************************************
  * $Id$
  *
- * Copyright (c) 2002-2003, Russell Gold
+ * Copyright (c) 2002-2004, Russell Gold
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
@@ -21,6 +21,7 @@
  *******************************************************************************************************************/
 import org.xml.sax.SAXException;
 import org.xml.sax.InputSource;
+import org.w3c.dom.html.HTMLDocument;
 
 import java.net.URL;
 import java.io.IOException;
@@ -39,7 +40,7 @@
         try {
             NekoDOMParser parser = NekoDOMParser.newParser( adapter, pageURL );
             parser.parse( new InputSource( new StringReader( pageText ) ) );
-            adapter.setRootNode( parser.getDocument() );
+            adapter.setDocument( (HTMLDocument) parser.getDocument() );
         } catch (NekoDOMParser.ScriptException e) {
              throw e.getException();
         }
@@ -52,7 +53,7 @@
 
 
     public boolean supportsPreserveTagCase() {
-        return true;
+        return false;
     }
 
 

Index: ScriptFilter.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/parsing/ScriptFilter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ScriptFilter.java	9 Mar 2004 21:49:18 -0000	1.5
+++ ScriptFilter.java	28 Mar 2006 00:52:15 -0000	1.6
@@ -56,7 +56,7 @@
     private int _scriptIndex;
 
     /** The parser in which this filter is running. **/
-    private NekoDOMParser _domParser;
+    private ScriptHandler _scriptHandler;
 
 
     /** Constructs a script object with the specified configuration. */
@@ -65,8 +65,8 @@
     }
 
 
-    public void setParser( NekoDOMParser domParser ) {
-        _domParser = domParser;
+    public void setScriptHandler( ScriptHandler scriptHandler ) {
+        _scriptHandler = scriptHandler;
     }
 
 
@@ -89,7 +89,7 @@
             _activeScriptBlock = new StringBuffer();
             _scriptLanguage = getScriptLanguage( attrs );
             String srcAttribute = attrs.getValue( "src" );
-            if (srcAttribute != null) _activeScriptBlock.append( _domParser.getIncludedScript( srcAttribute ) );
+            if (srcAttribute != null) _activeScriptBlock.append( _scriptHandler.getIncludedScript( srcAttribute ) );
         }
     }
 
@@ -97,7 +97,7 @@
     private boolean isSupportedScript( QName element, XMLAttributes attrs ) {
         if (!element.rawname.equalsIgnoreCase( "script" ) || attrs == null) return false;
         String value = getScriptLanguage( attrs );
-        return _domParser.getScriptableDelegate().supportsScript( value );
+        return _scriptHandler.supportsScriptLanguage( value );
     }
 
 
@@ -147,8 +147,7 @@
 
 
     protected String getTranslatedScript( final String language, final String scriptText ) throws IOException {
-        _domParser.getScriptableDelegate().getScriptEngine().clearCaches();
-        return _domParser.getScriptableDelegate().runScript( language, scriptText );
+        return _scriptHandler.runScript( language, scriptText );
     }