You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by tv...@apache.org on 2007/05/03 16:07:20 UTC
svn commit: r534872 - in /jakarta/turbine/core/branches/TURBINE_2_3_BRANCH:
conf/ conf/test/
proposals/henning/jsp-tags/src/java/org/apache/turbine/util/jsp/
src/java/org/apache/turbine/services/jsp/util/
src/java/org/apache/turbine/services/pull/ src/...
Author: tv
Date: Thu May 3 07:07:18 2007
New Revision: 534872
URL: http://svn.apache.org/viewvc?view=rev&rev=534872
Log:
Removed some more deprecated classes and their references
in docs and configuration files.
Removed:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/RelativeTemplateLink.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/TemplateLinkWithSlash.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/CSVParser.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ContentURI.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/CookieParser.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/DataStreamParser.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ParameterParser.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/RelativeDynamicURI.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/RunDataFactory.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/StringUtils.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/TSVParser.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ValueParser.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/RelativeTemplateLink.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateLink.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateLinkWithSlash.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplatePageAttributes.java
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResources.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResourcesWithIntake.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/proposals/henning/jsp-tags/src/java/org/apache/turbine/util/jsp/JspActionEvent.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/jsp/util/JspLink.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/TurbinePullService.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/testapp/WEB-INF/conf/TurbineCacheTest.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/context-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_2-howto.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/pull-service.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/scheduler-service.xml
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties?view=diff&rev=534872&r1=534871&r2=534872
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties Thu May 3 07:07:18 2007
@@ -178,15 +178,6 @@
screen.invalidstate=error.InvalidState
-# Set the default Doctype if you use the deprecated VelocityECSLayout. The
-# default Doctype can be set by using the single strings: Html40Strict,
-# Html40Transitional, or Html40Frameset. Additionally the default can be
-# supplied as two strings separated by a comma giving the DTD and URI.
-#
-# Default: ignored if not set to some value.
-
-# default.doctype=Html40Transitional
-
# Set the components of the default Doctype for use in html documents.
#
# Defaults: There are no defaults - if default.html.doctype.root.element is not
@@ -466,7 +457,7 @@
# tool.global.ui = org.apache.turbine.util.pull.UIManager
# tool.global.mm = org.apache.turbine.util.pull.MessageManager
# tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
-# tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
+# tool.request.page = org.apache.turbine.util.template.HtmlPageAttributes
#
# Then:
#
@@ -477,7 +468,7 @@
# Tools are accessible in all templates by the <id> given
# to the tool. So for the above listings the UIManager would
# be available as $ui, the MessageManager as $mm, the TemplateLink
-# as $link and the TemplatePageAttributes as $page.
+# as $link and the HtmlPageAttributes as $page.
#
# You should avoid using tool names called "global", "request",
# "session" or "persistent" because of clashes with the possible Scopes.
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResources.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResources.properties?view=diff&rev=534872&r1=534871&r2=534872
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResources.properties (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResources.properties Thu May 3 07:07:18 2007
@@ -385,8 +385,8 @@
#
# tool.global.ui = org.apache.turbine.util.pull.UIManager
# tool.global.mm = org.apache.turbine.util.pull.MessageManager
-# tool.request.link = org.apache.turbine.util.template.TemplateLink
-# tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
+# tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
+# tool.request.page = org.apache.turbine.util.template.HtmlPageAttributes
#
# Then:
#
@@ -397,7 +397,7 @@
# Tools are accessible in all templates by the <id> given
# to the tool. So for the above listings the UIManager would
# be available as $ui, the MessageManager as $mm, the TemplateLink
-# as $link and the TemplatePageAttributes as $page.
+# as $link and the HtmlPageAttributes as $page.
#
# You should avoid using tool names called "global", "request",
# "session" or "persistent" because of clashes with the possible Scopes.
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResourcesWithIntake.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResourcesWithIntake.properties?view=diff&rev=534872&r1=534871&r2=534872
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResourcesWithIntake.properties (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResourcesWithIntake.properties Thu May 3 07:07:18 2007
@@ -386,8 +386,8 @@
#
# tool.global.ui = org.apache.turbine.util.pull.UIManager
# tool.global.mm = org.apache.turbine.util.pull.MessageManager
-# tool.request.link = org.apache.turbine.util.template.TemplateLink
-# tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
+# tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
+# tool.request.page = org.apache.turbine.util.template.HtmlPageAttributes
#
# Then:
#
@@ -398,7 +398,7 @@
# Tools are accessible in all templates by the <id> given
# to the tool. So for the above listings the UIManager would
# be available as $ui, the MessageManager as $mm, the TemplateLink
-# as $link and the TemplatePageAttributes as $page.
+# as $link and the HtmlPageAttributes as $page.
#
# You should avoid using tool names called "global", "request",
# "session" or "persistent" because of clashes with the possible Scopes.
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/proposals/henning/jsp-tags/src/java/org/apache/turbine/util/jsp/JspActionEvent.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/proposals/henning/jsp-tags/src/java/org/apache/turbine/util/jsp/JspActionEvent.java?view=diff&rev=534872&r1=534871&r2=534872
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/proposals/henning/jsp-tags/src/java/org/apache/turbine/util/jsp/JspActionEvent.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/proposals/henning/jsp-tags/src/java/org/apache/turbine/util/jsp/JspActionEvent.java Thu May 3 07:07:18 2007
@@ -20,7 +20,7 @@
import java.util.Enumeration;
import org.apache.turbine.modules.ActionEvent;
import org.apache.turbine.services.jsp.TurbineJsp;
-import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.parser.ParameterParser;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/jsp/util/JspLink.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/jsp/util/JspLink.java?view=diff&rev=534872&r1=534871&r2=534872
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/jsp/util/JspLink.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/jsp/util/JspLink.java Thu May 3 07:07:18 2007
@@ -40,7 +40,7 @@
* @author Jon S. Stevens <a href="mailto:jon@latchkey.com">jon@latchkey.com</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
- * deprecated Use {@org.apache.turbine.services.pull.tools.TemplateLink} instead.
+ * @deprecated Use {@org.apache.turbine.services.pull.tools.TemplateLink} instead.
*/
public class JspLink
extends DynamicURI
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/TurbinePullService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/TurbinePullService.java?view=diff&rev=534872&r1=534871&r2=534872
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/TurbinePullService.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/TurbinePullService.java Thu May 3 07:07:18 2007
@@ -68,7 +68,7 @@
* tool.global.ui = org.apache.turbine.util.pull.UIManager
* tool.global.mm = org.apache.turbine.util.pull.MessageManager
* tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
- * tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
+ * tool.request.page = org.apache.turbine.util.template.HtmlPageAttributes
*
* Then:
*
@@ -79,7 +79,7 @@
* Tools are accessible in all templates by the <id> given
* to the tool. So for the above listings the UIManager would
* be available as $ui, the MessageManager as $mm, the TemplateLink
- * as $link and the TemplatePageAttributes as $page.
+ * as $link and the HtmlPageAttributes as $page.
*
* You should avoid using tool names called "global", "request",
* "session" or "persistent" because of clashes with the possible Scopes.
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/testapp/WEB-INF/conf/TurbineCacheTest.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/testapp/WEB-INF/conf/TurbineCacheTest.properties?view=diff&rev=534872&r1=534871&r2=534872
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/testapp/WEB-INF/conf/TurbineCacheTest.properties (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/testapp/WEB-INF/conf/TurbineCacheTest.properties Thu May 3 07:07:18 2007
@@ -558,7 +558,7 @@
# tool.global.ui = org.apache.turbine.util.pull.UIManager
# tool.global.mm = org.apache.turbine.util.pull.MessageManager
# tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
-# tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
+# tool.request.page = org.apache.turbine.util.template.HtmlPageAttributes
#
# Then:
#
@@ -569,7 +569,7 @@
# Tools are accessible in all templates by the <id> given
# to the tool. So for the above listings the UIManager would
# be available as $ui, the MessageManager as $mm, the TemplateLink
-# as $link and the TemplatePageAttributes as $page.
+# as $link and the HtmlPageAttributes as $page.
#
# You should avoid using tool names called "global", "request",
# "session" or "persistent" because of clashes with the possible Scopes.
@@ -596,7 +596,7 @@
# Defaults: none
tool.request.link=org.apache.turbine.service.pull.tools.TemplateLink
-tool.request.page=org.apache.turbine.util.template.TemplatePageAttributes
+tool.request.page=org.apache.turbine.util.template.HtmlPageAttributes
tool.request.content=org.apache.turbine.services.pull.tools.ContentTool
tool.request.l10n=org.apache.turbine.services.localization.LocalizationTool
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties?view=diff&rev=534872&r1=534871&r2=534872
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties Thu May 3 07:07:18 2007
@@ -415,7 +415,7 @@
# tool.global.ui = org.apache.turbine.util.pull.UIManager
# tool.global.mm = org.apache.turbine.util.pull.MessageManager
# tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
-# tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
+# tool.request.page = org.apache.turbine.util.template.HtmlPageAttributes
#
# Then:
#
@@ -426,7 +426,7 @@
# Tools are accessible in all templates by the <id> given
# to the tool. So for the above listings the UIManager would
# be available as $ui, the MessageManager as $mm, the TemplateLink
-# as $link and the TemplatePageAttributes as $page.
+# as $link and the HtmlPageAttributes as $page.
#
# You should avoid using tool names called "global", "request",
# "session" or "persistent" because of clashes with the possible Scopes.
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/context-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/context-howto.xml?view=diff&rev=534872&r1=534871&r2=534872
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/context-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/context-howto.xml Thu May 3 07:07:18 2007
@@ -34,7 +34,7 @@
The Turbine Templating Services attach references to default Objects in the
Turbine Context as part of their initialization. In the case of the
TurbineVelocityService these references point to RunData, TemplateLink and
-TemplatePageAttributes. These three are put into the Context in the
+HtmlPageAttributes. These three are put into the Context in the
TurbineVelocityService class. The Context stores the Objects in a Hashtable
with a key and the Object.
</p>
@@ -194,9 +194,9 @@
</p>
</section>
-<section name="Using the TemplatePageAttributes Object">
+<section name="Using the HtmlPageAttributes Object">
<p>
-The TemplatePageAttributes is accessed from within the context by the keyword
+The HtmlPageAttributes is accessed from within the context by the keyword
"page" and provides methods to modify the various HTML attributes of the
templating system. The Template context can be used to dictate the style of
the HTML page in the navigation and layout templates as well as modify these
@@ -226,13 +226,12 @@
</p>
<source test=""><![CDATA[
- $page.addAttribute("topmargin", 0)
+ $page.addBodyAttribute("topmargin", 0)
]]></source>
<p>
-Note though that the addAttribute method only adds attributes to the Body tag.
For a full list of methods exposed to the page reference view the Javadocs for
-TemplatePageAttributes. Other methods exposed to the page reference are;
+HtmlPageAttributes. Other methods exposed to the page reference are;
</p>
<p>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_2-howto.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_2-howto.xml?view=diff&rev=534872&r1=534871&r2=534872
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_2-howto.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/howto/migrate-from-2_2-howto.xml Thu May 3 07:07:18 2007
@@ -221,15 +221,18 @@
]]>
</source>
<p>
- If you used some of the other tools for creating URL's, then there are
- analogous new ones as well:
+ If you used some of the other tools for creating URL's, replace them with
+ the tools above and look for the configuration settings
</p>
<source>
<![CDATA[
-org.apache.turbine.services.pull.tools.RelativeTemplateLink
-org.apache.turbine.services.pull.tools.TemplateLinkWithSlash
+tool.link.want.relative = true
+tool.content.want.relative = true
]]>
</source>
+<p>
+ Using template links with slashes is no longer supported.
+</p>
</section>
<section name="Ensure you refer to your templates correctly">
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/pull-service.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/pull-service.xml?view=diff&rev=534872&r1=534871&r2=534872
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/pull-service.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/pull-service.xml Thu May 3 07:07:18 2007
@@ -115,7 +115,7 @@
# tool.global.ui = org.apache.turbine.util.pull.UIManager
# tool.global.mm = org.apache.turbine.util.pull.MessageManager
# tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
-# tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
+# tool.request.page = org.apache.turbine.util.template.HtmlPageAttributes
#
# (the next two examples specify mythical classes)
#
@@ -126,7 +126,7 @@
# Tools are accessible in all templates by the <id> given
# to the tool. So for the above listings the UIManager would
# be available as $ui, the MessageManager as $mm, the TemplateLink
-# as $link and the TemplatePageAttributes as $page.
+# as $link and the HtmlPageAttributes as $page.
#
# Scopes:
#
@@ -154,7 +154,7 @@
# Defaults: none
tool.request.link=org.apache.turbine.services.pull.tools.TemplateLink
-tool.request.page=org.apache.turbine.util.template.TemplatePageAttributes
+tool.request.page=org.apache.turbine.util.template.HtmlPageAttributes
tool.request.content=org.apache.turbine.services.pull.tools.ContentTool
#tool.request.om=org.apache.turbine.om.OMTool
#tool.request.intake=org.apache.turbine.services.intake.IntakeTool
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/scheduler-service.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/scheduler-service.xml?view=diff&rev=534872&r1=534871&r2=534872
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/scheduler-service.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/services/scheduler-service.xml Thu May 3 07:07:18 2007
@@ -287,7 +287,7 @@
import org.apache.turbine.services.schedule.JobEntry;
import org.apache.turbine.services.schedule.TurbineScheduler;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.parser.ParameterParser;
import org.apache.turbine.util.RunData;
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org