Author: snoopdave
Date: Thu Mar 9 12:18:02 2006
New Revision: 384598
URL: http://svn.apache.org/viewcvs?rev=384598&view=rev
Log:
Moving to Servlet 2.4 and JSTL 1.1, fixes ROL-873
Removed:
incubator/roller/trunk/tools/standard-1.0.3/
Modified:
incubator/roller/trunk/build.sh
incubator/roller/trunk/properties.xmlf
incubator/roller/trunk/web/taglibs.jsp
Modified: incubator/roller/trunk/build.sh
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/build.sh?rev=384598&r1=384597&r2=384598&view=diff
==============================================================================
--- incubator/roller/trunk/build.sh (original)
+++ incubator/roller/trunk/build.sh Thu Mar 9 12:18:02 2006
@@ -13,4 +13,5 @@
rocp=${rocp}:./tools/buildtime/ant-1.6.2/jakarta-oro-2.0.8.jar
rocp=${rocp}:./tools/buildtime/junit-3.8.1.jar
-${JAVA_HOME}/bin/java -Xmx300m -Djava.home=${JAVA_HOME} -classpath ${rocp}
org.apache.tools.ant.Main $1 $2 $3 $4 $5
+${JAVA_HOME}/bin/java -Xmx512m -Djava.home=${JAVA_HOME} -classpath ${rocp}
org.apache.tools.ant.Main $1 $2 $3 $4 $5
+
Modified: incubator/roller/trunk/properties.xmlf
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/properties.xmlf?rev=384598&r1=384597&r2=384598&view=diff
==============================================================================
--- incubator/roller/trunk/properties.xmlf (original)
+++ incubator/roller/trunk/properties.xmlf Thu Mar 9 12:18:02 2006
@@ -16,9 +16,9 @@
<property name="tools.struts" value="${ro.tools}/struts-1.2.4" />
<property name="tools.hibernate" value="${ro.tools}/hibernate-3.0" />
<property name="tools.spring" value="${ro.tools}/spring-1.2" />
-<property name="tools.jstl" value="${ro.tools}/standard-1.0.3" />
-<property name="tools.xdoclet" value="${ro.tools}/buildtime/xdoclet-1.2.3"
/>
-<property name="tools.tomcat" value="${ro.tools}/buildtime/tomcat-5.0.28"
/>
+<property name="tools.jstl"
value="${ro.tools}/jakarta-taglibs-standard-1.1.2" />
+<property name="tools.xdoclet"
value="${ro.tools}/buildtime/xdoclet-1.2.3" />
+<property name="tools.tomcat"
value="${ro.tools}/buildtime/tomcat-5.0.28" />
<!--
If you would like Ant to copy all the jar files that Resin needs
@@ -81,11 +81,14 @@
<include name="mail.jar"/>
</fileset>
-<fileset id="jstl.jars" dir="${ro.tools}/standard-1.0.3/lib">
+<fileset id="jstl.jars" dir="${tools.jstl}/lib">
<include name="jstl.jar"/>
<include name="standard.jar"/>
+
+ <!-- There were in JSTL 1, but gone from 1.1
<include name="saxpath.jar"/>
<include name="jaxen-full.jar"/>
+ -->
</fileset>
<fileset id="hibernate.jar" dir="${tools.hibernate}">
Modified: incubator/roller/trunk/web/taglibs.jsp
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/taglibs.jsp?rev=384598&r1=384597&r2=384598&view=diff
==============================================================================
--- incubator/roller/trunk/web/taglibs.jsp (original)
+++ incubator/roller/trunk/web/taglibs.jsp Thu Mar 9 12:18:02 2006
@@ -1,11 +1,11 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt"; prefix="fmt" %>
-<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
-<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %>
-<%@ taglib uri="http://struts.apache.org/tags-logic"; prefix="logic" %>
-<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic"; prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.0.1"; prefix="str" %>
<%@ taglib uri="http://www.rollerweblogger.org/tags"; prefix="roller" %>
