cmlenz 02/01/27 08:06:56
Modified: . Tag: SLIDE_1_0 build.xml
Added: src/taglib Tag: SLIDE_1_0 slide-jstl.tld
src/taglib/jstl/org/apache/slide/taglib/tag/jstl Tag:
SLIDE_1_0 DomainTag.java JstlTagUtils.java
NamespaceTag.java NodeTag.java PropertyTag.java
RevisionTag.java
Log:
port JSTL/EA taglib to SLIDE_1_0 branch
Revision Changes Path
No revision
No revision
1.135.2.2 +47 -2 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.135.2.1
retrieving revision 1.135.2.2
diff -u -r1.135.2.1 -r1.135.2.2
--- build.xml 7 Nov 2001 22:50:42 -0000 1.135.2.1
+++ build.xml 27 Jan 2002 16:06:55 -0000 1.135.2.2
@@ -64,6 +64,9 @@
<property name="struts.home" value="."/>
<property name="struts.jar"
value="${struts.home}/lib/struts.jar"/>
+ <property name="taglibs.home" value="../jakarta-taglibs/dist"/>
+ <property name="taglibs-standard.jar"
+ value="${taglibs.home}/standard/standard.jar"/>
<property name="commons-httpclient.jar"
value="lib/commons-httpclient.jar"/>
<property name="tomcat.build" value="../jakarta-tomcat-4.0/build" />
@@ -184,6 +187,7 @@
<path id="taglib.classpath">
<pathelement location="${servlet.jar}"/>
<pathelement location="${struts.jar}"/>
+ <pathelement location="${taglibs-standard.jar}"/>
<pathelement location="${jta.jar}"/>
<pathelement location="${slide.build}/classes"/>
</path>
@@ -317,6 +321,9 @@
<available property="struts.present"
classname="org.apache.struts.action.Action"
classpath="${struts.jar}" />
+ <available property="jstl.present"
+ classname="org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager"
+ classpath="${taglibs-standard.jar}" />
<available property="jndi.present"
classname="javax.naming.Context"
classpath="${jndi.jar}" />
@@ -358,6 +365,7 @@
<echo message="naming.present (optional) = ${naming.present}" />
<echo message="resources.present (optional) = ${resources.present}" />
<echo message="struts.present (optional) = ${struts.present}" />
+ <echo message="jstl.present (optional) = ${jstl.present}" />
<echo message="--- Property values" />
@@ -379,6 +387,7 @@
<echo message="commons-httpclient.jar=${commons-httpclient.jar}" />
<echo message="tomcat.build=${tomcat.build}" />
<echo message="struts.jar=${struts.jar}" />
+ <echo message="taglibs-standard.jar=${taglibs-standard.jar}" />
<echo message="slide.build=${slide.build}" />
<echo message="slide.dist=${slide.dist}" />
<echo message="webapp.dist=${webapp.dist}" />
@@ -960,6 +969,40 @@
excludes="**/struts/**"/>
</target>
+ <!-- Build JSTL based tag library classes -->
+ <target name="taglib-jstl-compile"
+ depends="taglib-common-compile"
+ if="jstl.present">
+ <echo message="Compiling JSTL based tag library classes..." />
+ <javac srcdir="src/taglib/jstl"
+ destdir="${slide.build}/classes"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ excludes="**/CVS/**,**/package.html">
+ <classpath refid="taglib.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Make JSTL based tag library distribution -->
+ <target name="taglib-jstl-jar"
+ depends="prepare-dist,taglib-jstl-compile"
+ if="jstl.present">
+ <echo message="Building the JSTL based tag library JAR..." />
+ <copy file="src/etc/MANIFEST.MF"
+ tofile="${slide.build}/classes/MANIFEST.MF" />
+ <replace file="${slide.build}/classes/MANIFEST.MF"
+ token="$$VERSION$$" value="${version}" />
+ <jar jarfile="${slide.dist}/slide/lib/slide-taglib-jstl.jar"
+ basedir="${slide.build}/classes"
+ manifest="${slide.build}/classes/MANIFEST.MF"
+ includes="**/taglib/tag/jstl/*.*"
+ excludes="**/bean/*.*,**/tag/*.*,**/struts/*.*">
+ <metainf dir="src/taglib"
+ includes="slide-jstl.tld"/>
+ </jar>
+ </target>
+
<!-- Build Struts based tag library classes -->
<target name="taglib-struts-compile" depends="taglib-common-compile"
if="struts.present">
@@ -987,7 +1030,7 @@
basedir="${slide.build}/classes"
manifest="${slide.build}/classes/MANIFEST.MF"
includes="**/taglib/tag/struts/*.*"
- excludes="**/bean/*.*,**/tag/*.*">
+ excludes="**/bean/*.*,**/tag/*.*,**/jstl/*.*">
<metainf dir="src/taglib"
includes="slide-struts.tld"/>
</jar>
@@ -1006,7 +1049,9 @@
packagenames="org.apache.slide.taglib.*">
<sourcepath>
<pathelement location="src/taglib/common"/>
+ <pathelement location="src/taglib/jstl"/>
<pathelement location="src/taglib/struts"/>
+ <pathelement location="src/taglib/jstl"/>
</sourcepath>
<classpath refid="taglib.classpath"/>
</javadoc>
@@ -1014,7 +1059,7 @@
<!-- Make tag libraries distribution -->
<target name="taglib-dist"
- depends="taglib-common-jar,taglib-struts-jar,taglib-javadoc"
+ depends="taglib-common-jar,taglib-jstl-jar,taglib-struts-jar,taglib-javadoc"
description="Build the Slide tag library JARs">
<copy todir="${slide.dist}/doc/taglib-javadoc">
<fileset dir="${slide.build}/doc/taglib-javadoc" />
No revision
No revision
1.1.2.1 +0 -0 jakarta-slide/src/taglib/slide-jstl.tld
Index: slide-jstl.tld
===================================================================
RCS file: /home/cvs/jakarta-slide/src/taglib/slide-jstl.tld,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.1.2.1 +4 -4
jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/DomainTag.java
Index: DomainTag.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/DomainTag.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- DomainTag.java 27 Jan 2002 15:46:37 -0000 1.1
+++ DomainTag.java 27 Jan 2002 16:06:55 -0000 1.1.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/DomainTag.java,v
1.1 2002/01/27 15:46:37 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/27 15:46:37 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/DomainTag.java,v
1.1.2.1 2002/01/27 16:06:55 cmlenz Exp $
+ * $Revision: 1.1.2.1 $
+ * $Date: 2002/01/27 16:06:55 $
*
* ====================================================================
*
@@ -79,7 +79,7 @@
* stored under, using the 'var' tag attribute.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.1.2.1 $
*/
public class DomainTag
extends DomainTagSupport {
1.1.2.1 +4 -4
jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java
Index: JstlTagUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- JstlTagUtils.java 27 Jan 2002 15:46:37 -0000 1.1
+++ JstlTagUtils.java 27 Jan 2002 16:06:55 -0000 1.1.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java,v
1.1 2002/01/27 15:46:37 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/27 15:46:37 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java,v
1.1.2.1 2002/01/27 16:06:55 cmlenz Exp $
+ * $Revision: 1.1.2.1 $
+ * $Date: 2002/01/27 16:06:55 $
*
* ====================================================================
*
@@ -90,7 +90,7 @@
* tag.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.1.2.1 $
*/
public class JstlTagUtils {
1.1.2.1 +4 -4
jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/NamespaceTag.java
Index: NamespaceTag.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/NamespaceTag.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- NamespaceTag.java 27 Jan 2002 15:46:37 -0000 1.1
+++ NamespaceTag.java 27 Jan 2002 16:06:55 -0000 1.1.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/NamespaceTag.java,v
1.1 2002/01/27 15:46:37 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/27 15:46:37 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/NamespaceTag.java,v
1.1.2.1 2002/01/27 16:06:55 cmlenz Exp $
+ * $Revision: 1.1.2.1 $
+ * $Date: 2002/01/27 16:06:55 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
* Tag class for tags that represent a Slide namespace.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.1.2.1 $
*/
public class NamespaceTag
extends NamespaceTagSupport {
1.1.2.1 +4 -4
jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/NodeTag.java
Index: NodeTag.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/NodeTag.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- NodeTag.java 27 Jan 2002 15:46:37 -0000 1.1
+++ NodeTag.java 27 Jan 2002 16:06:55 -0000 1.1.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/NodeTag.java,v
1.1 2002/01/27 15:46:37 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/27 15:46:37 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/NodeTag.java,v
1.1.2.1 2002/01/27 16:06:55 cmlenz Exp $
+ * $Revision: 1.1.2.1 $
+ * $Date: 2002/01/27 16:06:55 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Tag class for tags that represent a particular node in a Slide namespace.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.1.2.1 $
*/
public class NodeTag
extends NodeTagSupport {
1.1.2.1 +4 -4
jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/PropertyTag.java
Index: PropertyTag.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/PropertyTag.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- PropertyTag.java 27 Jan 2002 15:46:37 -0000 1.1
+++ PropertyTag.java 27 Jan 2002 16:06:55 -0000 1.1.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/PropertyTag.java,v
1.1 2002/01/27 15:46:37 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/27 15:46:37 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/PropertyTag.java,v
1.1.2.1 2002/01/27 16:06:55 cmlenz Exp $
+ * $Revision: 1.1.2.1 $
+ * $Date: 2002/01/27 16:06:55 $
*
* ====================================================================
*
@@ -75,7 +75,7 @@
* Tag class for tags that represent a node property.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.1.2.1 $
*/
public class PropertyTag
extends PropertyTagSupport {
1.1.2.1 +4 -4
jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/RevisionTag.java
Index: RevisionTag.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/RevisionTag.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- RevisionTag.java 27 Jan 2002 15:46:37 -0000 1.1
+++ RevisionTag.java 27 Jan 2002 16:06:55 -0000 1.1.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/RevisionTag.java,v
1.1 2002/01/27 15:46:37 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/27 15:46:37 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/RevisionTag.java,v
1.1.2.1 2002/01/27 16:06:55 cmlenz Exp $
+ * $Revision: 1.1.2.1 $
+ * $Date: 2002/01/27 16:06:55 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Tag class for tags that represent a revision of a node.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.1.2.1 $
*/
public class RevisionTag
extends RevisionTagSupport {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
