You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/05/07 16:34:39 UTC
cvs commit: jakarta-turbine-2/xdocs/services pull-service.xml
henning 2003/05/07 07:34:38
Modified: conf TurbineResources.properties
conf/master TurbineResources.master
src/java/org/apache/turbine/services/pull
TurbinePullService.java
src/java/org/apache/turbine/services/pull/tools
RelativeTemplateLink.java
TemplateLinkWithSlash.java
src/java/org/apache/turbine/util ContentURI.java
DynamicURI.java RelativeDynamicURI.java
src/java/org/apache/turbine/util/template
RelativeTemplateLink.java TemplateLink.java
TemplateLinkWithSlash.java
src/rttest/testapp/WEB-INF/conf TurbineCacheTest.properties
src/test-cactus/testapp/WEB-INF/conf
TurbineCacheTest.properties
xdocs/services pull-service.xml
Log:
- Fix up all the tool references in comments,docs and config files.
- Deprecate the old uri scheme files.
Revision Changes Path
1.39 +4 -4 jakarta-turbine-2/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/TurbineResources.properties,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- TurbineResources.properties 21 Mar 2003 22:22:33 -0000 1.38
+++ TurbineResources.properties 7 May 2003 14:34:37 -0000 1.39
@@ -411,7 +411,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.util.template.TemplateLink
+# tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
# tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
#
# Then:
@@ -453,9 +453,9 @@
#
# Defaults: none
-tool.request.link=org.apache.turbine.util.template.TemplateLink
+tool.request.link=org.apache.turbine.services.pull.tools.TemplateLink
tool.request.page=org.apache.turbine.util.template.HtmlPageAttributes
-tool.request.content=org.apache.turbine.util.ContentURI
+tool.request.content=org.apache.turbine.services.pull.tools.ContentTool
tool.request.l10n=org.apache.turbine.services.localization.LocalizationTool
tool.request.flux=org.apache.turbine.flux.tools.FluxTool
1.38 +4 -4 jakarta-turbine-2/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/master/TurbineResources.master,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- TurbineResources.master 21 Mar 2003 22:22:33 -0000 1.37
+++ TurbineResources.master 7 May 2003 14:34:37 -0000 1.38
@@ -411,7 +411,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.util.template.TemplateLink
+# tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
# tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
#
# Then:
@@ -453,9 +453,9 @@
#
# Defaults: none
-tool.request.link=org.apache.turbine.util.template.TemplateLink
+tool.request.link=org.apache.turbine.services.pull.tools.TemplateLink
tool.request.page=org.apache.turbine.util.template.HtmlPageAttributes
-tool.request.content=org.apache.turbine.util.ContentURI
+tool.request.content=org.apache.turbine.services.pull.tools.ContentTool
tool.request.l10n=org.apache.turbine.services.localization.LocalizationTool
tool.request.flux=org.apache.turbine.flux.tools.FluxTool
1.26 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/pull/TurbinePullService.java
Index: TurbinePullService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/TurbinePullService.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TurbinePullService.java 25 Mar 2003 17:13:13 -0000 1.25
+++ TurbinePullService.java 7 May 2003 14:34:37 -0000 1.26
@@ -101,7 +101,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.util.template.TemplateLink
+ * tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
* tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
*
* Then:
@@ -300,7 +300,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.util.template.TemplateLink;
+ // tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
//
// tool.session.basket = org.sample.util.ShoppingBasket;
//
1.2 +3 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/RelativeTemplateLink.java
Index: RelativeTemplateLink.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/RelativeTemplateLink.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RelativeTemplateLink.java 7 May 2003 13:58:21 -0000 1.1
+++ RelativeTemplateLink.java 7 May 2003 14:34:37 -0000 1.2
@@ -73,7 +73,8 @@
* This is an application pull tool for the template system. You should <b>not</b>
* use it in a normal application!
*
- * @deprecated Use TemplateLink with the 'relative' methods
+ * @deprecated Use {@link org.apache.turbine.services.pull.tools.TemplateLink} with the
+ * {@link org.apache.turbine.services.pull.tools.TemplateLink#getRelativeLink} method.
*
* @author <a href="jmcnally@collab.net">John D. McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
1.2 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/TemplateLinkWithSlash.java
Index: TemplateLinkWithSlash.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/TemplateLinkWithSlash.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TemplateLinkWithSlash.java 7 May 2003 13:58:21 -0000 1.1
+++ TemplateLinkWithSlash.java 7 May 2003 14:34:37 -0000 1.2
@@ -72,7 +72,7 @@
* This is an application pull tool for the template system. You should <b>not</b>
* use it in a normal application!
*
- * @deprecated Use TemplateLink.
+ * @deprecated Use {@link org.apache.turbine.services.pull.tools.TemplateLink} instead and fix up your template references.
*
* @author <a href="jmcnally@collab.net">John D. McNally</a>
* @version $Id$
1.4 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/util/ContentURI.java
Index: ContentURI.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/ContentURI.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContentURI.java 9 Mar 2003 02:54:11 -0000 1.3
+++ ContentURI.java 7 May 2003 14:34:37 -0000 1.4
@@ -66,6 +66,8 @@
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @version $Id$
+ * @deprecated Use {@link org.apache.turbine.services.pull.tools.ContentTool} for tool usage
+ * and {@link org.apache.turbine.util.uri.DataURI} for code usage instead.
*/
public class ContentURI
extends DynamicURI
1.20 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/util/DynamicURI.java
Index: DynamicURI.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/DynamicURI.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DynamicURI.java 11 Apr 2003 13:15:11 -0000 1.19
+++ DynamicURI.java 7 May 2003 14:34:37 -0000 1.20
@@ -101,6 +101,7 @@
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @version $Id$
+ * @deprecated Use {@link org.apache.turbine.util.uri.TurbineURI} instead.
*/
public class DynamicURI
{
1.7 +1 -0 jakarta-turbine-2/src/java/org/apache/turbine/util/RelativeDynamicURI.java
Index: RelativeDynamicURI.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/RelativeDynamicURI.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RelativeDynamicURI.java 25 Mar 2003 17:15:30 -0000 1.6
+++ RelativeDynamicURI.java 7 May 2003 14:34:37 -0000 1.7
@@ -77,6 +77,7 @@
* <A HREF="/servlets/Turbine/screen=UserScreen&amp;user=jon">ClickHere</A>
*
* @author <a href="mailto:dfaller@raleigh.ibm.com">David S. Faller</a>
+ * @deprecated Use {@link org.apache.turbine.util.uri.TurbineURI} with {@link org.apache.turbine.util.uri.TurbineURI#getRelativeLink} instead.
*/
public class RelativeDynamicURI extends DynamicURI
{
1.7 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/util/template/RelativeTemplateLink.java
Index: RelativeTemplateLink.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/template/RelativeTemplateLink.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RelativeTemplateLink.java 25 Mar 2003 17:15:30 -0000 1.6
+++ RelativeTemplateLink.java 7 May 2003 14:34:38 -0000 1.7
@@ -70,6 +70,7 @@
* @author <a href="jmcnally@collab.net">John D. McNally</a>
* @author see the authors of TemplateLink
* @version $Id$
+ * @deprecated Use {@link org.apache.turbine.services.pull.tools.RelativeTemplateLink} instead.
*/
public class RelativeTemplateLink
extends RelativeDynamicURI
1.7 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/util/template/TemplateLink.java
Index: TemplateLink.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/template/TemplateLink.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TemplateLink.java 25 Mar 2003 17:15:30 -0000 1.6
+++ TemplateLink.java 7 May 2003 14:34:38 -0000 1.7
@@ -74,6 +74,8 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
+ * @deprecated Use {@link org.apache.turbine.services.pull.tools.TemplateLink} for tool usage
+ * and {@link org.apache.turbine.util.uri.TemplateURI} for code usage instead.
*/
public class TemplateLink
extends DynamicURI
1.6 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/util/template/TemplateLinkWithSlash.java
Index: TemplateLinkWithSlash.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/template/TemplateLinkWithSlash.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TemplateLinkWithSlash.java 9 Mar 2003 05:58:15 -0000 1.5
+++ TemplateLinkWithSlash.java 7 May 2003 14:34:38 -0000 1.6
@@ -68,6 +68,7 @@
*
* @author <a href="jmcnally@collab.net">John D. McNally</a>
* @version $Id$
+ * @deprecated Use {@link org.apache.turbine.services.pull.tools.TemplateLinkWithSlash} instead.
*/
public class TemplateLinkWithSlash
extends TemplateLink
1.2 +4 -4 jakarta-turbine-2/src/rttest/testapp/WEB-INF/conf/TurbineCacheTest.properties
Index: TurbineCacheTest.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/rttest/testapp/WEB-INF/conf/TurbineCacheTest.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineCacheTest.properties 1 Feb 2002 03:20:00 -0000 1.1
+++ TurbineCacheTest.properties 7 May 2003 14:34:38 -0000 1.2
@@ -536,7 +536,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.util.template.TemplateLink
+# tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
# tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
#
# Then:
@@ -574,9 +574,9 @@
#
# Defaults: none
-tool.request.link=org.apache.turbine.util.template.TemplateLink
+tool.request.link=org.apache.turbine.service.pull.tools.TemplateLink
tool.request.page=org.apache.turbine.util.template.TemplatePageAttributes
-tool.request.content=org.apache.turbine.util.ContentURI
+tool.request.content=org.apache.turbine.services.pull.tools.ContentTool
tool.request.l10n=org.apache.turbine.services.localization.LocalizationTool
tool.request.flux=org.apache.turbine.flux.tools.FluxTool
1.2 +4 -4 jakarta-turbine-2/src/test-cactus/testapp/WEB-INF/conf/TurbineCacheTest.properties
Index: TurbineCacheTest.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/test-cactus/testapp/WEB-INF/conf/TurbineCacheTest.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineCacheTest.properties 24 Feb 2003 12:22:57 -0000 1.1
+++ TurbineCacheTest.properties 7 May 2003 14:34:38 -0000 1.2
@@ -425,7 +425,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.util.template.TemplateLink
+# tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
# tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
#
# Then:
@@ -463,9 +463,9 @@
#
# Defaults: none
-tool.request.link=org.apache.turbine.util.template.TemplateLink
+tool.request.link=org.apache.turbine.services.pull.tools.TemplateLink
tool.request.page=org.apache.turbine.util.template.TemplatePageAttributes
-tool.request.content=org.apache.turbine.util.ContentURI
+tool.request.content=org.apache.turbine.services.pull.tools.ContentTool
tool.request.l10n=org.apache.turbine.services.localization.LocalizationTool
tool.request.flux=org.apache.turbine.flux.tools.FluxTool
1.4 +3 -3 jakarta-turbine-2/xdocs/services/pull-service.xml
Index: pull-service.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/services/pull-service.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pull-service.xml 12 Mar 2003 23:10:41 -0000 1.3
+++ pull-service.xml 7 May 2003 14:34:38 -0000 1.4
@@ -94,7 +94,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.util.template.TemplateLink
+# tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
# tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
#
# (the next two examples specify mythical classes)
@@ -133,9 +133,9 @@
#
# Defaults: none
-tool.request.link=org.apache.turbine.util.template.TemplateLink
+tool.request.link=org.apache.turbine.services.pull.tools.TemplateLink
tool.request.page=org.apache.turbine.util.template.TemplatePageAttributes
-tool.request.content=org.apache.turbine.util.ContentURI
+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
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org