You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by js...@apache.org on 2002/12/11 13:41:02 UTC
cvs commit: jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/impl TestTagLibraryResolver.java
jstrachan 2002/12/11 04:41:02
Modified: jelly/src/java/org/apache/commons/jelly/tags/werkz
AttainTag.java AttainGoalTag.java
PostActionTag.java PostGoalTag.java GoalTag.java
ProjectTag.java PreGoalTag.java
JellyBuildListener.java PreActionTag.java
WerkzTagLibrary.java
jelly/src/java/org/apache/commons/jelly/tags/log
ErrorTag.java LogTagSupport.java InfoTag.java
DebugTag.java FatalTag.java WarnTag.java
TraceTag.java
jelly/src/java/org/apache/commons/jelly/tags/core
SwitchTag.java OtherwiseTag.java ChooseTag.java
WhenTag.java WhileTag.java CatchTag.java
FileTag.java ForEachTag.java ImportTag.java
SetTag.java IncludeTag.java ExprTag.java
WhitespaceTag.java IfTag.java ThreadTag.java
JellyTag.java CoreTagLibrary.java
jelly/src/java/org/apache/commons/jelly/tags/jsl
StyleTag.java XPathPatternExpression.java
StylesheetTag.java ApplyTemplatesTag.java
JSLTagLibrary.java TemplateTag.java
jelly/src/java/org/apache/commons/jelly/impl
DynamicDynaBeanTag.java ScriptBlock.java
DefaultTagLibraryResolver.java
CompositeTextScriptBlock.java StaticTag.java
DynamicTagLibrary.java Attribute.java
DynamicTag.java StaticTagScript.java
TextScript.java
jelly/src/java/org/apache/commons/jelly/tags/dynabean
DynabeanTagLibrary.java DynabeanTag.java
PropertyTag.java DynaclassTag.java SetTag.java
jelly/src/java/org/apache/commons/jelly/tags/xml
XPathSource.java DoctypeTag.java ElementTag.java
XPathExpression.java IfTag.java
XPathTagSupport.java AttributeTag.java
ParseTagSupport.java ParamTag.java CopyTag.java
ExprTag.java CopyOfTag.java XPathComparator.java
jelly/src/test/org/apache/commons/jelly/jetty
TestJettyHttpServerTags.java
jelly/src/java/org/apache/commons/jelly/tags/define
InvokeBodyTag.java DynaBeanTag.java ScriptTag.java
SuperTag.java TaglibTag.java ClassLoaderTag.java
JellyBeanTag.java TagTag.java InvokeTag.java
jelly/src/java/org/apache/commons/jelly/tags/swing
TrTag.java TitledBorderTag.java TableModelTag.java
TableModelColumnTag.java GbcTag.java
BorderAlignTag.java TdTag.java
LayoutTagSupport.java GridBagLayoutTag.java
ConstraintTag.java ActionTag.java
BorderLayoutTag.java WindowListenerTag.java
BorderTagSupport.java TableLayoutTag.java
jelly/src/test/org/apache/commons/jelly/xml TestXMLTags.java
jelly/src/test/org/apache/commons/jelly/jsl TestJSL.java
jelly/src/test/org/apache/commons/jelly/test/xml
TestXMLParserCache.java TestXMLValidation.java
TestDummyXMLOutput.java
TestDefaultNamespaceFilter.java
jelly/src/java/org/apache/commons/jelly/tags/interaction
InteractionTagLibrary.java
jelly/src/test/org/apache/commons/jelly TestParser.java
TestCoreTags.java
jelly/src/java/org/apache/commons/jelly/tags/jms
MessageOperationTag.java SendTag.java
ConnectionTag.java DestinationTag.java
SubscribeTag.java
jelly/src/java/org/apache/commons/jelly/tags/quartz
QuartzTagSupport.java
jelly/src/java/org/apache/commons/jelly/tags/sql
TransactionTag.java DateParamTag.java
UpdateTag.java SetDataSourceTag.java
DataSourceWrapper.java SqlTagSupport.java
RowTag.java QueryTag.java DriverTag.java
ParamTag.java
jelly/src/java/org/apache/commons/jelly/tags/bean
BeanPropertyTag.java BeandefTag.java BeanTag.java
jelly/src/java/org/apache/commons/jelly/tags/validate
ValidateTag.java VerifierTag.java
AssertValidTag.java
jelly/src/java/org/apache/commons/jelly/tags/swing/impl
Cell.java
jelly/src/java/org/apache/commons/jelly/tags/jetty
NotFoundHandlerTag.java DeleteRequestTag.java
JettyHttpServerTag.java
AbstractMethodHandlerTag.java
SecurityHandlerTag.java
jelly/src/java/org/apache/commons/jelly/tags/bsf
BSFExpressionFactory.java
jelly/src/java/org/apache/commons/jelly/tags/util
PropertiesTag.java AvailableTag.java
TokenizeTag.java SleepTag.java
jelly/src/java/org/apache/commons/jelly/task
AntJellyContext.java JellyTask.java
jelly/src/test/org/apache/commons/jelly/core
TestIncludeNesting.java
jelly/src/java/org/apache/commons/jelly/tags/ant
FileScannerTag.java FileIterator.java
jelly/src/java/org/apache/commons/jelly/tags/betwixt
IntrospectorTag.java
jelly/src/java/org/apache/commons/jelly/tags/jeez
JeezTagLibrary.java
jelly/src/java/org/apache/commons/jelly/expression
ExpressionFactory.java
jelly/src/java/org/apache/commons/jelly/tags/swing/model
ExpressionTableModel.java
jelly/src/test/org/apache/commons/jelly/swing
MyTableModel.java
jelly/src/java/org/apache/commons/jelly/tags/soap
InvokeTag.java SoapTagLibrary.java
jelly/src/test/org/apache/commons/jelly/test/impl
DummyTagLibrary.java
jelly/src/java/org/apache/commons/jelly/tags/junit
JellyTestSuite.java AssertEqualsTag.java
AssertTagSupport.java RunTag.java
jelly/src/java/org/apache/commons/jelly/util
TagXMLDoclet.java
jelly/src/java/org/apache/commons/jelly/tags/xmlunit
XMLUnitTagSupport.java
jelly/src/test/org/apache/commons/jelly/demos
HomepageBuilder.java
jelly/src/java/org/apache/commons/jelly/tags/beanshell
ScriptTag.java
jelly/src/java/org/apache/commons/jelly/tags/ojb
StoreTag.java BrokerTag.java
jelly/src/test/org/apache/commons/jelly/ant/tag
DummyTag.java
jelly/src/test/org/apache/commons/jelly/define
TestDynamicTags.java
jelly/src/java/org/apache/commons/jelly/servlet
JellyServlet.java
jelly/src/test/org/apache/commons/jelly/impl
TestTagLibraryResolver.java
Log:
Removed lots of unused import statements. Thanks to eclipse for making this easy to do. (Though it'd be a nice Maven plugin too).
Revision Changes Path
1.5 +1 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/AttainTag.java
Index: AttainTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/AttainTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AttainTag.java 23 Oct 2002 16:27:43 -0000 1.4
+++ AttainTag.java 11 Dec 2002 12:40:53 -0000 1.5
@@ -58,10 +58,8 @@
package org.apache.commons.jelly.tags.werkz;
-import com.werken.werkz.Goal;
import com.werken.werkz.Session;
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
1.8 +1 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/AttainGoalTag.java
Index: AttainGoalTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/AttainGoalTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AttainGoalTag.java 23 Oct 2002 16:27:44 -0000 1.7
+++ AttainGoalTag.java 11 Dec 2002 12:40:53 -0000 1.8
@@ -58,7 +58,6 @@
package org.apache.commons.jelly.tags.werkz;
-import com.werken.werkz.Goal;
import com.werken.werkz.Session;
import com.werken.werkz.Project;
import com.werken.werkz.UnattainableGoalException;
1.4 +3 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/PostActionTag.java
Index: PostActionTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/PostActionTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PostActionTag.java 23 Oct 2002 16:27:43 -0000 1.3
+++ PostActionTag.java 11 Dec 2002 12:40:53 -0000 1.4
@@ -58,14 +58,10 @@
package org.apache.commons.jelly.tags.werkz;
-import com.werken.werkz.Goal;
-import com.werken.werkz.PostActionCallback;
-
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.werken.werkz.Goal;
+import com.werken.werkz.PostActionCallback;
/**
* Implements a <postAction> tag which provides a callback
1.5 +3 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/PostGoalTag.java
Index: PostGoalTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/PostGoalTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PostGoalTag.java 23 Oct 2002 16:27:44 -0000 1.4
+++ PostGoalTag.java 11 Dec 2002 12:40:53 -0000 1.5
@@ -58,14 +58,10 @@
package org.apache.commons.jelly.tags.werkz;
-import com.werken.werkz.Goal;
-import com.werken.werkz.PostGoalCallback;
-
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.werken.werkz.Goal;
+import com.werken.werkz.PostGoalCallback;
/**
* Implements a <postGoal> tag which provides a callback
1.9 +6 -10 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/GoalTag.java
Index: GoalTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/GoalTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GoalTag.java 23 Oct 2002 16:27:43 -0000 1.8
+++ GoalTag.java 11 Dec 2002 12:40:53 -0000 1.9
@@ -58,20 +58,16 @@
package org.apache.commons.jelly.tags.werkz;
-import com.werken.werkz.Goal;
-import com.werken.werkz.Action;
-import com.werken.werkz.DefaultAction;
-import com.werken.werkz.CyclicGoalChainException;
-
-import java.util.Iterator;
-import java.util.List;
import java.util.StringTokenizer;
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import com.werken.werkz.Action;
+import com.werken.werkz.CyclicGoalChainException;
+import com.werken.werkz.DefaultAction;
+import com.werken.werkz.Goal;
/**
* Implements a <target> tag which is similar to the Ant equivalent tag
1.15 +2 -8 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/ProjectTag.java
Index: ProjectTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/ProjectTag.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ProjectTag.java 23 Oct 2002 16:27:43 -0000 1.14
+++ ProjectTag.java 11 Dec 2002 12:40:53 -0000 1.15
@@ -58,16 +58,10 @@
package org.apache.commons.jelly.tags.werkz;
-import com.werken.werkz.Project;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.ant.AntTagLibrary;
+
+import com.werken.werkz.Project;
/**
* The root tag of a Project definition.
1.6 +3 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/PreGoalTag.java
Index: PreGoalTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/PreGoalTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PreGoalTag.java 23 Oct 2002 16:27:44 -0000 1.5
+++ PreGoalTag.java 11 Dec 2002 12:40:53 -0000 1.6
@@ -58,14 +58,10 @@
package org.apache.commons.jelly.tags.werkz;
-import com.werken.werkz.Goal;
-import com.werken.werkz.PreGoalCallback;
-
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.werken.werkz.Goal;
+import com.werken.werkz.PreGoalCallback;
/**
* Implements a <preGoal> tag which provides a callback
1.5 +66 -8 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/JellyBuildListener.java
Index: JellyBuildListener.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/JellyBuildListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JellyBuildListener.java 4 Sep 2002 18:35:51 -0000 1.4
+++ JellyBuildListener.java 11 Dec 2002 12:40:53 -0000 1.5
@@ -1,17 +1,75 @@
+/*
+ * $Header$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * $Id$
+ */
package org.apache.commons.jelly.tags.werkz;
-import org.apache.commons.jelly.XMLOutput;
+import java.io.IOException;
+import java.util.Stack;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildListener;
+import org.apache.commons.jelly.XMLOutput;
import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.taskdefs.optional.junit.JUnitTask;
-
+import org.apache.tools.ant.BuildListener;
+import org.apache.tools.ant.Project;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.util.Stack;
public class JellyBuildListener implements BuildListener
{
1.4 +3 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/PreActionTag.java
Index: PreActionTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/PreActionTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PreActionTag.java 23 Oct 2002 16:27:44 -0000 1.3
+++ PreActionTag.java 11 Dec 2002 12:40:53 -0000 1.4
@@ -58,14 +58,10 @@
package org.apache.commons.jelly.tags.werkz;
-import com.werken.werkz.Goal;
-import com.werken.werkz.PreActionCallback;
-
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.werken.werkz.Goal;
+import com.werken.werkz.PreActionCallback;
/**
* Implements a <preAction> tag which provides a callback
1.6 +0 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/WerkzTagLibrary.java
Index: WerkzTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/WerkzTagLibrary.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WerkzTagLibrary.java 30 Oct 2002 19:16:34 -0000 1.5
+++ WerkzTagLibrary.java 11 Dec 2002 12:40:53 -0000 1.6
@@ -61,14 +61,7 @@
*/
package org.apache.commons.jelly.tags.werkz;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagLibrary;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.4 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/ErrorTag.java
Index: ErrorTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/ErrorTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ErrorTag.java 30 Oct 2002 19:16:18 -0000 1.3
+++ ErrorTag.java 11 Dec 2002 12:40:54 -0000 1.4
@@ -61,9 +61,7 @@
*/
package org.apache.commons.jelly.tags.log;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
/**
1.4 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/LogTagSupport.java
Index: LogTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/LogTagSupport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogTagSupport.java 30 Oct 2002 19:16:18 -0000 1.3
+++ LogTagSupport.java 11 Dec 2002 12:40:54 -0000 1.4
@@ -61,10 +61,7 @@
*/
package org.apache.commons.jelly.tags.log;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.4 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/InfoTag.java
Index: InfoTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/InfoTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InfoTag.java 30 Oct 2002 19:16:18 -0000 1.3
+++ InfoTag.java 11 Dec 2002 12:40:54 -0000 1.4
@@ -61,9 +61,7 @@
*/
package org.apache.commons.jelly.tags.log;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
/**
1.4 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/DebugTag.java
Index: DebugTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/DebugTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DebugTag.java 30 Oct 2002 19:16:18 -0000 1.3
+++ DebugTag.java 11 Dec 2002 12:40:54 -0000 1.4
@@ -61,9 +61,7 @@
*/
package org.apache.commons.jelly.tags.log;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
/**
1.4 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/FatalTag.java
Index: FatalTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/FatalTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FatalTag.java 30 Oct 2002 19:16:18 -0000 1.3
+++ FatalTag.java 11 Dec 2002 12:40:54 -0000 1.4
@@ -61,9 +61,7 @@
*/
package org.apache.commons.jelly.tags.log;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
/**
1.4 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/WarnTag.java
Index: WarnTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/WarnTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WarnTag.java 30 Oct 2002 19:16:18 -0000 1.3
+++ WarnTag.java 11 Dec 2002 12:40:54 -0000 1.4
@@ -61,9 +61,7 @@
*/
package org.apache.commons.jelly.tags.log;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
/**
1.4 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/TraceTag.java
Index: TraceTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/log/TraceTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TraceTag.java 30 Oct 2002 19:16:18 -0000 1.3
+++ TraceTag.java 11 Dec 2002 12:40:54 -0000 1.4
@@ -61,9 +61,7 @@
*/
package org.apache.commons.jelly.tags.log;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
/**
1.3 +5 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/SwitchTag.java
Index: SwitchTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/SwitchTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SwitchTag.java 30 Oct 2002 19:16:20 -0000 1.2
+++ SwitchTag.java 11 Dec 2002 12:40:54 -0000 1.3
@@ -66,7 +66,6 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
-import bsh.This;
/**
* Executes the child <case> tag whose value equals my on attribute.
1.9 +5 -11 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/OtherwiseTag.java
Index: OtherwiseTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/OtherwiseTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- OtherwiseTag.java 30 Oct 2002 19:16:20 -0000 1.8
+++ OtherwiseTag.java 11 Dec 2002 12:40:54 -0000 1.9
@@ -61,15 +61,9 @@
*/
package org.apache.commons.jelly.tags.core;
-import java.io.IOException;
-import java.io.Writer;
-
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.expression.Expression;
/** The otherwise block of a choose/when/otherwise group of tags
*
1.8 +5 -17 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ChooseTag.java
Index: ChooseTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ChooseTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChooseTag.java 30 Oct 2002 19:16:20 -0000 1.7
+++ ChooseTag.java 11 Dec 2002 12:40:54 -0000 1.8
@@ -61,20 +61,8 @@
*/
package org.apache.commons.jelly.tags.core;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.impl.ScriptBlock;
-import org.apache.commons.jelly.impl.TagScript;
-import org.apache.commons.jelly.expression.Expression;
/** A tag which conditionally evaluates its body based on some condition
*
1.10 +5 -10 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/WhenTag.java
Index: WhenTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/WhenTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WhenTag.java 16 Nov 2002 09:49:08 -0000 1.9
+++ WhenTag.java 11 Dec 2002 12:40:54 -0000 1.10
@@ -61,12 +61,7 @@
*/
package org.apache.commons.jelly.tags.core;
-import java.io.IOException;
-import java.io.Writer;
-
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
1.5 +0 -8 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/WhileTag.java
Index: WhileTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/WhileTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WhileTag.java 30 Oct 2002 19:16:21 -0000 1.4
+++ WhileTag.java 11 Dec 2002 12:40:54 -0000 1.5
@@ -62,19 +62,11 @@
package org.apache.commons.jelly.tags.core;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.impl.BreakException;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +0 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/CatchTag.java
Index: CatchTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/CatchTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CatchTag.java 30 Oct 2002 19:16:21 -0000 1.2
+++ CatchTag.java 11 Dec 2002 12:40:54 -0000 1.3
@@ -61,7 +61,6 @@
*/
package org.apache.commons.jelly.tags.core;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.6 +2 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/FileTag.java
Index: FileTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/FileTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FileTag.java 25 Nov 2002 13:43:37 -0000 1.5
+++ FileTag.java 11 Dec 2002 12:40:54 -0000 1.6
@@ -56,17 +56,15 @@
*/
package org.apache.commons.jelly.tags.core;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.StringWriter;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.OutputStreamWriter;
+import java.io.StringWriter;
import java.io.Writer;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.dom4j.io.HTMLWriter;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
1.19 +5 -11 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ForEachTag.java
Index: ForEachTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ForEachTag.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ForEachTag.java 30 Oct 2002 19:16:20 -0000 1.18
+++ ForEachTag.java 11 Dec 2002 12:40:54 -0000 1.19
@@ -62,19 +62,13 @@
package org.apache.commons.jelly.tags.core;
-import java.io.IOException;
-import java.io.Writer;
import java.util.Iterator;
-import java.util.List;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.impl.BreakException;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.4 +5 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ImportTag.java
Index: ImportTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ImportTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ImportTag.java 30 Oct 2002 19:16:21 -0000 1.3
+++ ImportTag.java 11 Dec 2002 12:40:54 -0000 1.4
@@ -62,8 +62,6 @@
package org.apache.commons.jelly.tags.core;
-import java.net.URL;
-
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.10 +5 -11 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/SetTag.java
Index: SetTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/SetTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SetTag.java 30 Oct 2002 19:16:20 -0000 1.9
+++ SetTag.java 11 Dec 2002 12:40:54 -0000 1.10
@@ -61,19 +61,13 @@
*/
package org.apache.commons.jelly.tags.core;
-import java.io.Writer;
-import java.util.HashMap;
import java.util.Map;
import org.apache.commons.beanutils.BeanUtils;
-
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.10 +5 -9 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/IncludeTag.java
Index: IncludeTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/IncludeTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- IncludeTag.java 30 Oct 2002 19:16:20 -0000 1.9
+++ IncludeTag.java 11 Dec 2002 12:40:54 -0000 1.10
@@ -62,11 +62,7 @@
package org.apache.commons.jelly.tags.core;
-import java.net.URL;
-
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.11 +5 -8 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ExprTag.java
Index: ExprTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ExprTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ExprTag.java 30 Oct 2002 19:16:20 -0000 1.10
+++ ExprTag.java 11 Dec 2002 12:40:54 -0000 1.11
@@ -61,12 +61,9 @@
*/
package org.apache.commons.jelly.tags.core;
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.4 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java
Index: WhitespaceTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WhitespaceTag.java 30 Oct 2002 19:16:20 -0000 1.3
+++ WhitespaceTag.java 11 Dec 2002 12:40:54 -0000 1.4
@@ -61,10 +61,8 @@
*/
package org.apache.commons.jelly.tags.core;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.10 +5 -10 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/IfTag.java
Index: IfTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/IfTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- IfTag.java 30 Oct 2002 19:16:21 -0000 1.9
+++ IfTag.java 11 Dec 2002 12:40:54 -0000 1.10
@@ -61,12 +61,7 @@
*/
package org.apache.commons.jelly.tags.core;
-import java.io.IOException;
-import java.io.Writer;
-
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
1.7 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ThreadTag.java
Index: ThreadTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ThreadTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ThreadTag.java 30 Oct 2002 19:16:21 -0000 1.6
+++ ThreadTag.java 11 Dec 2002 12:40:54 -0000 1.7
@@ -57,11 +57,9 @@
package org.apache.commons.jelly.tags.core;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.IOException;
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.10 +5 -15 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/JellyTag.java
Index: JellyTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/JellyTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JellyTag.java 30 Oct 2002 19:16:20 -0000 1.9
+++ JellyTag.java 11 Dec 2002 12:40:54 -0000 1.10
@@ -61,18 +61,8 @@
*/
package org.apache.commons.jelly.tags.core;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.List;
-
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.expression.Expression;
-import org.apache.commons.jelly.impl.ScriptBlock;
-import org.apache.commons.jelly.impl.TextScript;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.25 +5 -14 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/CoreTagLibrary.java
Index: CoreTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/CoreTagLibrary.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- CoreTagLibrary.java 29 Nov 2002 15:53:10 -0000 1.24
+++ CoreTagLibrary.java 11 Dec 2002 12:40:54 -0000 1.25
@@ -61,16 +61,7 @@
*/
package org.apache.commons.jelly.tags.core;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagLibrary;
-import org.apache.commons.jelly.expression.Expression;
-import org.apache.commons.jelly.expression.ExpressionFactory;
/** Describes the Taglib. This class could be generated by XDoclet
*
1.4 +0 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jsl/StyleTag.java
Index: StyleTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jsl/StyleTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StyleTag.java 20 Nov 2002 22:20:20 -0000 1.3
+++ StyleTag.java 11 Dec 2002 12:40:55 -0000 1.4
@@ -57,16 +57,12 @@
*/
package org.apache.commons.jelly.tags.jsl;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.xml.XPathTagSupport;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.dom4j.rule.Stylesheet;
-
import org.jaxen.XPath;
/**
1.4 +0 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java
Index: XPathPatternExpression.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XPathPatternExpression.java 27 Nov 2002 12:43:19 -0000 1.3
+++ XPathPatternExpression.java 11 Dec 2002 12:40:55 -0000 1.4
@@ -61,16 +61,9 @@
*/
package org.apache.commons.jelly.tags.jsl;
-import java.io.IOException;
-import java.io.Writer;
-
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.expression.ExpressionSupport;
-
import org.dom4j.rule.Pattern;
-
import org.jaxen.VariableContext;
/** An expression which returns an XPath based Pattern (like an XSLT pattern).
1.9 +0 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java
Index: StylesheetTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StylesheetTag.java 20 Nov 2002 22:20:20 -0000 1.8
+++ StylesheetTag.java 11 Dec 2002 12:40:55 -0000 1.9
@@ -57,20 +57,13 @@
*/
package org.apache.commons.jelly.tags.jsl;
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.xml.XPathSource;
import org.apache.commons.jelly.tags.xml.XPathTagSupport;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.dom4j.Node;
-import org.dom4j.rule.Action;
import org.dom4j.rule.Rule;
import org.dom4j.rule.Stylesheet;
-
import org.jaxen.XPath;
1.6 +0 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java
Index: ApplyTemplatesTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApplyTemplatesTag.java 20 Nov 2002 22:20:20 -0000 1.5
+++ ApplyTemplatesTag.java 11 Dec 2002 12:40:55 -0000 1.6
@@ -57,16 +57,12 @@
*/
package org.apache.commons.jelly.tags.jsl;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.dom4j.rule.Stylesheet;
-
import org.jaxen.XPath;
/**
1.7 +0 -10 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java
Index: JSLTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JSLTagLibrary.java 27 Nov 2002 12:43:20 -0000 1.6
+++ JSLTagLibrary.java 11 Dec 2002 12:40:55 -0000 1.7
@@ -61,27 +61,17 @@
*/
package org.apache.commons.jelly.tags.jsl;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.expression.ExpressionFactory;
import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.jelly.tags.xml.ExprTag;
import org.apache.commons.jelly.tags.xml.XMLTagLibrary;
import org.apache.commons.jelly.tags.xml.XPathExpression;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.dom4j.DocumentHelper;
import org.dom4j.rule.Pattern;
-
import org.jaxen.JaxenException;
import org.jaxen.XPath;
import org.jaxen.dom4j.Dom4jXPath;
1.9 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java
Index: TemplateTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TemplateTag.java 20 Nov 2002 22:20:20 -0000 1.8
+++ TemplateTag.java 11 Dec 2002 12:40:55 -0000 1.9
@@ -58,15 +58,12 @@
package org.apache.commons.jelly.tags.jsl;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.xml.XPathSource;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.dom4j.Node;
import org.dom4j.rule.Action;
import org.dom4j.rule.Pattern;
1.3 +0 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java
Index: DynamicDynaBeanTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DynamicDynaBeanTag.java 30 Oct 2002 19:16:24 -0000 1.2
+++ DynamicDynaBeanTag.java 11 Dec 2002 12:40:55 -0000 1.3
@@ -66,17 +66,11 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.beanutils.DynaClass;
-
import org.apache.commons.jelly.DynaBeanTagSupport;
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
-import org.apache.commons.jelly.impl.BeanSource;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.9 +5 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/ScriptBlock.java
Index: ScriptBlock.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/ScriptBlock.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ScriptBlock.java 30 Oct 2002 19:16:23 -0000 1.8
+++ ScriptBlock.java 11 Dec 2002 12:40:55 -0000 1.9
@@ -61,7 +61,6 @@
*/
package org.apache.commons.jelly.impl;
-import java.io.Writer;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
1.5 +0 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
Index: DefaultTagLibraryResolver.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultTagLibraryResolver.java 30 Oct 2002 19:16:23 -0000 1.4
+++ DefaultTagLibraryResolver.java 11 Dec 2002 12:40:55 -0000 1.5
@@ -60,11 +60,7 @@
import org.apache.commons.discovery.ResourceClassIterator;
import org.apache.commons.discovery.resource.ClassLoaders;
import org.apache.commons.discovery.resource.classes.DiscoverClasses;
-import org.apache.commons.discovery.tools.DiscoverClass;
-import org.apache.commons.discovery.tools.DiscoverSingleton;
-
import org.apache.commons.jelly.TagLibrary;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +0 -8 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java
Index: CompositeTextScriptBlock.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CompositeTextScriptBlock.java 30 Oct 2002 19:16:23 -0000 1.2
+++ CompositeTextScriptBlock.java 11 Dec 2002 12:40:55 -0000 1.3
@@ -61,14 +61,6 @@
*/
package org.apache.commons.jelly.impl;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.XMLOutput;
/**
* <p><code>CompositeTextScriptBlock</code> represents a text body of a
1.13 +5 -9 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/StaticTag.java
Index: StaticTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/StaticTag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StaticTag.java 30 Oct 2002 19:16:23 -0000 1.12
+++ StaticTag.java 11 Dec 2002 12:40:55 -0000 1.13
@@ -61,12 +61,8 @@
*/
package org.apache.commons.jelly.impl;
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.DynaTag;
import org.apache.commons.jelly.DynaTagSupport;
import org.apache.commons.jelly.XMLOutput;
-
-import org.xml.sax.Attributes;
import org.xml.sax.helpers.AttributesImpl;
/**
1.9 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java
Index: DynamicTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DynamicTagLibrary.java 30 Oct 2002 19:30:46 -0000 1.8
+++ DynamicTagLibrary.java 11 Dec 2002 12:40:55 -0000 1.9
@@ -64,11 +64,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.jelly.DynaTag;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.TagLibrary;
-
import org.xml.sax.Attributes;
/**
1.3 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/Attribute.java
Index: Attribute.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/Attribute.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Attribute.java 30 Oct 2002 19:16:23 -0000 1.2
+++ Attribute.java 11 Dec 2002 12:40:55 -0000 1.3
@@ -63,9 +63,6 @@
import org.apache.commons.jelly.expression.Expression;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* Represents the attribute definition used by dynamic tags, such as whether the attribute is required
* or any default values etc.
1.4 +1 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DynamicTag.java
Index: DynamicTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DynamicTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DynamicTag.java 30 Oct 2002 19:16:23 -0000 1.3
+++ DynamicTag.java 11 Dec 2002 12:40:55 -0000 1.4
@@ -64,12 +64,10 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.DynaTag;
import org.apache.commons.jelly.DynaTagSupport;
+import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.12 +1 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/StaticTagScript.java
Index: StaticTagScript.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/StaticTagScript.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StaticTagScript.java 30 Oct 2002 19:16:23 -0000 1.11
+++ StaticTagScript.java 11 Dec 2002 12:40:55 -0000 1.12
@@ -64,17 +64,13 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.jelly.CompilableTag;
+import org.apache.commons.jelly.DynaTag;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.Tag;
-import org.apache.commons.jelly.DynaTag;
-import org.apache.commons.jelly.DynaBeanTagSupport;
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.11 +5 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/TextScript.java
Index: TextScript.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/TextScript.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TextScript.java 30 Oct 2002 19:16:23 -0000 1.10
+++ TextScript.java 11 Dec 2002 12:40:55 -0000 1.11
@@ -61,8 +61,6 @@
*/
package org.apache.commons.jelly.impl;
-import java.io.Writer;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
1.3 +0 -9 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/dynabean/DynabeanTagLibrary.java
Index: DynabeanTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/dynabean/DynabeanTagLibrary.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DynabeanTagLibrary.java 30 Oct 2002 19:16:32 -0000 1.2
+++ DynabeanTagLibrary.java 11 Dec 2002 12:40:56 -0000 1.3
@@ -61,16 +61,7 @@
*/
package org.apache.commons.jelly.tags.dynabean;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagLibrary;
-import org.apache.commons.jelly.expression.Expression;
-import org.apache.commons.jelly.expression.ExpressionFactory;
/** Describes the Taglib. This class could be generated by XDoclet
*
1.3 +3 -16 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/dynabean/DynabeanTag.java
Index: DynabeanTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/dynabean/DynabeanTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DynabeanTag.java 30 Oct 2002 19:16:32 -0000 1.2
+++ DynabeanTag.java 11 Dec 2002 12:40:56 -0000 1.3
@@ -61,24 +61,11 @@
*/
package org.apache.commons.jelly.tags.dynabean;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.Tag;
+import org.apache.commons.beanutils.DynaBean;
+import org.apache.commons.beanutils.DynaClass;
+import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.impl.ScriptBlock;
-import org.apache.commons.jelly.impl.TagScript;
-import org.apache.commons.jelly.expression.Expression;
-
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.beanutils.*;
/** A tag which conditionally evaluates its body based on some condition
1.3 +1 -8 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/dynabean/PropertyTag.java
Index: PropertyTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/dynabean/PropertyTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertyTag.java 30 Oct 2002 19:16:32 -0000 1.2
+++ PropertyTag.java 11 Dec 2002 12:40:56 -0000 1.3
@@ -61,18 +61,11 @@
*/
package org.apache.commons.jelly.tags.dynabean;
-import java.io.IOException;
-import java.io.Writer;
-
-import org.apache.commons.jelly.JellyContext;
+import org.apache.commons.beanutils.DynaProperty;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.expression.Expression;
-
-import org.apache.commons.beanutils.*;
/**
* DynaProperty tag defines a property of a DynaClass
1.3 +5 -15 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/dynabean/DynaclassTag.java
Index: DynaclassTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/dynabean/DynaclassTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DynaclassTag.java 30 Oct 2002 19:16:32 -0000 1.2
+++ DynaclassTag.java 11 Dec 2002 12:40:56 -0000 1.3
@@ -61,25 +61,15 @@
*/
package org.apache.commons.jelly.tags.dynabean;
-import java.io.IOException;
-import java.io.Writer;
import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.Tag;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.impl.ScriptBlock;
-import org.apache.commons.jelly.impl.TagScript;
-import org.apache.commons.jelly.expression.Expression;
+import org.apache.commons.beanutils.BasicDynaClass;
+import org.apache.commons.beanutils.DynaClass;
+import org.apache.commons.beanutils.DynaProperty;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.MissingAttributeException;
-
-import org.apache.commons.beanutils.*;
+import org.apache.commons.jelly.TagSupport;
+import org.apache.commons.jelly.XMLOutput;
/**
* A tag which creates and defines and creates a DynaClass
1.3 +0 -8 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/dynabean/SetTag.java
Index: SetTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/dynabean/SetTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetTag.java 30 Oct 2002 19:16:32 -0000 1.2
+++ SetTag.java 11 Dec 2002 12:40:56 -0000 1.3
@@ -61,23 +61,15 @@
*/
package org.apache.commons.jelly.tags.dynabean;
-import java.io.Writer;
-import java.util.HashMap;
import java.util.Map;
import org.apache.commons.beanutils.BeanUtils;
-
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.apache.commons.beanutils.*;
/** A tag which sets a variable from the result of an expression
*
1.4 +0 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XPathSource.java
Index: XPathSource.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XPathSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XPathSource.java 30 Oct 2002 19:16:23 -0000 1.3
+++ XPathSource.java 11 Dec 2002 12:40:56 -0000 1.4
@@ -61,10 +61,6 @@
*/
package org.apache.commons.jelly.tags.xml;
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
/**
* A tag which is capable of producing a source of XPath context objects
1.3 +0 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/DoctypeTag.java
Index: DoctypeTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/DoctypeTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DoctypeTag.java 30 Oct 2002 19:16:23 -0000 1.2
+++ DoctypeTag.java 11 Dec 2002 12:40:56 -0000 1.3
@@ -61,13 +61,9 @@
*/
package org.apache.commons.jelly.tags.xml;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-import org.jaxen.XPath;
/**
* A tag which outputs a DOCTYPE declaration to the current XML output pipe.
1.6 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ElementTag.java
Index: ElementTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ElementTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElementTag.java 13 Nov 2002 19:35:15 -0000 1.5
+++ ElementTag.java 11 Dec 2002 12:40:56 -0000 1.6
@@ -61,13 +61,10 @@
*/
package org.apache.commons.jelly.tags.xml;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
1.11 +6 -13 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XPathExpression.java
Index: XPathExpression.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XPathExpression.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XPathExpression.java 27 Nov 2002 12:43:19 -0000 1.10
+++ XPathExpression.java 11 Dec 2002 12:40:56 -0000 1.11
@@ -61,25 +61,18 @@
*/
package org.apache.commons.jelly.tags.xml;
-import java.io.IOException;
-import java.io.Writer;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Map;
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.expression.ExpressionSupport;
import org.apache.commons.jelly.impl.TagScript;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.jaxen.XPath;
-import org.jaxen.NamespaceContext;
import org.jaxen.SimpleNamespaceContext;
import org.jaxen.VariableContext;
+import org.jaxen.XPath;
/** An expression which returns an XPath object.
*
1.4 +0 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/IfTag.java
Index: IfTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/IfTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IfTag.java 30 Oct 2002 19:16:23 -0000 1.3
+++ IfTag.java 11 Dec 2002 12:40:56 -0000 1.4
@@ -61,12 +61,8 @@
*/
package org.apache.commons.jelly.tags.xml;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.jaxen.XPath;
/**
1.4 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XPathTagSupport.java
Index: XPathTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XPathTagSupport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XPathTagSupport.java 30 Oct 2002 19:16:23 -0000 1.3
+++ XPathTagSupport.java 11 Dec 2002 12:40:56 -0000 1.4
@@ -61,10 +61,7 @@
*/
package org.apache.commons.jelly.tags.xml;
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
/** An abstract base class useful for implementation inheritence
*
1.3 +0 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/AttributeTag.java
Index: AttributeTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/AttributeTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AttributeTag.java 30 Oct 2002 19:16:23 -0000 1.2
+++ AttributeTag.java 11 Dec 2002 12:40:56 -0000 1.3
@@ -61,7 +61,6 @@
*/
package org.apache.commons.jelly.tags.xml;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.3 +0 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ParseTagSupport.java
Index: ParseTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ParseTagSupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParseTagSupport.java 30 Oct 2002 19:16:22 -0000 1.2
+++ ParseTagSupport.java 11 Dec 2002 12:40:56 -0000 1.3
@@ -63,18 +63,12 @@
import java.io.InputStream;
import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.net.MalformedURLException;
import java.net.URL;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.dom4j.Document;
import org.dom4j.io.SAXContentHandler;
import org.dom4j.io.SAXReader;
1.4 +0 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ParamTag.java
Index: ParamTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ParamTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ParamTag.java 30 Oct 2002 19:16:23 -0000 1.3
+++ ParamTag.java 11 Dec 2002 12:40:56 -0000 1.4
@@ -61,7 +61,6 @@
*/
package org.apache.commons.jelly.tags.xml;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.4 +0 -10 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/CopyTag.java
Index: CopyTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/CopyTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CopyTag.java 30 Oct 2002 19:16:23 -0000 1.3
+++ CopyTag.java 11 Dec 2002 12:40:56 -0000 1.4
@@ -61,19 +61,9 @@
*/
package org.apache.commons.jelly.tags.xml;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.dom4j.Element;
-import org.dom4j.Node;
import org.dom4j.io.SAXWriter;
-
import org.jaxen.XPath;
/**
1.10 +5 -9 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ExprTag.java
Index: ExprTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ExprTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExprTag.java 30 Oct 2002 19:16:22 -0000 1.9
+++ ExprTag.java 11 Dec 2002 12:40:56 -0000 1.10
@@ -61,12 +61,8 @@
*/
package org.apache.commons.jelly.tags.xml;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.jaxen.XPath;
/** A tag which performs a string XPath expression; similar to <xsl:value-of>
1.3 +0 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/CopyOfTag.java
Index: CopyOfTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/CopyOfTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CopyOfTag.java 30 Oct 2002 19:16:22 -0000 1.2
+++ CopyOfTag.java 11 Dec 2002 12:40:56 -0000 1.3
@@ -64,14 +64,10 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.dom4j.Node;
import org.dom4j.io.SAXWriter;
-
import org.jaxen.XPath;
/** A tag which performs a copy-of operation like the XSLT tag
1.3 +2 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XPathComparator.java
Index: XPathComparator.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XPathComparator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPathComparator.java 27 Nov 2002 19:22:41 -0000 1.2
+++ XPathComparator.java 11 Dec 2002 12:40:56 -0000 1.3
@@ -64,14 +64,10 @@
import java.util.Comparator;
import java.util.List;
+import org.apache.commons.jelly.util.NestedRuntimeException;
import org.dom4j.Node;
-
-import org.jaxen.XPath;
import org.jaxen.JaxenException;
-
-import org.apache.commons.beanutils.ConvertUtils;
-
-import org.apache.commons.jelly.util.NestedRuntimeException;
+import org.jaxen.XPath;
/**
* Compares xml nodes by extracting the value at xpath and
1.4 +0 -12 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/jetty/TestJettyHttpServerTags.java
Index: TestJettyHttpServerTags.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/jetty/TestJettyHttpServerTags.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestJettyHttpServerTags.java 31 Oct 2002 15:08:10 -0000 1.3
+++ TestJettyHttpServerTags.java 11 Dec 2002 12:40:57 -0000 1.4
@@ -62,12 +62,7 @@
package org.apache.commons.jelly.jetty;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.IOException;
import java.io.StringWriter;
-import java.util.Iterator;
-import java.util.List;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -75,16 +70,9 @@
import junit.textui.TestRunner;
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.parser.XMLParser;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Node;
/** Tests the parser, the engine and the XML tags
*
1.13 +5 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/InvokeBodyTag.java
Index: InvokeBodyTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/InvokeBodyTag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- InvokeBodyTag.java 30 Oct 2002 19:16:29 -0000 1.12
+++ InvokeBodyTag.java 11 Dec 2002 12:40:57 -0000 1.13
@@ -61,14 +61,12 @@
*/
package org.apache.commons.jelly.tags.define;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.impl.DynamicTag;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.4 +0 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/DynaBeanTag.java
Index: DynaBeanTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/DynaBeanTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DynaBeanTag.java 30 Oct 2002 19:16:29 -0000 1.3
+++ DynaBeanTag.java 11 Dec 2002 12:40:57 -0000 1.4
@@ -62,23 +62,18 @@
package org.apache.commons.jelly.tags.define;
-import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.beanutils.DynaClass;
-
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.impl.Attribute;
import org.apache.commons.jelly.impl.DynamicDynaBeanTag;
import org.apache.commons.jelly.impl.TagFactory;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.xml.sax.Attributes;
/**
1.3 +0 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/ScriptTag.java
Index: ScriptTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/ScriptTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScriptTag.java 30 Oct 2002 19:16:29 -0000 1.2
+++ ScriptTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -61,7 +61,6 @@
*/
package org.apache.commons.jelly.tags.define;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.2 +0 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/SuperTag.java
Index: SuperTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/SuperTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SuperTag.java 30 Oct 2002 19:30:47 -0000 1.1
+++ SuperTag.java 11 Dec 2002 12:40:57 -0000 1.2
@@ -62,7 +62,6 @@
package org.apache.commons.jelly.tags.define;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.4 +0 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/TaglibTag.java
Index: TaglibTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/TaglibTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TaglibTag.java 30 Oct 2002 19:16:29 -0000 1.3
+++ TaglibTag.java 11 Dec 2002 12:40:57 -0000 1.4
@@ -61,15 +61,9 @@
*/
package org.apache.commons.jelly.tags.define;
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.DynaTag;
-import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.impl.DynamicTagLibrary;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.helpers.AttributesImpl;
/**
* The <taglib> tag is used to define a new tag library
1.3 +0 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java
Index: ClassLoaderTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassLoaderTag.java 30 Oct 2002 19:16:29 -0000 1.2
+++ ClassLoaderTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -62,7 +62,6 @@
package org.apache.commons.jelly.tags.define;
-import java.io.File;
import java.net.URL;
import java.net.URLClassLoader;
1.3 +0 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/JellyBeanTag.java
Index: JellyBeanTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/JellyBeanTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JellyBeanTag.java 30 Oct 2002 19:16:29 -0000 1.2
+++ JellyBeanTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -65,11 +65,6 @@
import java.lang.reflect.Method;
import org.apache.commons.beanutils.MethodUtils;
-
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +0 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/TagTag.java
Index: TagTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/TagTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TagTag.java 30 Oct 2002 19:16:29 -0000 1.2
+++ TagTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -61,7 +61,6 @@
*/
package org.apache.commons.jelly.tags.define;
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
/**
1.3 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/InvokeTag.java
Index: InvokeTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/InvokeTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InvokeTag.java 30 Oct 2002 19:16:29 -0000 1.2
+++ InvokeTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -61,12 +61,10 @@
*/
package org.apache.commons.jelly.tags.define;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/TrTag.java
Index: TrTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/TrTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TrTag.java 30 Oct 2002 19:16:19 -0000 1.2
+++ TrTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -63,17 +63,14 @@
import java.awt.Component;
import java.awt.GridBagConstraints;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.swing.impl.Cell;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +1 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/TitledBorderTag.java
Index: TitledBorderTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/TitledBorderTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TitledBorderTag.java 30 Oct 2002 19:16:19 -0000 1.2
+++ TitledBorderTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -63,14 +63,13 @@
import java.awt.Color;
import java.awt.Font;
+
import javax.swing.BorderFactory;
import javax.swing.border.Border;
import javax.swing.border.TitledBorder;
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +0 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/TableModelTag.java
Index: TableModelTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/TableModelTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TableModelTag.java 30 Oct 2002 19:16:19 -0000 1.2
+++ TableModelTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -62,14 +62,10 @@
package org.apache.commons.jelly.tags.swing;
import javax.swing.JTable;
-import javax.swing.table.TableModel;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.tags.core.UseBeanTag;
import org.apache.commons.jelly.tags.swing.model.ExpressionTableModel;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Creates a default TableModel using nested tableColumn tags.
1.3 +0 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/TableModelColumnTag.java
Index: TableModelColumnTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/TableModelColumnTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TableModelColumnTag.java 30 Oct 2002 19:16:19 -0000 1.2
+++ TableModelColumnTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -61,15 +61,10 @@
*/
package org.apache.commons.jelly.tags.swing;
-import javax.swing.table.TableColumn;
-
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.tags.core.UseBeanTag;
import org.apache.commons.jelly.tags.swing.model.ExpressionTableColumn;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Creates a default TableColumnModel.
1.4 +0 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/GbcTag.java
Index: GbcTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/GbcTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GbcTag.java 30 Oct 2002 19:16:19 -0000 1.3
+++ GbcTag.java 11 Dec 2002 12:40:57 -0000 1.4
@@ -62,20 +62,13 @@
package org.apache.commons.jelly.tags.swing;
import java.awt.Component;
-import java.awt.Container;
import java.awt.GridBagConstraints;
import java.util.Map;
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.ConvertUtils;
-
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.core.UseBeanTag;
import org.apache.commons.jelly.tags.swing.impl.GridBagConstraintBean;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* This class represents a {@link GridBagConstraints} constraints as passed in
1.3 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/BorderAlignTag.java
Index: BorderAlignTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/BorderAlignTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BorderAlignTag.java 30 Oct 2002 19:16:19 -0000 1.2
+++ BorderAlignTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -68,9 +68,6 @@
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* Represents a layout of a child component within its parent <borderLayout> layout.
*
1.4 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/TdTag.java
Index: TdTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/TdTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TdTag.java 30 Oct 2002 19:16:19 -0000 1.3
+++ TdTag.java 11 Dec 2002 12:40:57 -0000 1.4
@@ -65,10 +65,8 @@
import java.awt.GridBagConstraints;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/LayoutTagSupport.java
Index: LayoutTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/LayoutTagSupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LayoutTagSupport.java 30 Oct 2002 19:16:19 -0000 1.2
+++ LayoutTagSupport.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -65,10 +65,8 @@
import java.awt.LayoutManager;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +0 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/GridBagLayoutTag.java
Index: GridBagLayoutTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/GridBagLayoutTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GridBagLayoutTag.java 30 Oct 2002 19:16:19 -0000 1.2
+++ GridBagLayoutTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -61,15 +61,8 @@
*/
package org.apache.commons.jelly.tags.swing;
-import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.LayoutManager;
-
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.tags.swing.impl.Cell;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.5 +2 -24 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/ConstraintTag.java
Index: ConstraintTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/ConstraintTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConstraintTag.java 22 Oct 2002 17:29:49 -0000 1.4
+++ ConstraintTag.java 11 Dec 2002 12:40:57 -0000 1.5
@@ -1,32 +1,10 @@
package org.apache.commons.jelly.tags.swing;
-import java.awt.Dimension;
-import java.awt.Point;
-import java.util.HashMap;
-import java.util.Map;
-
-import java.awt.Component;
-import java.awt.Container;
-
-import org.apache.commons.beanutils.ConvertUtils;
-
-import org.apache.commons.jelly.Tag;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.TagLibrary;
-import org.apache.commons.jelly.impl.TagScript;
-import org.apache.commons.jelly.impl.TagFactory;
-import org.apache.commons.jelly.tags.swing.converters.DimensionConverter;
-import org.apache.commons.jelly.tags.swing.converters.PointConverter;
-
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.jelly.DynaBeanTagSupport;
+import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.beanutils.BeanUtils;
-
import org.apache.commons.jelly.impl.TagFactory;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.xml.sax.Attributes;
/** This class represents a layout-manager constraints as passed in
1.4 +2 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/ActionTag.java
Index: ActionTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/ActionTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ActionTag.java 30 Oct 2002 19:16:19 -0000 1.3
+++ ActionTag.java 11 Dec 2002 12:40:57 -0000 1.4
@@ -65,13 +65,12 @@
import java.util.Iterator;
import java.util.Map;
-import javax.swing.*;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.MapTagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.core.UseBeanTag;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +0 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/BorderLayoutTag.java
Index: BorderLayoutTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/BorderLayoutTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BorderLayoutTag.java 30 Oct 2002 19:16:19 -0000 1.2
+++ BorderLayoutTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -64,11 +64,6 @@
import java.awt.BorderLayout;
import java.awt.LayoutManager;
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/WindowListenerTag.java
Index: WindowListenerTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/WindowListenerTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WindowListenerTag.java 30 Oct 2002 19:16:19 -0000 1.2
+++ WindowListenerTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -64,11 +64,9 @@
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.4 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/BorderTagSupport.java
Index: BorderTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/BorderTagSupport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BorderTagSupport.java 30 Oct 2002 19:16:19 -0000 1.3
+++ BorderTagSupport.java 11 Dec 2002 12:40:57 -0000 1.4
@@ -64,10 +64,8 @@
import javax.swing.border.Border;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +0 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/TableLayoutTag.java
Index: TableLayoutTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/TableLayoutTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TableLayoutTag.java 30 Oct 2002 19:16:19 -0000 1.2
+++ TableLayoutTag.java 11 Dec 2002 12:40:57 -0000 1.3
@@ -61,16 +61,11 @@
*/
package org.apache.commons.jelly.tags.swing;
-import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.LayoutManager;
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.swing.impl.Cell;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.10 +0 -3 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/xml/TestXMLTags.java
Index: TestXMLTags.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/xml/TestXMLTags.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestXMLTags.java 30 Oct 2002 19:16:32 -0000 1.9
+++ TestXMLTags.java 11 Dec 2002 12:40:58 -0000 1.10
@@ -64,7 +64,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
-import java.io.IOException;
import java.io.StringWriter;
import java.util.Iterator;
import java.util.List;
@@ -78,10 +77,8 @@
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.parser.XMLParser;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Node;
1.3 +0 -5 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/jsl/TestJSL.java
Index: TestJSL.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/jsl/TestJSL.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestJSL.java 30 Oct 2002 19:16:34 -0000 1.2
+++ TestJSL.java 11 Dec 2002 12:40:58 -0000 1.3
@@ -63,8 +63,6 @@
import java.io.FileInputStream;
import java.io.InputStream;
-import java.io.IOException;
-import java.io.StringWriter;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -74,12 +72,9 @@
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.jelly.parser.XMLParser;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXContentHandler;
1.4 +5 -7 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/test/xml/TestXMLParserCache.java
Index: TestXMLParserCache.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/test/xml/TestXMLParserCache.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestXMLParserCache.java 30 Oct 2002 19:16:26 -0000 1.3
+++ TestXMLParserCache.java 11 Dec 2002 12:40:58 -0000 1.4
@@ -66,13 +66,11 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
-
import org.xml.sax.SAXParseException;
/**
1.4 +5 -7 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/test/xml/TestXMLValidation.java
Index: TestXMLValidation.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/test/xml/TestXMLValidation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestXMLValidation.java 30 Oct 2002 19:16:26 -0000 1.3
+++ TestXMLValidation.java 11 Dec 2002 12:40:58 -0000 1.4
@@ -66,13 +66,11 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
-
import org.xml.sax.SAXParseException;
/**
1.4 +5 -6 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java
Index: TestDummyXMLOutput.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestDummyXMLOutput.java 30 Oct 2002 19:16:26 -0000 1.3
+++ TestDummyXMLOutput.java 11 Dec 2002 12:40:58 -0000 1.4
@@ -65,7 +65,6 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
1.3 +5 -6 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java
Index: TestDefaultNamespaceFilter.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestDefaultNamespaceFilter.java 30 Oct 2002 19:16:26 -0000 1.2
+++ TestDefaultNamespaceFilter.java 11 Dec 2002 12:40:58 -0000 1.3
@@ -66,7 +66,6 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
1.3 +0 -9 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/interaction/InteractionTagLibrary.java
Index: InteractionTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/interaction/InteractionTagLibrary.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InteractionTagLibrary.java 30 Oct 2002 19:16:28 -0000 1.2
+++ InteractionTagLibrary.java 11 Dec 2002 12:40:58 -0000 1.3
@@ -55,16 +55,7 @@
*/
package org.apache.commons.jelly.tags.interaction;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagLibrary;
-import org.apache.commons.jelly.expression.Expression;
-import org.apache.commons.jelly.expression.ExpressionFactory;
/**
* A TagLibrary to interact with the user.
1.4 +0 -6 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestParser.java
Index: TestParser.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestParser.java 30 Oct 2002 19:16:30 -0000 1.3
+++ TestParser.java 11 Dec 2002 12:40:58 -0000 1.4
@@ -63,8 +63,6 @@
import java.io.FileInputStream;
import java.io.InputStream;
-import java.io.IOException;
-import java.io.StringWriter;
import java.util.Iterator;
import junit.framework.Test;
@@ -72,13 +70,9 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.impl.ScriptBlock;
import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.jelly.parser.XMLParser;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.12 +5 -10 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestCoreTags.java
Index: TestCoreTags.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestCoreTags.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TestCoreTags.java 30 Oct 2002 19:16:30 -0000 1.11
+++ TestCoreTags.java 11 Dec 2002 12:40:58 -0000 1.12
@@ -63,7 +63,6 @@
import java.io.FileInputStream;
import java.io.InputStream;
-import java.io.IOException;
import java.io.StringWriter;
import junit.framework.Test;
@@ -71,12 +70,8 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.impl.TextScript;
import org.apache.commons.jelly.parser.XMLParser;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.4 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/MessageOperationTag.java
Index: MessageOperationTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/MessageOperationTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MessageOperationTag.java 30 Oct 2002 19:16:25 -0000 1.3
+++ MessageOperationTag.java 11 Dec 2002 12:40:58 -0000 1.4
@@ -63,11 +63,9 @@
import javax.jms.Destination;
import javax.jms.JMSException;
-import javax.jms.Message;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
-
import org.apache.commons.messenger.Messenger;
/** An abstract base class for JMS Message operation tags such as send, receive or call.
1.5 +0 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/SendTag.java
Index: SendTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/SendTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SendTag.java 30 Oct 2002 19:16:25 -0000 1.4
+++ SendTag.java 11 Dec 2002 12:40:58 -0000 1.5
@@ -62,7 +62,6 @@
package org.apache.commons.jelly.tags.jms;
import javax.jms.Destination;
-import javax.jms.JMSException;
import javax.jms.Message;
import org.apache.commons.jelly.JellyException;
1.5 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/ConnectionTag.java
Index: ConnectionTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/ConnectionTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConnectionTag.java 30 Oct 2002 19:16:25 -0000 1.4
+++ ConnectionTag.java 11 Dec 2002 12:40:58 -0000 1.5
@@ -61,12 +61,9 @@
*/
package org.apache.commons.jelly.tags.jms;
-import javax.jms.JMSException;
-
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.messenger.Messenger;
import org.apache.commons.messenger.MessengerManager;
1.4 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/DestinationTag.java
Index: DestinationTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/DestinationTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DestinationTag.java 30 Oct 2002 19:16:25 -0000 1.3
+++ DestinationTag.java 11 Dec 2002 12:40:58 -0000 1.4
@@ -62,12 +62,10 @@
package org.apache.commons.jelly.tags.jms;
import javax.jms.Destination;
-import javax.jms.JMSException;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.messenger.Messenger;
/** Creates a Destination object from a String name.
1.4 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/SubscribeTag.java
Index: SubscribeTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/SubscribeTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SubscribeTag.java 5 Nov 2002 13:06:13 -0000 1.3
+++ SubscribeTag.java 11 Dec 2002 12:40:58 -0000 1.4
@@ -62,12 +62,10 @@
package org.apache.commons.jelly.tags.jms;
import javax.jms.Destination;
-import javax.jms.Message;
import javax.jms.MessageListener;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.4 +3 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/quartz/QuartzTagSupport.java
Index: QuartzTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/quartz/QuartzTagSupport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- QuartzTagSupport.java 23 Oct 2002 16:35:36 -0000 1.3
+++ QuartzTagSupport.java 11 Dec 2002 12:40:58 -0000 1.4
@@ -62,10 +62,8 @@
*/
import org.apache.commons.jelly.TagSupport;
-
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
-import org.quartz.impl.StdScheduler;
import org.quartz.impl.StdSchedulerFactory;
/** Basic support for all tags requiring a Quartz scheduler.
1.7 +3 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/TransactionTag.java
Index: TransactionTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/TransactionTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TransactionTag.java 23 Oct 2002 16:27:42 -0000 1.6
+++ TransactionTag.java 11 Dec 2002 12:40:58 -0000 1.7
@@ -55,14 +55,11 @@
package org.apache.commons.jelly.tags.sql;
-import java.sql.*;
-import java.util.*;
+import java.sql.Connection;
+import java.sql.SQLException;
+
import javax.sql.DataSource;
-import javax.naming.InitialContext;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.5 +1 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/DateParamTag.java
Index: DateParamTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/DateParamTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DateParamTag.java 23 Oct 2002 16:27:42 -0000 1.4
+++ DateParamTag.java 11 Dec 2002 12:40:58 -0000 1.5
@@ -54,13 +54,10 @@
*/
package org.apache.commons.jelly.tags.sql;
-import java.util.*;
-import java.sql.Time;
import java.sql.Date;
-import java.sql.Timestamp;
+
import javax.servlet.jsp.jstl.sql.SQLExecutionTag;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.9 +4 -9 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/UpdateTag.java
Index: UpdateTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/UpdateTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- UpdateTag.java 23 Oct 2002 16:27:42 -0000 1.8
+++ UpdateTag.java 11 Dec 2002 12:40:58 -0000 1.9
@@ -55,19 +55,14 @@
package org.apache.commons.jelly.tags.sql;
-import java.sql.*;
-import java.util.*;
-import javax.sql.DataSource;
-import javax.naming.InitialContext;
-import javax.naming.Context;
-import javax.naming.NamingException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.Resources;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.7 +1 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/SetDataSourceTag.java
Index: SetDataSourceTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/SetDataSourceTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SetDataSourceTag.java 23 Oct 2002 16:27:42 -0000 1.6
+++ SetDataSourceTag.java 11 Dec 2002 12:40:58 -0000 1.7
@@ -55,14 +55,12 @@
package org.apache.commons.jelly.tags.sql;
-import java.util.*;
import javax.sql.DataSource;
-import org.apache.commons.jelly.JellyContext;
+
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.Resources;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.6 +5 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java
Index: DataSourceWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DataSourceWrapper.java 23 Oct 2002 16:27:42 -0000 1.5
+++ DataSourceWrapper.java 11 Dec 2002 12:40:58 -0000 1.6
@@ -55,13 +55,14 @@
package org.apache.commons.jelly.tags.sql;
-import java.io.*;
-import java.sql.*;
-import java.util.*;
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
import javax.sql.DataSource;
import org.apache.commons.jelly.tags.Resources;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.4 +7 -8 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/SqlTagSupport.java
Index: SqlTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/SqlTagSupport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SqlTagSupport.java 23 Oct 2002 16:27:42 -0000 1.3
+++ SqlTagSupport.java 11 Dec 2002 12:40:58 -0000 1.4
@@ -55,18 +55,17 @@
package org.apache.commons.jelly.tags.sql;
-import java.sql.*;
-import java.util.*;
-import javax.sql.DataSource;
-import javax.naming.InitialContext;
-import javax.naming.Context;
-import javax.naming.NamingException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.servlet.jsp.jstl.sql.SQLExecutionTag;
+import javax.sql.DataSource;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.Resources;
/**
1.3 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/RowTag.java
Index: RowTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/RowTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RowTag.java 23 Oct 2002 16:27:42 -0000 1.2
+++ RowTag.java 11 Dec 2002 12:40:58 -0000 1.3
@@ -54,8 +54,6 @@
*/
package org.apache.commons.jelly.tags.sql;
-import java.util.Map;
-
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.MapTagSupport;
import org.apache.commons.jelly.XMLOutput;
1.16 +6 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/QueryTag.java
Index: QueryTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/QueryTag.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- QueryTag.java 23 Oct 2002 16:27:42 -0000 1.15
+++ QueryTag.java 11 Dec 2002 12:40:58 -0000 1.16
@@ -55,18 +55,17 @@
package org.apache.commons.jelly.tags.sql;
-import java.sql.*;
-import java.util.*;
-import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
import javax.servlet.jsp.jstl.sql.Result;
-import javax.servlet.jsp.jstl.sql.SQLExecutionTag;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.Resources;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.6 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/DriverTag.java
Index: DriverTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/DriverTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DriverTag.java 23 Oct 2002 16:27:42 -0000 1.5
+++ DriverTag.java 11 Dec 2002 12:40:58 -0000 1.6
@@ -55,9 +55,6 @@
package org.apache.commons.jelly.tags.sql;
-import java.util.*;
-
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.5 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/ParamTag.java
Index: ParamTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/sql/ParamTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ParamTag.java 23 Oct 2002 16:27:42 -0000 1.4
+++ ParamTag.java 11 Dec 2002 12:40:58 -0000 1.5
@@ -54,10 +54,8 @@
*/
package org.apache.commons.jelly.tags.sql;
-import java.util.*;
import javax.servlet.jsp.jstl.sql.SQLExecutionTag;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.4 +0 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bean/BeanPropertyTag.java
Index: BeanPropertyTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bean/BeanPropertyTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BeanPropertyTag.java 30 Oct 2002 19:16:28 -0000 1.3
+++ BeanPropertyTag.java 11 Dec 2002 12:40:59 -0000 1.4
@@ -63,15 +63,11 @@
package org.apache.commons.jelly.tags.bean;
import java.lang.reflect.Method;
-import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.MethodUtils;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
1.3 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bean/BeandefTag.java
Index: BeandefTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bean/BeandefTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeandefTag.java 30 Oct 2002 19:16:28 -0000 1.2
+++ BeandefTag.java 11 Dec 2002 12:40:59 -0000 1.3
@@ -62,7 +62,6 @@
package org.apache.commons.jelly.tags.bean;
-import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
@@ -70,7 +69,6 @@
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +0 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bean/BeanTag.java
Index: BeanTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bean/BeanTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeanTag.java 30 Oct 2002 19:16:28 -0000 1.2
+++ BeanTag.java 11 Dec 2002 12:40:59 -0000 1.3
@@ -64,20 +64,13 @@
import java.lang.reflect.Method;
import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.MethodUtils;
-
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.impl.BeanSource;
import org.apache.commons.jelly.impl.CollectionTag;
import org.apache.commons.jelly.tags.core.UseBeanTag;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.5 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/validate/ValidateTag.java
Index: ValidateTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/validate/ValidateTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ValidateTag.java 30 Oct 2002 19:16:31 -0000 1.4
+++ ValidateTag.java 11 Dec 2002 12:40:59 -0000 1.5
@@ -61,15 +61,12 @@
*/
package org.apache.commons.jelly.tags.validate;
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.iso_relax.verifier.Verifier;
import org.iso_relax.verifier.VerifierFilter;
import org.iso_relax.verifier.VerifierHandler;
-
import org.xml.sax.ContentHandler;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
1.4 +0 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/validate/VerifierTag.java
Index: VerifierTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/validate/VerifierTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VerifierTag.java 30 Oct 2002 19:16:31 -0000 1.3
+++ VerifierTag.java 11 Dec 2002 12:40:59 -0000 1.4
@@ -68,15 +68,9 @@
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.iso_relax.verifier.Schema;
import org.iso_relax.verifier.Verifier;
import org.iso_relax.verifier.VerifierFactory;
-
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.AttributesImpl;
/**
* This tag creates a new Verifier of a schema as a variable
1.4 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java
Index: AssertValidTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AssertValidTag.java 28 Nov 2002 08:35:48 -0000 1.3
+++ AssertValidTag.java 11 Dec 2002 12:40:59 -0000 1.4
@@ -64,10 +64,8 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.junit.JellyAssertionFailedError;
-import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.AttributesImpl;
/**
* This tag performs an assertion that the tags body contains XML
1.3 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/impl/Cell.java
Index: Cell.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/impl/Cell.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cell.java 30 Oct 2002 19:16:33 -0000 1.2
+++ Cell.java 11 Dec 2002 12:40:59 -0000 1.3
@@ -64,9 +64,6 @@
import java.awt.Component;
import java.awt.GridBagConstraints;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* A simple class to represent the information for a single cell in a table
* when using the GridBagLayout
1.3 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jetty/NotFoundHandlerTag.java
Index: NotFoundHandlerTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jetty/NotFoundHandlerTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NotFoundHandlerTag.java 30 Oct 2002 13:22:45 -0000 1.2
+++ NotFoundHandlerTag.java 11 Dec 2002 12:40:59 -0000 1.3
@@ -64,10 +64,7 @@
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.mortbay.http.handler.NotFoundHandler;
-
-import java.util.StringTokenizer;
/**
* Declare a not found resource handler for a Jetty http server
1.3 +0 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jetty/DeleteRequestTag.java
Index: DeleteRequestTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jetty/DeleteRequestTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeleteRequestTag.java 30 Oct 2002 13:22:45 -0000 1.2
+++ DeleteRequestTag.java 11 Dec 2002 12:40:59 -0000 1.3
@@ -61,11 +61,6 @@
package org.apache.commons.jelly.tags.jetty;
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
-
-import org.mortbay.http.HttpResponse;
/**
* Respond to a DELETE request to a Jetty http server
1.4 +2 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jetty/JettyHttpServerTag.java
Index: JettyHttpServerTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jetty/JettyHttpServerTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JettyHttpServerTag.java 31 Oct 2002 15:08:10 -0000 1.3
+++ JettyHttpServerTag.java 11 Dec 2002 12:40:59 -0000 1.4
@@ -61,10 +61,11 @@
package org.apache.commons.jelly.tags.jetty;
+import java.net.URL;
+
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.LogFactory;
-
import org.mortbay.http.HttpContext;
import org.mortbay.http.HttpListener;
import org.mortbay.http.HttpServer;
@@ -73,12 +74,8 @@
import org.mortbay.http.handler.NotFoundHandler;
import org.mortbay.http.handler.ResourceHandler;
import org.mortbay.util.Log;
-import org.mortbay.util.LogSink;
import org.mortbay.util.OutputStreamLogSink;
import org.mortbay.util.Resource;
-
-import java.net.URL;
-import java.net.MalformedURLException;
/**
* Declare an instance of a Jetty http server
1.3 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jetty/AbstractMethodHandlerTag.java
Index: AbstractMethodHandlerTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jetty/AbstractMethodHandlerTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractMethodHandlerTag.java 30 Oct 2002 13:22:45 -0000 1.2
+++ AbstractMethodHandlerTag.java 11 Dec 2002 12:40:59 -0000 1.3
@@ -65,8 +65,6 @@
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-import org.mortbay.http.HttpResponse;
-
/**
* An abstract base tag to declare a handler for a particular request method
* in an http context in an http server
1.3 +4 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jetty/SecurityHandlerTag.java
Index: SecurityHandlerTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jetty/SecurityHandlerTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecurityHandlerTag.java 30 Oct 2002 13:22:45 -0000 1.2
+++ SecurityHandlerTag.java 11 Dec 2002 12:40:59 -0000 1.3
@@ -215,15 +215,15 @@
String guarantee = data.toString(false,true).toUpperCase();
if (guarantee==null || guarantee.length()==0 ||
"NONE".equals(guarantee))
- scBase.setDataConstraint(scBase.DC_NONE);
+ scBase.setDataConstraint(SecurityConstraint.DC_NONE);
else if ("INTEGRAL".equals(guarantee))
- scBase.setDataConstraint(scBase.DC_INTEGRAL);
+ scBase.setDataConstraint(SecurityConstraint.DC_INTEGRAL);
else if ("CONFIDENTIAL".equals(guarantee))
- scBase.setDataConstraint(scBase.DC_CONFIDENTIAL);
+ scBase.setDataConstraint(SecurityConstraint.DC_CONFIDENTIAL);
else
{
Code.warning("Unknown user-data-constraint:"+guarantee);
- scBase.setDataConstraint(scBase.DC_CONFIDENTIAL);
+ scBase.setDataConstraint(SecurityConstraint.DC_CONFIDENTIAL);
}
}
1.8 +4 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
Index: BSFExpressionFactory.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BSFExpressionFactory.java 30 Oct 2002 19:16:22 -0000 1.7
+++ BSFExpressionFactory.java 11 Dec 2002 12:41:00 -0000 1.8
@@ -61,17 +61,14 @@
*/
package org.apache.commons.jelly.tags.bsf;
-import com.ibm.bsf.BSFEngine;
-import com.ibm.bsf.BSFException;
-import com.ibm.bsf.BSFManager;
-
-import java.io.File;
-
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.expression.ExpressionFactory;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import com.ibm.bsf.BSFEngine;
+import com.ibm.bsf.BSFException;
+import com.ibm.bsf.BSFManager;
/** Represents a factory of BSF expressions
*
1.3 +6 -10 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/util/PropertiesTag.java
Index: PropertiesTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/util/PropertiesTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertiesTag.java 23 Oct 2002 16:27:44 -0000 1.2
+++ PropertiesTag.java 11 Dec 2002 12:41:00 -0000 1.3
@@ -58,19 +58,15 @@
package org.apache.commons.jelly.tags.util;
-import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.MissingAttributeException;
-
-import java.util.StringTokenizer;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Properties;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.Properties;
+
+import org.apache.commons.jelly.JellyException;
+import org.apache.commons.jelly.TagSupport;
+import org.apache.commons.jelly.XMLOutput;
/**
* A tag which loads a properties file from a given file name or URI
1.2 +0 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/util/AvailableTag.java
Index: AvailableTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/util/AvailableTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AvailableTag.java 13 Nov 2002 12:59:35 -0000 1.1
+++ AvailableTag.java 11 Dec 2002 12:41:00 -0000 1.2
@@ -61,7 +61,6 @@
import java.io.File;
import java.net.URL;
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.5 +6 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/util/TokenizeTag.java
Index: TokenizeTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/util/TokenizeTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TokenizeTag.java 24 Oct 2002 03:33:40 -0000 1.4
+++ TokenizeTag.java 11 Dec 2002 12:41:00 -0000 1.5
@@ -58,14 +58,13 @@
package org.apache.commons.jelly.tags.util;
-import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.MissingAttributeException;
-
-import java.util.StringTokenizer;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.apache.commons.jelly.MissingAttributeException;
+import org.apache.commons.jelly.TagSupport;
+import org.apache.commons.jelly.XMLOutput;
public class TokenizeTag extends TagSupport
{
1.3 +1 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/util/SleepTag.java
Index: SleepTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/util/SleepTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SleepTag.java 23 Oct 2002 16:27:44 -0000 1.2
+++ SleepTag.java 11 Dec 2002 12:41:00 -0000 1.3
@@ -76,7 +76,7 @@
//-------------------------------------------------------------------------
public void doTag(final XMLOutput output) throws Exception {
if (millis > 0) {
- Thread.currentThread().sleep(millis);
+ Thread.sleep(millis);
}
}
1.4 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/task/AntJellyContext.java
Index: AntJellyContext.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/task/AntJellyContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AntJellyContext.java 30 Oct 2002 19:16:34 -0000 1.3
+++ AntJellyContext.java 11 Dec 2002 12:41:00 -0000 1.4
@@ -63,15 +63,12 @@
package org.apache.commons.jelly.task;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import org.apache.commons.jelly.JellyContext;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.tools.ant.Project;
/** <p><code>AntJellyContext</code> represents the Jelly context from inside Ant.</p>
1.10 +1 -8 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/task/JellyTask.java
Index: JellyTask.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/task/JellyTask.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JellyTask.java 9 Oct 2002 07:04:29 -0000 1.9
+++ JellyTask.java 11 Dec 2002 12:41:00 -0000 1.10
@@ -22,17 +22,10 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.parser.XMLParser;
import org.apache.commons.jelly.tags.ant.AntTagLibrary;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.FilterSet;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.Task;
/**
* <p><code>JellyTask</code> is an Ant task which will
1.3 +5 -7 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/TestIncludeNesting.java
Index: TestIncludeNesting.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/core/TestIncludeNesting.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestIncludeNesting.java 30 Oct 2002 19:16:25 -0000 1.2
+++ TestIncludeNesting.java 11 Dec 2002 12:41:00 -0000 1.3
@@ -61,12 +61,10 @@
*/
package org.apache.commons.jelly.core;
-import java.io.File;
import java.net.URL;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
1.8 +0 -4 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java
Index: FileScannerTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FileScannerTag.java 30 Oct 2002 19:16:31 -0000 1.7
+++ FileScannerTag.java 11 Dec 2002 12:41:00 -0000 1.8
@@ -62,10 +62,6 @@
package org.apache.commons.jelly.tags.ant;
import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.ConvertingWrapDynaBean;
-import org.apache.commons.beanutils.DynaBean;
-
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.4 +1 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ant/FileIterator.java
Index: FileIterator.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ant/FileIterator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileIterator.java 30 Oct 2002 19:16:31 -0000 1.3
+++ FileIterator.java 11 Dec 2002 12:41:00 -0000 1.4
@@ -65,10 +65,9 @@
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.FilterSet;
/**
* <p><code>FileIterator</code> is an iterator over a
1.4 +2 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
Index: IntrospectorTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IntrospectorTag.java 30 Oct 2002 19:16:31 -0000 1.3
+++ IntrospectorTag.java 11 Dec 2002 12:41:00 -0000 1.4
@@ -61,21 +61,17 @@
*/
package org.apache.commons.jelly.tags.betwixt;
-import org.apache.commons.beanutils.Converter;
-import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.ConversionException;
-
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.Converter;
import org.apache.commons.betwixt.XMLIntrospector;
import org.apache.commons.betwixt.strategy.CapitalizeNameMapper;
import org.apache.commons.betwixt.strategy.DecapitalizeNameMapper;
import org.apache.commons.betwixt.strategy.HyphenatedNameMapper;
import org.apache.commons.betwixt.strategy.NameMapper;
-
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.11 +6 -19 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jeez/JeezTagLibrary.java
Index: JeezTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jeez/JeezTagLibrary.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JeezTagLibrary.java 30 Oct 2002 19:16:20 -0000 1.10
+++ JeezTagLibrary.java 11 Dec 2002 12:41:00 -0000 1.11
@@ -62,28 +62,15 @@
package org.apache.commons.jelly.tags.jeez;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
-
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.impl.TagScript;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.impl.DynamicTagLibrary;
import org.apache.commons.jelly.impl.TagFactory;
+import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.jelly.tags.ant.AntTagLibrary;
import org.apache.commons.jelly.tags.werkz.WerkzTagLibrary;
-// import org.apache.commons.jelly.tags.core.CoreTagLibrary;
-
-import org.apache.tools.ant.Project;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.xml.sax.Attributes;
/** Convenience taglib that puts jelly:core, jelly:werkz and jelly:ant
1.5 +5 -10 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/expression/ExpressionFactory.java
Index: ExpressionFactory.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/expression/ExpressionFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExpressionFactory.java 30 Oct 2002 19:16:18 -0000 1.4
+++ ExpressionFactory.java 11 Dec 2002 12:41:00 -0000 1.5
@@ -62,16 +62,11 @@
package org.apache.commons.jelly.expression;
-import java.util.Iterator;
-
-import org.apache.commons.jelly.JellyContext;
-
/** <p><code>ExpressionFactory</code> is a factory of Expression objects.</p>
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @version $Revision$
*/
-
public interface ExpressionFactory {
/**
1.3 +1 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableModel.java
Index: ExpressionTableModel.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExpressionTableModel.java 30 Oct 2002 19:16:27 -0000 1.2
+++ ExpressionTableModel.java 11 Dec 2002 12:41:01 -0000 1.3
@@ -63,14 +63,12 @@
import java.util.ArrayList;
import java.util.List;
+
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.TableColumnModel;
import org.apache.commons.jelly.JellyContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* A Swing TableModel that uses a List of rows with pluggable Expressions
1.3 +1 -2 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/swing/MyTableModel.java
Index: MyTableModel.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/swing/MyTableModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MyTableModel.java 30 Oct 2002 19:16:27 -0000 1.2
+++ MyTableModel.java 11 Dec 2002 12:41:01 -0000 1.3
@@ -61,8 +61,7 @@
*/
package org.apache.commons.jelly.swing;
-import javax.swing.*;
-import javax.swing.table.*;
+import javax.swing.table.AbstractTableModel;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.4 +3 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
Index: InvokeTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/soap/InvokeTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InvokeTag.java 30 Oct 2002 19:16:27 -0000 1.3
+++ InvokeTag.java 11 Dec 2002 12:41:01 -0000 1.4
@@ -65,15 +65,12 @@
import javax.xml.namespace.QName;
-import org.apache.commons.jelly.JellyContext;
+import org.apache.axis.client.Call;
+import org.apache.axis.client.Service;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
-
-import org.apache.commons.logging.Log;
-import org.apache.axis.client.Service;
-import org.apache.axis.client.Call;
+import org.apache.commons.jelly.XMLOutput;
/**
* Invokes a web service
1.3 +0 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/soap/SoapTagLibrary.java
Index: SoapTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/soap/SoapTagLibrary.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SoapTagLibrary.java 30 Oct 2002 19:16:27 -0000 1.2
+++ SoapTagLibrary.java 11 Dec 2002 12:41:01 -0000 1.3
@@ -62,7 +62,6 @@
package org.apache.commons.jelly.tags.soap;
import org.apache.commons.jelly.TagLibrary;
-import org.apache.commons.jelly.tags.util.TokenizeTag;
/** Implements general utility tags.
*
1.2 +61 -2 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/test/impl/DummyTagLibrary.java
Index: DummyTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/test/impl/DummyTagLibrary.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DummyTagLibrary.java 20 Aug 2002 17:26:10 -0000 1.1
+++ DummyTagLibrary.java 11 Dec 2002 12:41:01 -0000 1.2
@@ -1,8 +1,67 @@
+/*
+ * $Header$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * $Id$
+ */
package org.apache.commons.jelly.test.impl;
import org.apache.commons.jelly.TagLibrary;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.3 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
Index: JellyTestSuite.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JellyTestSuite.java 30 Oct 2002 19:16:30 -0000 1.2
+++ JellyTestSuite.java 11 Dec 2002 12:41:01 -0000 1.3
@@ -66,9 +66,7 @@
import junit.framework.TestSuite;
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.6 +0 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java
Index: AssertEqualsTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AssertEqualsTag.java 27 Nov 2002 13:07:48 -0000 1.5
+++ AssertEqualsTag.java 11 Dec 2002 12:41:01 -0000 1.6
@@ -62,7 +62,6 @@
package org.apache.commons.jelly.tags.junit;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.expression.Expression;
/**
1.8 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/AssertTagSupport.java
Index: AssertTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/AssertTagSupport.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AssertTagSupport.java 28 Nov 2002 08:35:48 -0000 1.7
+++ AssertTagSupport.java 11 Dec 2002 12:41:01 -0000 1.8
@@ -61,8 +61,6 @@
*/
package org.apache.commons.jelly.tags.junit;
-import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.tags.xml.XPathTagSupport;
/**
1.4 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/RunTag.java
Index: RunTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/junit/RunTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RunTag.java 30 Oct 2002 19:16:30 -0000 1.3
+++ RunTag.java 11 Dec 2002 12:41:01 -0000 1.4
@@ -61,7 +61,6 @@
*/
package org.apache.commons.jelly.tags.junit;
-import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -73,10 +72,8 @@
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
1.6 +18 -7 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/util/TagXMLDoclet.java
Index: TagXMLDoclet.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/util/TagXMLDoclet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TagXMLDoclet.java 30 Oct 2002 19:16:27 -0000 1.5
+++ TagXMLDoclet.java 11 Dec 2002 12:41:01 -0000 1.6
@@ -62,19 +62,30 @@
package org.apache.commons.jelly.util;
-import com.sun.javadoc.*;
-
import java.beans.Introspector;
-import java.io.*;
-import java.util.*;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.StringReader;
import org.cyberneko.html.parsers.SAXParser;
-
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
+import com.sun.javadoc.ClassDoc;
+import com.sun.javadoc.Doc;
+import com.sun.javadoc.Doclet;
+import com.sun.javadoc.MethodDoc;
+import com.sun.javadoc.PackageDoc;
+import com.sun.javadoc.Parameter;
+import com.sun.javadoc.RootDoc;
+import com.sun.javadoc.SeeTag;
+import com.sun.javadoc.Tag;
/**
* Main Doclet class to generate Tag Library ML.
1.3 +0 -3 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagSupport.java
Index: XMLUnitTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagSupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLUnitTagSupport.java 28 Nov 2002 08:35:48 -0000 1.2
+++ XMLUnitTagSupport.java 11 Dec 2002 12:41:01 -0000 1.3
@@ -61,11 +61,8 @@
import java.io.Reader;
import java.net.URL;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.junit.AssertTagSupport;
-
-
import org.dom4j.Document;
import org.dom4j.io.SAXContentHandler;
import org.dom4j.io.SAXReader;
1.4 +22 -8 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/demos/HomepageBuilder.java
Index: HomepageBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/demos/HomepageBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HomepageBuilder.java 30 Oct 2002 19:16:28 -0000 1.3
+++ HomepageBuilder.java 11 Dec 2002 12:41:01 -0000 1.4
@@ -61,20 +61,34 @@
*/
package org.apache.commons.jelly.demos;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.io.*;
-import java.util.*;
+import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Enumeration;
+import java.util.Vector;
-//Jelly imports
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.impl.Embedded;
/**
* A sample Swing program that demonstrates the use of Jelly as a templating mechanism
1.3 +0 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/beanshell/ScriptTag.java
Index: ScriptTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/beanshell/ScriptTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScriptTag.java 30 Oct 2002 19:16:27 -0000 1.2
+++ ScriptTag.java 11 Dec 2002 12:41:01 -0000 1.3
@@ -61,7 +61,6 @@
*/
package org.apache.commons.jelly.tags.beanshell;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
1.6 +1 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ojb/StoreTag.java
Index: StoreTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ojb/StoreTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StoreTag.java 13 Nov 2002 16:55:27 -0000 1.5
+++ StoreTag.java 11 Dec 2002 12:41:01 -0000 1.6
@@ -54,14 +54,10 @@
*/
package org.apache.commons.jelly.tags.ojb;
-import org.apache.ojb.broker.PersistenceBroker;
-import org.apache.ojb.broker.PersistenceBrokerException;
-import org.apache.ojb.broker.PersistenceBrokerFactory;
-
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
+import org.apache.ojb.broker.PersistenceBroker;
/**
* <p>This Store tag will store the given object in ObjectBridge using
1.7 +2 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ojb/BrokerTag.java
Index: BrokerTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ojb/BrokerTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BrokerTag.java 13 Nov 2002 16:55:26 -0000 1.6
+++ BrokerTag.java 11 Dec 2002 12:41:01 -0000 1.7
@@ -54,14 +54,10 @@
*/
package org.apache.commons.jelly.tags.ojb;
-import org.apache.ojb.broker.PersistenceBroker;
-import org.apache.ojb.broker.PersistenceBrokerException;
-import org.apache.ojb.broker.PersistenceBrokerFactory;
-
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
+import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.PersistenceBrokerFactory;
/**
* <p>Tag handler for <Driver> in JSTL, used to create
1.2 +0 -3 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/ant/tag/DummyTag.java
Index: DummyTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/ant/tag/DummyTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DummyTag.java 11 Nov 2002 18:57:57 -0000 1.1
+++ DummyTag.java 11 Dec 2002 12:41:01 -0000 1.2
@@ -63,15 +63,12 @@
import junit.framework.AssertionFailedError;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.impl.BeanSource;
import org.apache.commons.jelly.tags.ant.AntTagLibrary;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.tools.ant.types.Path;
/**
1.10 +5 -11 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/define/TestDynamicTags.java
Index: TestDynamicTags.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/define/TestDynamicTags.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestDynamicTags.java 30 Oct 2002 19:16:27 -0000 1.9
+++ TestDynamicTags.java 11 Dec 2002 12:41:01 -0000 1.10
@@ -61,10 +61,7 @@
*/
package org.apache.commons.jelly.define;
-import java.io.BufferedWriter;
import java.io.File;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.io.StringWriter;
import junit.framework.Test;
@@ -73,10 +70,7 @@
import junit.textui.TestRunner;
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.impl.TagScript;
-import org.apache.commons.jelly.parser.XMLParser;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.2 +5 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/servlet/JellyServlet.java
Index: JellyServlet.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/servlet/JellyServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JellyServlet.java 9 Dec 2002 15:18:26 -0000 1.1
+++ JellyServlet.java 11 Dec 2002 12:41:02 -0000 1.2
@@ -62,7 +62,6 @@
package org.apache.commons.jelly.servlet;
-import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
1.4 +0 -4 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/impl/TestTagLibraryResolver.java
Index: TestTagLibraryResolver.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/impl/TestTagLibraryResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestTagLibraryResolver.java 30 Oct 2002 19:16:20 -0000 1.3
+++ TestTagLibraryResolver.java 11 Dec 2002 12:41:02 -0000 1.4
@@ -66,10 +66,6 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.TagLibrary;
-import org.apache.commons.jelly.impl.DefaultTagLibraryResolver;
-import org.apache.commons.jelly.impl.TagLibraryResolver;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>