http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/beans/EmptyMemberAndArguments.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/EmptyMemberAndArguments.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/EmptyMemberAndArguments.java index d16da30..2e078c9 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/EmptyMemberAndArguments.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/EmptyMemberAndArguments.java @@ -19,7 +19,7 @@ package org.apache.freemarker.core.model.impl.beans; -import org.apache.freemarker.core.ast._DelayedOrdinal; +import org.apache.freemarker.core._DelayedOrdinal; /** * Describes a failed member lookup. Instances of this must not be cached as instances may store the actual argument
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethods.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethods.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethods.java index 978e9d6..e53e563 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethods.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethods.java @@ -25,10 +25,10 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import org.apache.freemarker.core.ast.TemplateMarkupOutputModel; -import org.apache.freemarker.core.ast._DelayedConversionToString; -import org.apache.freemarker.core.ast._ErrorDescriptionBuilder; -import org.apache.freemarker.core.ast._TemplateModelException; +import org.apache.freemarker.core.TemplateMarkupOutputModel; +import org.apache.freemarker.core._DelayedConversionToString; +import org.apache.freemarker.core._ErrorDescriptionBuilder; +import org.apache.freemarker.core._TemplateModelException; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.util.FTLUtil; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedVarArgsMethods.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedVarArgsMethods.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedVarArgsMethods.java index f4fa207..4a6d277 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedVarArgsMethods.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedVarArgsMethods.java @@ -23,10 +23,10 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.freemarker.core.ast.BugException; import org.apache.freemarker.core.model.ObjectWrapperAndUnwrapper; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; +import org.apache.freemarker.core.util.BugException; /** * Stores the varargs methods for a {@link OverloadedMethods} object. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/beans/ResourceBundleModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/ResourceBundleModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/ResourceBundleModel.java index 4dadba3..a79e786 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/ResourceBundleModel.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/ResourceBundleModel.java @@ -29,8 +29,8 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.Set; -import org.apache.freemarker.core.ast._DelayedJQuote; -import org.apache.freemarker.core.ast._TemplateModelException; +import org.apache.freemarker.core._DelayedJQuote; +import org.apache.freemarker.core._TemplateModelException; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.TemplateMethodModelEx; import org.apache.freemarker.core.model.TemplateModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java index a501501..d8ce069 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java @@ -22,7 +22,6 @@ package org.apache.freemarker.core.model.impl.beans; import java.util.List; import java.util.Map; -import org.apache.freemarker.core.ast.CollectionAndSequence; import org.apache.freemarker.core.model.AdapterTemplateModel; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.TemplateCollectionModel; @@ -33,6 +32,7 @@ import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateModelWithAPISupport; import org.apache.freemarker.core.model.WrapperTemplateModel; import org.apache.freemarker.core.model.WrappingTemplateModel; +import org.apache.freemarker.core.model.impl.CollectionAndSequence; import org.apache.freemarker.core.model.impl.MapKeyValuePairIterator; import org.apache.freemarker.core.model.impl.SimpleSequence; import org.apache.freemarker.core.model.RichObjectWrapper; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethod.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethod.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethod.java index 00223e7..940c4bc 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethod.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethod.java @@ -24,11 +24,11 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.freemarker.core.ast.TemplateMarkupOutputModel; -import org.apache.freemarker.core.ast._DelayedFTLTypeDescription; -import org.apache.freemarker.core.ast._DelayedOrdinal; -import org.apache.freemarker.core.ast._ErrorDescriptionBuilder; -import org.apache.freemarker.core.ast._TemplateModelException; +import org.apache.freemarker.core.TemplateMarkupOutputModel; +import org.apache.freemarker.core._DelayedFTLTypeDescription; +import org.apache.freemarker.core._DelayedOrdinal; +import org.apache.freemarker.core._ErrorDescriptionBuilder; +import org.apache.freemarker.core._TemplateModelException; import org.apache.freemarker.core.model.ObjectWrapperAndUnwrapper; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java index 68b7060..32c2bc2 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java @@ -24,7 +24,7 @@ import java.lang.reflect.Method; import java.util.Collections; import java.util.List; -import org.apache.freemarker.core.ast._UnexpectedTypeErrorExplainerTemplateModel; +import org.apache.freemarker.core._UnexpectedTypeErrorExplainerTemplateModel; import org.apache.freemarker.core.model.TemplateMethodModelEx; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/beans/_BeansAPI.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/_BeansAPI.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/_BeansAPI.java index 9bc4880..cac3ba7 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/_BeansAPI.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/_BeansAPI.java @@ -31,9 +31,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.freemarker.core.ast.BugException; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.impl.DefaultObjectWrapper; +import org.apache.freemarker.core.util.BugException; import org.apache.freemarker.core.util._CollectionUtil; /** http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/beans/_MethodUtil.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/_MethodUtil.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/_MethodUtil.java index 1dd995c..f06f1f9 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/_MethodUtil.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/_MethodUtil.java @@ -26,11 +26,11 @@ import java.lang.reflect.Modifier; import java.util.HashSet; import java.util.Set; -import org.apache.freemarker.core.ast.BugException; -import org.apache.freemarker.core.ast._DelayedConversionToString; -import org.apache.freemarker.core.ast._DelayedJQuote; -import org.apache.freemarker.core.ast._TemplateModelException; +import org.apache.freemarker.core._DelayedConversionToString; +import org.apache.freemarker.core._DelayedJQuote; +import org.apache.freemarker.core._TemplateModelException; import org.apache.freemarker.core.model.TemplateModelException; +import org.apache.freemarker.core.util.BugException; import org.apache.freemarker.core.util._ClassUtil; /** http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/dom/AttributeNodeModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/AttributeNodeModel.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/AttributeNodeModel.java index 30bab99..97915e6 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/dom/AttributeNodeModel.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/AttributeNodeModel.java @@ -19,7 +19,7 @@ package org.apache.freemarker.core.model.impl.dom; -import org.apache.freemarker.core.ast.Environment; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.model.TemplateScalarModel; import org.w3c.dom.Attr; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentModel.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentModel.java index 2e17632..0d15c71 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentModel.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentModel.java @@ -19,7 +19,7 @@ package org.apache.freemarker.core.model.impl.dom; -import org.apache.freemarker.core.ast.Environment; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.model.TemplateHashModel; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/dom/DomStringUtil.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/DomStringUtil.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/DomStringUtil.java index 106696e..23a9bd6 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/dom/DomStringUtil.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/DomStringUtil.java @@ -19,8 +19,8 @@ package org.apache.freemarker.core.model.impl.dom; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.ast.Environment; /** * For internal use only; don't depend on this, there's no backward compatibility guarantee at all! http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/dom/ElementModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/ElementModel.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/ElementModel.java index 12e8c2f..6bfe08f 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/dom/ElementModel.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/ElementModel.java @@ -21,8 +21,8 @@ package org.apache.freemarker.core.model.impl.dom; import java.util.Collections; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.ast.Environment; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateScalarModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/dom/JaxenXPathSupport.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/JaxenXPathSupport.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/JaxenXPathSupport.java index 25b6d23..08a0768 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/dom/JaxenXPathSupport.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/JaxenXPathSupport.java @@ -31,10 +31,10 @@ import java.util.Map; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import org.apache.freemarker.core.CustomAttribute; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.Template; import org.apache.freemarker.core.TemplateException; -import org.apache.freemarker.core.ast.CustomAttribute; -import org.apache.freemarker.core.ast.Environment; import org.apache.freemarker.core.model.TemplateBooleanModel; import org.apache.freemarker.core.model.TemplateDateModel; import org.apache.freemarker.core.model.TemplateModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeListModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeListModel.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeListModel.java index fdf2851..1a70524 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeListModel.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeListModel.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.List; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ast.Environment; -import org.apache.freemarker.core.ast._UnexpectedTypeErrorExplainerTemplateModel; +import org.apache.freemarker.core.Environment; +import org.apache.freemarker.core._UnexpectedTypeErrorExplainerTemplateModel; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.TemplateBooleanModel; import org.apache.freemarker.core.model.TemplateDateModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeModel.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeModel.java index 765084d..293227c 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeModel.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeModel.java @@ -28,7 +28,7 @@ import java.util.WeakHashMap; import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core._CoreLogs; -import org.apache.freemarker.core.ast._UnexpectedTypeErrorExplainerTemplateModel; +import org.apache.freemarker.core._UnexpectedTypeErrorExplainerTemplateModel; import org.apache.freemarker.core.model.AdapterTemplateModel; import org.apache.freemarker.core.model.TemplateBooleanModel; import org.apache.freemarker.core.model.TemplateDateModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeOutputter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeOutputter.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeOutputter.java index 737e13c..a4a6efe 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeOutputter.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/NodeOutputter.java @@ -22,9 +22,9 @@ package org.apache.freemarker.core.model.impl.dom; import java.util.Iterator; import java.util.LinkedHashMap; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.ast.BugException; -import org.apache.freemarker.core.ast.Environment; +import org.apache.freemarker.core.util.BugException; import org.apache.freemarker.core.util._StringUtil; import org.w3c.dom.Attr; import org.w3c.dom.Document; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/dom/SunInternalXalanXPathSupport.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/SunInternalXalanXPathSupport.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/SunInternalXalanXPathSupport.java index 716dc2d..b00d2a1 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/dom/SunInternalXalanXPathSupport.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/SunInternalXalanXPathSupport.java @@ -23,8 +23,8 @@ import java.util.List; import javax.xml.transform.TransformerException; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.ast.Environment; import org.apache.freemarker.core.model.TemplateBooleanModel; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/dom/XalanXPathSupport.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/XalanXPathSupport.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/XalanXPathSupport.java index 0e4a5b4..1dcb994 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/dom/XalanXPathSupport.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/XalanXPathSupport.java @@ -23,8 +23,8 @@ import java.util.List; import javax.xml.transform.TransformerException; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.ast.Environment; import org.apache.freemarker.core.model.TemplateBooleanModel; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/model/impl/dom/_ExtDomApi.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/_ExtDomApi.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/_ExtDomApi.java index 155c57a..d4663c5 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/dom/_ExtDomApi.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/_ExtDomApi.java @@ -19,7 +19,7 @@ package org.apache.freemarker.core.model.impl.dom; -import org.apache.freemarker.core.ast.Environment; +import org.apache.freemarker.core.Environment; /** * For internal use only; don't depend on this, there's no backward compatibility guarantee at all! http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java b/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java index 6069d2e..1c49cd5 100644 --- a/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java +++ b/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java @@ -21,7 +21,7 @@ package org.apache.freemarker.core.templateresolver; import java.io.IOException; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ast.TemplateConfiguration; +import org.apache.freemarker.core.TemplateConfiguration; /** * Returns the given {@link TemplateConfiguration} directly, or another {@link TemplateConfigurationFactory}'s result, when http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/templateresolver/FirstMatchTemplateConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/templateresolver/FirstMatchTemplateConfigurationFactory.java b/src/main/java/org/apache/freemarker/core/templateresolver/FirstMatchTemplateConfigurationFactory.java index 60d1491..69392f8 100644 --- a/src/main/java/org/apache/freemarker/core/templateresolver/FirstMatchTemplateConfigurationFactory.java +++ b/src/main/java/org/apache/freemarker/core/templateresolver/FirstMatchTemplateConfigurationFactory.java @@ -21,7 +21,7 @@ package org.apache.freemarker.core.templateresolver; import java.io.IOException; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ast.TemplateConfiguration; +import org.apache.freemarker.core.TemplateConfiguration; import org.apache.freemarker.core.util._StringUtil; /** http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java b/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java index fc5ae68..bdbbf4e 100644 --- a/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java +++ b/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java @@ -21,7 +21,7 @@ package org.apache.freemarker.core.templateresolver; import java.io.IOException; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ast.TemplateConfiguration; +import org.apache.freemarker.core.TemplateConfiguration; /** * Returns the merged results of all the child factories. The factories are merged in the order as they were added. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java index e1a6b0a..abd15c8 100644 --- a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java +++ b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.ast.TemplateConfiguration; +import org.apache.freemarker.core.TemplateConfiguration; /** * Creates (or returns) {@link TemplateConfiguration}-s for template sources. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResult.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResult.java b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResult.java index 7590959..2d2b29d 100644 --- a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResult.java +++ b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResult.java @@ -26,7 +26,7 @@ import java.io.Serializable; import java.util.Date; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ast.TemplateConfiguration; +import org.apache.freemarker.core.TemplateConfiguration; import org.apache.freemarker.core.templateresolver.impl.DefaultTemplateResolver; import org.apache.freemarker.core.util._NullArgumentException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java index 6bdacd7..823a046 100644 --- a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java +++ b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java @@ -22,9 +22,9 @@ import java.io.IOException; import java.util.Locale; import org.apache.freemarker.core.Configuration; +import org.apache.freemarker.core.ParseException; import org.apache.freemarker.core.Template; import org.apache.freemarker.core.TemplateNotFoundException; -import org.apache.freemarker.core.ast.ParseException; import org.apache.freemarker.core.templateresolver.impl.DefaultTemplateResolver; /** http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java b/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java index 97e02cb..bff9306 100644 --- a/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java +++ b/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java @@ -32,13 +32,12 @@ import java.util.Locale; import java.util.StringTokenizer; import org.apache.freemarker.core.Configuration; +import org.apache.freemarker.core.MarkReleaserTemplateSpecifiedEncodingHandler; import org.apache.freemarker.core.Template; +import org.apache.freemarker.core.TemplateConfiguration; import org.apache.freemarker.core.TemplateNotFoundException; +import org.apache.freemarker.core.TemplateSpecifiedEncodingHandler; import org.apache.freemarker.core._CoreLogs; -import org.apache.freemarker.core.ast.BugException; -import org.apache.freemarker.core.ast.MarkReleaserTemplateSpecifiedEncodingHandler; -import org.apache.freemarker.core.ast.TemplateConfiguration; -import org.apache.freemarker.core.ast.TemplateSpecifiedEncodingHandler; import org.apache.freemarker.core.templateresolver.CacheStorage; import org.apache.freemarker.core.templateresolver.GetTemplateResult; import org.apache.freemarker.core.templateresolver.MalformedTemplateNameException; @@ -52,6 +51,7 @@ import org.apache.freemarker.core.templateresolver.TemplateLoadingSource; import org.apache.freemarker.core.templateresolver.TemplateLookupStrategy; import org.apache.freemarker.core.templateresolver.TemplateNameFormat; import org.apache.freemarker.core.templateresolver.TemplateResolver; +import org.apache.freemarker.core.util.BugException; import org.apache.freemarker.core.util.UndeclaredThrowableException; import org.apache.freemarker.core.util._NullArgumentException; import org.apache.freemarker.core.util._StringUtil; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/util/BugException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/util/BugException.java b/src/main/java/org/apache/freemarker/core/util/BugException.java new file mode 100644 index 0000000..fde2a5d --- /dev/null +++ b/src/main/java/org/apache/freemarker/core/util/BugException.java @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.freemarker.core.util; + +/** + * An unexpected state was reached that is certainly caused by a bug in FreeMarker. + * + * @since 2.3.21 + */ +public class BugException extends RuntimeException { + + private static final String COMMON_MESSAGE + = "A bug was detected in FreeMarker; please report it with stack-trace"; + + public BugException() { + this((Throwable) null); + } + + public BugException(String message) { + this(message, null); + } + + public BugException(Throwable cause) { + super(COMMON_MESSAGE, cause); + } + + public BugException(String message, Throwable cause) { + super(COMMON_MESSAGE + ": " + message, cause); + } + + public BugException(int value) { + this(String.valueOf(value)); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/util/CaptureOutput.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/util/CaptureOutput.java b/src/main/java/org/apache/freemarker/core/util/CaptureOutput.java index f4d3b1d..9d86a3a 100644 --- a/src/main/java/org/apache/freemarker/core/util/CaptureOutput.java +++ b/src/main/java/org/apache/freemarker/core/util/CaptureOutput.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.io.Writer; import java.util.Map; -import org.apache.freemarker.core.ast.Environment; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateScalarModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/util/DeepUnwrap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/util/DeepUnwrap.java b/src/main/java/org/apache/freemarker/core/util/DeepUnwrap.java index 8e42388..c882821 100644 --- a/src/main/java/org/apache/freemarker/core/util/DeepUnwrap.java +++ b/src/main/java/org/apache/freemarker/core/util/DeepUnwrap.java @@ -22,7 +22,7 @@ package org.apache.freemarker.core.util; import java.util.ArrayList; import java.util.HashMap; -import org.apache.freemarker.core.ast.Environment; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.model.AdapterTemplateModel; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.TemplateBooleanModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/util/FTLUtil.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/util/FTLUtil.java b/src/main/java/org/apache/freemarker/core/util/FTLUtil.java index b6c88b4..fd5a1b2 100644 --- a/src/main/java/org/apache/freemarker/core/util/FTLUtil.java +++ b/src/main/java/org/apache/freemarker/core/util/FTLUtil.java @@ -21,9 +21,9 @@ package org.apache.freemarker.core.util; import java.util.HashSet; import java.util.Set; -import org.apache.freemarker.core.ast.Environment; -import org.apache.freemarker.core.ast.Macro; -import org.apache.freemarker.core.ast.TemplateMarkupOutputModel; +import org.apache.freemarker.core.Environment; +import org.apache.freemarker.core.TemplateMarkupOutputModel; +import org.apache.freemarker.core._CoreAPI; import org.apache.freemarker.core.model.AdapterTemplateModel; import org.apache.freemarker.core.model.TemplateBooleanModel; import org.apache.freemarker.core.model.TemplateCollectionModel; @@ -680,8 +680,8 @@ public final class FTLUtil { appendTemplateModelTypeName(sb, typeNamesAppended, primaryInterface); } - if (tm instanceof Macro) { - appendTypeName(sb, typeNamesAppended, ((Macro) tm).isFunction() ? "function" : "macro"); + if (_CoreAPI.isMacroOrFunction(tm)) { + appendTypeName(sb, typeNamesAppended, _CoreAPI.isFunction(tm) ? "function" : "macro"); } appendTemplateModelTypeName(sb, typeNamesAppended, tm.getClass()); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/util/GenericParseException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/util/GenericParseException.java b/src/main/java/org/apache/freemarker/core/util/GenericParseException.java index 8e650e1..e2431ec 100644 --- a/src/main/java/org/apache/freemarker/core/util/GenericParseException.java +++ b/src/main/java/org/apache/freemarker/core/util/GenericParseException.java @@ -18,7 +18,7 @@ */ package org.apache.freemarker.core.util; -import org.apache.freemarker.core.ast.ParseException; +import org.apache.freemarker.core.ParseException; /** * Exception thrown when a we want to parse some text but its format doesn't match the expectations. This is a quite http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/util/_ClassUtil.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/util/_ClassUtil.java b/src/main/java/org/apache/freemarker/core/util/_ClassUtil.java index 79d2688..1c87c45 100644 --- a/src/main/java/org/apache/freemarker/core/util/_ClassUtil.java +++ b/src/main/java/org/apache/freemarker/core/util/_ClassUtil.java @@ -19,42 +19,7 @@ package org.apache.freemarker.core.util; -import java.util.HashSet; -import java.util.Set; - -import org.apache.freemarker.core.ast.Environment; -import org.apache.freemarker.core.ast.Macro; -import org.apache.freemarker.core.ast.TemplateMarkupOutputModel; -import org.apache.freemarker.core.model.AdapterTemplateModel; -import org.apache.freemarker.core.model.TemplateBooleanModel; -import org.apache.freemarker.core.model.TemplateCollectionModel; -import org.apache.freemarker.core.model.TemplateCollectionModelEx; -import org.apache.freemarker.core.model.TemplateDateModel; -import org.apache.freemarker.core.model.TemplateDirectiveModel; -import org.apache.freemarker.core.model.TemplateHashModel; -import org.apache.freemarker.core.model.TemplateHashModelEx; -import org.apache.freemarker.core.model.TemplateMethodModel; -import org.apache.freemarker.core.model.TemplateMethodModelEx; -import org.apache.freemarker.core.model.TemplateModel; -import org.apache.freemarker.core.model.TemplateModelIterator; -import org.apache.freemarker.core.model.TemplateNodeModel; -import org.apache.freemarker.core.model.TemplateNodeModelEx; -import org.apache.freemarker.core.model.TemplateNumberModel; -import org.apache.freemarker.core.model.TemplateScalarModel; -import org.apache.freemarker.core.model.TemplateSequenceModel; -import org.apache.freemarker.core.model.TemplateTransformModel; -import org.apache.freemarker.core.model.WrapperTemplateModel; -import org.apache.freemarker.core.model.impl.beans.BeanModel; -import org.apache.freemarker.core.model.impl.beans.BooleanModel; -import org.apache.freemarker.core.model.impl.beans.CollectionModel; -import org.apache.freemarker.core.model.impl.beans.DateModel; -import org.apache.freemarker.core.model.impl.beans.EnumerationModel; -import org.apache.freemarker.core.model.impl.beans.IteratorModel; -import org.apache.freemarker.core.model.impl.beans.MapModel; import org.apache.freemarker.core.model.impl.beans.NumberModel; -import org.apache.freemarker.core.model.impl.beans.OverloadedMethodsModel; -import org.apache.freemarker.core.model.impl.beans.SimpleMethodModel; -import org.apache.freemarker.core.model.impl.beans.StringModel; public class _ClassUtil { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/util/_StringUtil.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/util/_StringUtil.java b/src/main/java/org/apache/freemarker/core/util/_StringUtil.java index a6aa715..d677006 100644 --- a/src/main/java/org/apache/freemarker/core/util/_StringUtil.java +++ b/src/main/java/org/apache/freemarker/core/util/_StringUtil.java @@ -29,9 +29,8 @@ import java.util.StringTokenizer; import java.util.regex.Pattern; import org.apache.freemarker.core.Configuration; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.Version; -import org.apache.freemarker.core.ast.BugException; -import org.apache.freemarker.core.ast.Environment; import org.apache.freemarker.core.model.impl.dom._ExtDomApi; /** Don't use this; used internally by FreeMarker, might changes without notice. */ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java b/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java index 7cb8cda..5bfcd24 100644 --- a/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java +++ b/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java @@ -41,17 +41,17 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.freemarker.core.Configurable; import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.ConfigurationException; +import org.apache.freemarker.core.Environment; +import org.apache.freemarker.core.OutputFormat; import org.apache.freemarker.core.Template; import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.core.TemplateExceptionHandler; import org.apache.freemarker.core.TemplateNotFoundException; +import org.apache.freemarker.core.UndefinedOutputFormat; import org.apache.freemarker.core._CoreLogs; -import org.apache.freemarker.core.ast.Configurable; -import org.apache.freemarker.core.ast.Environment; -import org.apache.freemarker.core.ast.OutputFormat; -import org.apache.freemarker.core.ast.UndefinedOutputFormat; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; @@ -821,7 +821,7 @@ public class FreemarkerServlet extends HttpServlet { response.sendError(HttpServletResponse.SC_NOT_FOUND, "Page template not found"); return; } - } catch (org.apache.freemarker.core.ast.ParseException e) { + } catch (org.apache.freemarker.core.ParseException e) { throw newServletExceptionWithFreeMarkerLogging( "Parsing error with template " + _StringUtil.jQuoteNoXSS(templatePath) + ".", e); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/servlet/IncludePage.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/IncludePage.java b/src/main/java/org/apache/freemarker/servlet/IncludePage.java index 09f5182..e9ea1b4 100644 --- a/src/main/java/org/apache/freemarker/servlet/IncludePage.java +++ b/src/main/java/org/apache/freemarker/servlet/IncludePage.java @@ -36,10 +36,10 @@ import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.TemplateException; -import org.apache.freemarker.core.ast.Environment; -import org.apache.freemarker.core.ast._DelayedFTLTypeDescription; -import org.apache.freemarker.core.ast._MiscTemplateException; +import org.apache.freemarker.core._DelayedFTLTypeDescription; +import org.apache.freemarker.core._MiscTemplateException; import org.apache.freemarker.core.model.TemplateBooleanModel; import org.apache.freemarker.core.model.TemplateDirectiveBody; import org.apache.freemarker.core.model.TemplateDirectiveModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/servlet/InitParamParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/InitParamParser.java b/src/main/java/org/apache/freemarker/servlet/InitParamParser.java index 2bfcba3..a572214 100644 --- a/src/main/java/org/apache/freemarker/servlet/InitParamParser.java +++ b/src/main/java/org/apache/freemarker/servlet/InitParamParser.java @@ -28,8 +28,8 @@ import java.util.regex.Pattern; import javax.servlet.ServletContext; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ast._ObjectBuilderSettingEvaluator; -import org.apache.freemarker.core.ast._SettingEvaluationEnvironment; +import org.apache.freemarker.core._ObjectBuilderSettingEvaluator; +import org.apache.freemarker.core._SettingEvaluationEnvironment; import org.apache.freemarker.core.templateresolver.TemplateLoader; import org.apache.freemarker.core.templateresolver.impl.ClassTemplateLoader; import org.apache.freemarker.core.templateresolver.impl.FileTemplateLoader; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java b/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java index 5af65f2..814f930 100644 --- a/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java +++ b/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java @@ -23,10 +23,9 @@ import java.io.Writer; import java.util.List; import java.util.Map; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.TemplateException; -import org.apache.freemarker.core.ast.BugException; -import org.apache.freemarker.core.ast.Environment; -import org.apache.freemarker.core.ast._UnexpectedTypeErrorExplainerTemplateModel; +import org.apache.freemarker.core._UnexpectedTypeErrorExplainerTemplateModel; import org.apache.freemarker.core.model.TemplateDirectiveBody; import org.apache.freemarker.core.model.TemplateDirectiveModel; import org.apache.freemarker.core.model.TemplateMethodModelEx; @@ -35,6 +34,7 @@ import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateSequenceModel; import org.apache.freemarker.core.model.TemplateTransformModel; import org.apache.freemarker.core.model.impl.beans.SimpleMethodModel; +import org.apache.freemarker.core.util.BugException; import org.apache.freemarker.core.util._ClassUtil; /** http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java b/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java index 441c11c..ee65d27 100644 --- a/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java +++ b/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java @@ -45,7 +45,7 @@ import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyContent; -import org.apache.freemarker.core.ast.Environment; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.model.AdapterTemplateModel; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.ObjectWrapperAndUnwrapper; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java b/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java index eb2896b..82ad1cb 100644 --- a/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java +++ b/src/main/java/org/apache/freemarker/servlet/jsp/JspTagModelBase.java @@ -31,10 +31,10 @@ import java.util.Iterator; import java.util.Map; import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.ast._DelayedJQuote; -import org.apache.freemarker.core.ast._DelayedShortClassName; -import org.apache.freemarker.core.ast._ErrorDescriptionBuilder; -import org.apache.freemarker.core.ast._TemplateModelException; +import org.apache.freemarker.core._DelayedJQuote; +import org.apache.freemarker.core._DelayedShortClassName; +import org.apache.freemarker.core._ErrorDescriptionBuilder; +import org.apache.freemarker.core._TemplateModelException; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.ObjectWrapperAndUnwrapper; import org.apache.freemarker.core.model.TemplateModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/servlet/jsp/PageContextFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/PageContextFactory.java b/src/main/java/org/apache/freemarker/servlet/jsp/PageContextFactory.java index 0931353..8aa783f 100644 --- a/src/main/java/org/apache/freemarker/servlet/jsp/PageContextFactory.java +++ b/src/main/java/org/apache/freemarker/servlet/jsp/PageContextFactory.java @@ -21,7 +21,7 @@ package org.apache.freemarker.servlet.jsp; import javax.servlet.jsp.PageContext; -import org.apache.freemarker.core.ast.Environment; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.util.UndeclaredThrowableException; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java b/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java index 687f9b3..92a5f08 100644 --- a/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java +++ b/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java @@ -31,8 +31,8 @@ import javax.servlet.jsp.tagext.JspTag; import javax.servlet.jsp.tagext.SimpleTag; import javax.servlet.jsp.tagext.Tag; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.TemplateException; -import org.apache.freemarker.core.ast.Environment; import org.apache.freemarker.core.model.TemplateDirectiveBody; import org.apache.freemarker.core.model.TemplateDirectiveModel; import org.apache.freemarker.core.model.TemplateModel; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java b/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java index c171415..b772d7e 100644 --- a/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java +++ b/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java @@ -60,8 +60,7 @@ import javax.servlet.jsp.tagext.Tag; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; -import org.apache.freemarker.core.ast.BugException; -import org.apache.freemarker.core.ast.Environment; +import org.apache.freemarker.core.Environment; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.TemplateHashModel; import org.apache.freemarker.core.model.TemplateMethodModelEx; @@ -70,6 +69,7 @@ import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateTransformModel; import org.apache.freemarker.core.model.impl.DefaultObjectWrapper; import org.apache.freemarker.core.model.impl.beans.BeansWrapper; +import org.apache.freemarker.core.util.BugException; import org.apache.freemarker.core.util._ClassUtil; import org.apache.freemarker.core.util._NullArgumentException; import org.apache.freemarker.core.util._SecurityUtil;
