dgraham 2003/07/07 17:30:34
Modified: . build-webapps.xml build.xml
doc/userGuide dev_tiles.xml installation-jetty.xml
configuration.xml project.xml installation.xml
Removed: web/template-example footer.html optional.jsp header.html
next.jsp introduction.jsp optional.html chapter.jsp
more.jsp introduction.html underConstruction.html
chapterTemplate.jsp using.html more.html
underConstruction.jsp sidebar.jsp using.jsp
src/share/org/apache/struts/taglib/template/doc-files
template.gif
web/template-example/graphics layout.gif customTags-1.gif
templates-2.gif jsp_advanced_topics.gif java.gif
templates-1.gif templates-3.gif customTags-3.gif
customTags-5.gif customTags-2.gif customTags-6.gif
templates.gif book.gif templates-4.gif
blueAndWhiteBackground.gif customTags-7.gif
customTags-4.gif templates-5.gif background.gif
src/share/org/apache/struts/taglib/template/util
ContentMap.java Content.java ContentMapStack.java
src/share/org/apache/struts/taglib/template PutTag.java
package.html GetTag.java InsertTag.java
web/template-example/WEB-INF struts-config.xml web.xml
web/template-example/css templates.css
Log:
Removed template taglib.
Revision Changes Path
1.20 +0 -13 jakarta-struts/build-webapps.xml
Index: build-webapps.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-webapps.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build-webapps.xml 19 Jan 2003 00:40:41 -0000 1.19
+++ build-webapps.xml 8 Jul 2003 00:30:33 -0000 1.20
@@ -94,9 +94,6 @@
<ant antfile="build-webapp.xml" target="static">
<property name="webapp.name" value="exercise-taglib"/>
</ant>
- <ant antfile="build-webapp.xml" target="static">
- <property name="webapp.name" value="template-example"/>
- </ant>
<!--ant antfile="build-webapp.xml" target="static">
<property name="webapp.name" value="test"/>
</ant-->
@@ -157,9 +154,6 @@
<ant antfile="build-webapp.xml" target="compile">
<property name="webapp.name" value="exercise-taglib"/>
</ant>
- <ant antfile="build-webapp.xml" target="compile">
- <property name="webapp.name" value="template-example"/>
- </ant>
<!--ant antfile="build-webapp.xml" target="compile">
<property name="webapp.name" value="test"/>
</ant-->
@@ -294,10 +288,6 @@
<property name="webapp.name" value="exercise-taglib"/>
<property name="webapp.war" value="struts-exercise-taglib.war"/>
</ant>
- <ant antfile="build-webapp.xml" target="dist">
- <property name="webapp.name" value="template-example"/>
- <property name="webapp.war" value="struts-template.war"/>
- </ant>
<!--ant antfile="build-webapp.xml" target="dist">
<property name="webapp.name" value="test"/>
<property name="webapp.war" value="struts-test.war"/>
@@ -355,9 +345,6 @@
</ant>
<ant antfile="build-webapp.xml" target="clean">
<property name="webapp.name" value="exercise-taglib"/>
- </ant>
- <ant antfile="build-webapp.xml" target="clean">
- <property name="webapp.name" value="template-example"/>
</ant>
<!--ant antfile="build-webapp.xml" target="clean">
<property name="webapp.name" value="test"/>
1.113 +0 -10 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- build.xml 1 Jul 2003 17:49:25 -0000 1.112
+++ build.xml 8 Jul 2003 00:30:33 -0000 1.113
@@ -505,11 +505,6 @@
<fileset dir="${build.home}/example"/>
</copy>
- <mkdir dir="${catalina.home}/webapps/struts-template"/>
- <copy todir="${catalina.home}/webapps/struts-template">
- <fileset dir="${build.home}/template-example"/>
- </copy>
-
<mkdir dir="${catalina.home}/webapps/struts-exercise-taglib"/>
<copy todir="${catalina.home}/webapps/struts-exercise-taglib">
<fileset dir="${build.home}/exercise-taglib"/>
@@ -716,11 +711,6 @@
<mkdir dir="${tomcat.home}/webapps/struts-example"/>
<copy todir="${tomcat.home}/webapps/struts-example">
<fileset dir="${build.home}/example"/>
- </copy>
-
- <mkdir dir="${tomcat.home}/webapps/struts-template"/>
- <copy todir="${tomcat.home}/webapps/struts-template">
- <fileset dir="${build.home}/template-example"/>
</copy>
<mkdir dir="${tomcat.home}/webapps/struts-exercise-taglib"/>
1.15 +0 -14 jakarta-struts/doc/userGuide/dev_tiles.xml
Index: dev_tiles.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/dev_tiles.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dev_tiles.xml 19 Jun 2003 14:17:53 -0000 1.14
+++ dev_tiles.xml 8 Jul 2003 00:30:33 -0000 1.15
@@ -59,20 +59,6 @@
</li>
<li>
-Templating
-<ul>
-
-<li>
- <strong><em>The Tiles</em></strong> framework is entirely compatible with
<em>Templates</em> (deprecated as for Struts 1.1) defined by David Geary and
implemented in Struts
-</li>
-
-<li>
- You can replace the <em>Templates</em> library with
<strong><em>Tiles</em></strong>
-</li>
-</ul>
-</li>
-
-<li>
Layouts
<ul>
1.4 +0 -11 jakarta-struts/doc/userGuide/installation-jetty.xml
Index: installation-jetty.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/installation-jetty.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- installation-jetty.xml 19 Jan 2003 00:40:41 -0000 1.3
+++ installation-jetty.xml 8 Jul 2003 00:30:33 -0000 1.4
@@ -38,7 +38,6 @@
- %JETTY_HOME%/webapps/struts/struts-documentation.war
- %JETTY_HOME%/webapps/struts/struts-example.war
- %JETTY_HOME%/webapps/struts/struts-exercise-taglib.war
-- %JETTY_HOME%/webapps/struts/struts-template.war
- %JETTY_HOME%/webapps/struts/struts-upload.war
- %JETTY_HOME%/webapps/struts/struts-blank.war
</pre>
@@ -79,16 +78,6 @@
<Arg><SystemProperty name="jetty.home"
default="."/>/etc/webdefault.xml</Arg>
<Arg type="boolean">false</Arg> <!-- if true,
- expand war in temp dir -->
- </Call>
-
- <Call name="addWebApplication">
- <Arg>/struts/struts-template/*</Arg>
- <Arg><SystemProperty name="jetty.home"
- default="."/>/webapps/struts/struts-template.war</Arg>
- <Arg><SystemProperty name="jetty.home"
- default="."/>/etc/webdefault.xml</Arg>
- <Arg type="boolean">true</Arg> <!-- if true,
expand war in temp dir -->
</Call>
1.23 +0 -8 jakarta-struts/doc/userGuide/configuration.xml
Index: configuration.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/configuration.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- configuration.xml 25 Jun 2003 10:26:59 -0000 1.22
+++ configuration.xml 8 Jul 2003 00:30:33 -0000 1.23
@@ -977,7 +977,6 @@
<p>
Next, you must add an entry defining the Struts tag library.
- There are six taglibs included with the Struts distribution.
</p>
<p>
@@ -1003,15 +1002,8 @@
</p>
<p>
- The struts-template taglib contains tags that define a template
- mechanism.
- </p>
-
- <p>
The struts-tiles taglib contains tags used for combining various view
components, called "tiles", into a final composite view.
- This is similar to struts-template in that it's used for view
- composition, but tiles is a more full featured set of tags.
</p>
<p>
1.21 +0 -3 jakarta-struts/doc/userGuide/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 29 Dec 2002 11:45:44 -0000 1.20
+++ project.xml 8 Jul 2003 00:30:33 -0000 1.21
@@ -49,9 +49,6 @@
name="Nested Tags"
href="dev_nested.html"/>
<item
- name="Template Tags"
- href="dev_template.html"/>
- <item
name="Tiles Tags"
href="dev_tiles.html"/>
<item
1.30 +0 -8 jakarta-struts/doc/userGuide/installation.xml
Index: installation.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/installation.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- installation.xml 29 Jun 2003 05:36:42 -0000 1.29
+++ installation.xml 8 Jul 2003 00:30:33 -0000 1.30
@@ -187,8 +187,6 @@
by Struts. It is primarily of use to developers who are enhancing the
Struts custom tag libraries, but may also be useful as simple examples
of the usage of various Struts tags.</li>
- <li><strong>webapps/struts-template.war</strong> - This web application
- both introduces and demonstrates the Struts template tags.</li>
<li><strong>webapps/struts-upload.war</strong> - This web application
is a quick example of uploading files using the Struts framework.
</li>
@@ -238,11 +236,6 @@
<taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
<taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
</taglib>
-
-<taglib>
- <taglib-uri>/WEB-INF/struts-template.tld</taglib-uri>
- <taglib-location>/WEB-INF/struts-template.tld</taglib-location>
-</taglib>
</pre>
<ul>
@@ -258,7 +251,6 @@
<pre><%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-template.tld" prefix="template" %>
</pre>
<ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
