diff --git a/sandbox/pom.xml b/sandbox/pom.xml index c9c9a2bc..5c93b6da 100644 --- a/sandbox/pom.xml +++ b/sandbox/pom.xml @@ -21,6 +21,7 @@ sandbox-common + sandbox-servlet sandbox-swing @@ -58,6 +59,12 @@ ${project.version} compile + + com.twelvemonkeys.servlet + servlet + ${project.version} + compile + com.twelvemonkeys.swing swing-core diff --git a/sandbox/sandbox-servlet/pom.xml b/sandbox/sandbox-servlet/pom.xml new file mode 100644 index 00000000..87077d1c --- /dev/null +++ b/sandbox/sandbox-servlet/pom.xml @@ -0,0 +1,90 @@ + + + + + 4.0.0 + + com.twelvemonkeys.sandbox + sandbox + 3.0-SNAPSHOT + + sandbox-servlet + jar + TwelveMonkeys :: Sandbox :: Servlet + + The TwelveMonkeys Servlet Sandbox. Experimental stuff. Old stuff that didn't cut it. + + + + + com.twelvemonkeys.common + common-lang + compile + + + com.twelvemonkeys.common + common-io + compile + + + com.twelvemonkeys.common + common-image + compile + + + com.twelvemonkeys.servlet + servlet + compile + + + + + javax.servlet + servlet-api + 2.4 + provided + + + + javax.servlet + jsp-api + 2.0 + provided + + + + log4j + log4j + 1.2.14 + provided + + + diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Droplet.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Droplet.java similarity index 96% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Droplet.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Droplet.java index 67866b9a..261733c7 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Droplet.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Droplet.java @@ -37,7 +37,6 @@ import java.io.IOException; */ public abstract class Droplet extends HttpServlet implements JspFragment { - // Copy doc public abstract void service(PageContext pPageContext) throws ServletException, IOException; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/JspFragment.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/JspFragment.java similarity index 100% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/JspFragment.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/JspFragment.java diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Oparam.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Oparam.java similarity index 80% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Oparam.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Oparam.java index d3528771..87c29ce7 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Oparam.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Oparam.java @@ -1,10 +1,8 @@ - package com.twelvemonkeys.servlet.jsp.droplet; -import java.io.*; - -import javax.servlet.*; -import javax.servlet.jsp.*; +import javax.servlet.ServletException; +import javax.servlet.jsp.PageContext; +import java.io.IOException; /** * Oparam (Open parameter) diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Param.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Param.java similarity index 95% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Param.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Param.java index ff591e47..74fe73d9 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Param.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Param.java @@ -1,4 +1,3 @@ - package com.twelvemonkeys.servlet.jsp.droplet; import javax.servlet.ServletException; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/IncludeTag.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/IncludeTag.java similarity index 100% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/IncludeTag.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/IncludeTag.java diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingHandler.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingHandler.java similarity index 100% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingHandler.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingHandler.java diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingValidator.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingValidator.java similarity index 100% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingValidator.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingValidator.java diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/OparamTag.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/OparamTag.java similarity index 88% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/OparamTag.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/OparamTag.java index 22b25198..62bf52d2 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/OparamTag.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/OparamTag.java @@ -27,8 +27,6 @@ import com.twelvemonkeys.servlet.jsp.taglib.BodyReaderTag; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.BodyTag; -import javax.servlet.jsp.tagext.Tag; import java.io.File; import java.io.IOException; @@ -38,7 +36,7 @@ import java.io.IOException; * @author Thomas Purcell (CSC Australia) * @author Harald Kuhr * @author last modified by $Author: haku $ - * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/OparamTag.java#1 $ + * @version $Id: jsp/droplet/taglib/OparamTag.java#1 $ */ public class OparamTag extends BodyReaderTag { @@ -78,13 +76,11 @@ public class OparamTag extends BodyReaderTag { } /** - * Ensure that the tag implemented by this class is enclosed by an {@code - * IncludeTag}. If the tag is not enclosed by an - * {@code IncludeTag} then a {@code JspException} is thrown. + * Ensure that the tag implemented by this class is enclosed by an {@code IncludeTag}. + * If the tag is not enclosed by an {@code IncludeTag} then a {@code JspException} is thrown. * - * @return If this tag is enclosed within an {@code IncludeTag}, then - * the default return value from this method is the {@code - * TagSupport.EVAL_BODY_TAG} value. + * @return If this tag is enclosed within an {@code IncludeTag}, then the default return value + * from this method is the {@code TagSupport.EVAL_BODY_TAG} value. * * @throws JspException */ @@ -102,15 +98,14 @@ public class OparamTag extends BodyReaderTag { includeTag.addParameter(parameterName, new Oparam(subpage.getName())); // if ! subpage.exist || jsp newer than subpage, write new - File jsp = new File(pageContext.getServletContext() - .getRealPath(request.getServletPath())); + File jsp = new File(pageContext.getServletContext().getRealPath(request.getServletPath())); if (!subpage.exists() || jsp.lastModified() > subpage.lastModified()) { - return BodyTag.EVAL_BODY_BUFFERED; + return EVAL_BODY_BUFFERED; } // No need to evaluate body again! - return Tag.SKIP_BODY; + return SKIP_BODY; } /** diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ParamTag.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ParamTag.java similarity index 100% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ParamTag.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ParamTag.java diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTEI.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTEI.java similarity index 88% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTEI.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTEI.java index 538c5184..692001bc 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTEI.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTEI.java @@ -17,10 +17,8 @@ package com.twelvemonkeys.servlet.jsp.droplet.taglib; -import java.io.IOException; - -import javax.servlet.jsp.*; -import javax.servlet.jsp.tagext.*; +import javax.servlet.jsp.tagext.TagData; +import javax.servlet.jsp.tagext.TagExtraInfo; /** * TagExtraInfo for ValueOf. diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTag.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTag.java similarity index 100% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTag.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTag.java diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/package.html b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/package.html similarity index 100% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/package.html rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/package.html diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/BodyReaderTag.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/BodyReaderTag.java similarity index 96% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/BodyReaderTag.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/BodyReaderTag.java index c46aabc4..60ea0a91 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/BodyReaderTag.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/BodyReaderTag.java @@ -1,4 +1,3 @@ - package com.twelvemonkeys.servlet.jsp.taglib; import javax.servlet.jsp.JspException; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/CSVToTableTag.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/CSVToTableTag.java similarity index 94% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/CSVToTableTag.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/CSVToTableTag.java index 7fce5a0d..9db7b6be 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/CSVToTableTag.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/CSVToTableTag.java @@ -70,7 +70,7 @@ import java.util.StringTokenizer; * * @author Harald Kuhr * - * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/CSVToTableTag.java#1 $ + * @version $Id: jsp/taglib/CSVToTableTag.java#1 $ */ public class CSVToTableTag extends ExBodyTagSupport { public final static String TAB = "\t"; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExBodyTagSupport.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExBodyTagSupport.java similarity index 92% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExBodyTagSupport.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExBodyTagSupport.java index c24ab33a..10381ded 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExBodyTagSupport.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExBodyTagSupport.java @@ -14,14 +14,18 @@ package com.twelvemonkeys.servlet.jsp.taglib; -import java.io.*; -import java.net.*; -import java.util.*; - -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.jsp.*; -import javax.servlet.jsp.tagext.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.PageContext; +import javax.servlet.jsp.tagext.BodyTagSupport; +import java.io.IOException; +import java.io.InputStream; +import java.util.Enumeration; +import java.util.StringTokenizer; /** * This is the class that should be extended by all jsp pages that do use their @@ -30,7 +34,7 @@ import javax.servlet.jsp.tagext.*; * @author Thomas Purcell (CSC Australia) * @author Harald Kuhr * - * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExBodyTagSupport.java#1 $ + * @version $Id: jsp/taglib/ExBodyTagSupport.java#1 $ */ public class ExBodyTagSupport extends BodyTagSupport implements ExTag { diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTag.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTag.java similarity index 91% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTag.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTag.java index 58e21648..e0817362 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTag.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTag.java @@ -15,12 +15,13 @@ package com.twelvemonkeys.servlet.jsp.taglib; -import java.io.*; -import java.util.*; - -import javax.servlet.*; -import javax.servlet.jsp.*; -import javax.servlet.jsp.tagext.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.tagext.Tag; +import java.io.IOException; +import java.io.InputStream; +import java.util.Enumeration; /** * This interface contains a lot of helper methods for simplifying common @@ -28,7 +29,7 @@ import javax.servlet.jsp.tagext.*; * * @author Harald Kuhr * - * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTag.java#1 $ + * @version $Id: jsp/taglib/ExTag.java#1 $ */ public interface ExTag extends Tag { diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTagSupport.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTagSupport.java similarity index 92% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTagSupport.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTagSupport.java index 4cd688ce..3391064e 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTagSupport.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTagSupport.java @@ -15,14 +15,18 @@ package com.twelvemonkeys.servlet.jsp.taglib; -import java.io.*; -import java.net.*; -import java.util.*; - -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.jsp.*; -import javax.servlet.jsp.tagext.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.PageContext; +import javax.servlet.jsp.tagext.TagSupport; +import java.io.IOException; +import java.io.InputStream; +import java.util.Enumeration; +import java.util.StringTokenizer; /** * This is the class that should be extended by all jsp pages that don't use @@ -32,7 +36,7 @@ import javax.servlet.jsp.tagext.*; * @author Thomas Purcell (CSC Australia) * @author Harald Kuhr * - * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTagSupport.java#1 $ + * @version $Id: jsp/taglib/ExTagSupport.java#1 $ */ public class ExTagSupport extends TagSupport implements ExTag { diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTEI.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTEI.java similarity index 95% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTEI.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTEI.java index e4d3deb0..99c3e5fc 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTEI.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTEI.java @@ -1,4 +1,3 @@ - package com.twelvemonkeys.servlet.jsp.taglib; import javax.servlet.jsp.*; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTag.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTag.java similarity index 96% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTag.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTag.java index abe40cde..7c8da4b3 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTag.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTag.java @@ -1,4 +1,3 @@ - package com.twelvemonkeys.servlet.jsp.taglib; import com.twelvemonkeys.util.convert.Converter; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/TrimWhiteSpaceTag.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/TrimWhiteSpaceTag.java similarity index 93% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/TrimWhiteSpaceTag.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/TrimWhiteSpaceTag.java index 6ce1fcbb..38d47836 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/TrimWhiteSpaceTag.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/TrimWhiteSpaceTag.java @@ -1,10 +1,8 @@ - package com.twelvemonkeys.servlet.jsp.taglib; import java.io.IOException; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.BodyTag; /** * This tag truncates all consecutive whitespace in sequence inside its body, @@ -26,7 +24,7 @@ public class TrimWhiteSpaceTag extends ExBodyTagSupport { */ public int doStartTag() throws JspException { - return BodyTag.EVAL_BODY_BUFFERED; + return EVAL_BODY_BUFFERED; } /** diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/XMLTransformTag.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/XMLTransformTag.java similarity index 89% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/XMLTransformTag.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/XMLTransformTag.java index 4e92a463..6e712544 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/XMLTransformTag.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/XMLTransformTag.java @@ -16,21 +16,17 @@ package com.twelvemonkeys.servlet.jsp.taglib; import java.io.*; import java.net.*; -import javax.servlet.*; import javax.servlet.jsp.*; -import javax.servlet.jsp.tagext.*; import javax.xml.transform.*; import javax.xml.transform.stream.*; -import com.twelvemonkeys.servlet.jsp.*; - /** * This tag performs XSL Transformations (XSLT) on a given XML document or its * body content. * * @author Harald Kuhr * - * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/XMLTransformTag.java#1 $ + * @version $Id: jsp/taglib/XMLTransformTag.java#1 $ */ public class XMLTransformTag extends ExBodyTagSupport { @@ -86,11 +82,11 @@ public class XMLTransformTag extends ExBodyTagSupport { throw new JspException(ioe.getMessage(), ioe); } - return Tag.SKIP_BODY; + return SKIP_BODY; } // ...else process the body - return BodyTag.EVAL_BODY_BUFFERED; + return EVAL_BODY_BUFFERED; } /** diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/ConditionalTagBase.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/ConditionalTagBase.java similarity index 100% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/ConditionalTagBase.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/ConditionalTagBase.java diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/EqualTag.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/EqualTag.java similarity index 100% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/EqualTag.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/EqualTag.java diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTEI.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTEI.java similarity index 96% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTEI.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTEI.java index e0610cec..1dcb412a 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTEI.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTEI.java @@ -1,4 +1,3 @@ - package com.twelvemonkeys.servlet.jsp.taglib.logic; import javax.servlet.jsp.tagext.*; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTag.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTag.java similarity index 95% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTag.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTag.java index 354c357a..1fd61a1a 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTag.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTag.java @@ -1,4 +1,3 @@ - package com.twelvemonkeys.servlet.jsp.taglib.logic; import javax.servlet.jsp.JspException; diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/NotEqualTag.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/NotEqualTag.java similarity index 100% rename from servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/NotEqualTag.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/NotEqualTag.java diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/log4j/Log4JContextWrapper.java b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/log4j/Log4JContextWrapper.java similarity index 94% rename from servlet/src/main/java/com/twelvemonkeys/servlet/log4j/Log4JContextWrapper.java rename to sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/log4j/Log4JContextWrapper.java index c114f1ce..0599a468 100755 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/log4j/Log4JContextWrapper.java +++ b/sandbox/sandbox-servlet/src/main/java/com/twelvemonkeys/servlet/log4j/Log4JContextWrapper.java @@ -20,7 +20,7 @@ import java.util.Set; *

* * @author Harald Kuhr - * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/log4j/Log4JContextWrapper.java#1 $ + * @version $Id: log4j/Log4JContextWrapper.java#1 $ */ final class Log4JContextWrapper implements ServletContext { // TODO: Move to sandbox diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/package_info.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/package_info.java deleted file mode 100755 index 19cab518..00000000 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/package_info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Dynamo Droplet-like functionality for JSP. - * - * This package is early beta, not for commercial use! :-) - * Read: The interfaces and classes in this package (and subpackages) will be - * developed and modified for a while. - * - * TODO: Insert taglib-descriptor here? - */ -package com.twelvemonkeys.servlet.jsp.droplet; \ No newline at end of file diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/package_info.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/package_info.java deleted file mode 100755 index b4d9a8dc..00000000 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/package_info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * JSP support. - */ -package com.twelvemonkeys.servlet.jsp; \ No newline at end of file diff --git a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/package_info.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/package_info.java deleted file mode 100755 index 266046fd..00000000 --- a/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/package_info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * The TwelveMonkeys common TagLib. - */ -package com.twelvemonkeys.servlet.jsp.taglib;