svn commit: r1293651 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Sat Feb 25 17:14:47 2012 New Revision: 1293651 URL: http://svn.apache.org/viewvc?rev=1293651&view=rev Log: update to latest Apache pom Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1293651&r1=1293650&r2=1293651&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sat Feb 25 17:14:47 2012 @@ -23,7 +23,7 @@ org.apache apache -9 +10 org.apache.taglibs - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1293655 - /tomcat/taglibs/standard/trunk/
Author: jboynes Date: Sat Feb 25 17:49:16 2012 New Revision: 1293655 URL: http://svn.apache.org/viewvc?rev=1293655&view=rev Log: ignore IDEA directories as well as module files Modified: tomcat/taglibs/standard/trunk/ (props changed) Propchange: tomcat/taglibs/standard/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sat Feb 25 17:49:16 2012 @@ -1,3 +1,4 @@ -*.iml target +.idea +*.iml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1293675 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Sat Feb 25 20:10:37 2012 New Revision: 1293675 URL: http://svn.apache.org/viewvc?rev=1293675&view=rev Log: [maven-release-plugin] prepare release taglibs-parent-1 Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1293675&r1=1293674&r2=1293675&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sat Feb 25 20:10:37 2012 @@ -15,10 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 org.apache @@ -28,7 +25,7 @@ org.apache.taglibs taglibs-parent - 1-SNAPSHOT + 1 Apache Taglibs Parent pom @@ -47,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk - scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk -http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk + scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-1 + scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-1 + http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1293677 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Sat Feb 25 20:10:40 2012 New Revision: 1293677 URL: http://svn.apache.org/viewvc?rev=1293677&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1293677&r1=1293676&r2=1293677&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sat Feb 25 20:10:40 2012 @@ -25,7 +25,7 @@ org.apache.taglibs taglibs-parent - 1 + 2-SNAPSHOT Apache Taglibs Parent pom @@ -44,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-1 - scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-1 - http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-1 + scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk + scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk +http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1293676 - /tomcat/taglibs/taglibs-parent/tags/taglibs-parent-1/
Author: jboynes Date: Sat Feb 25 20:10:39 2012 New Revision: 1293676 URL: http://svn.apache.org/viewvc?rev=1293676&view=rev Log: [maven-release-plugin] copy for tag taglibs-parent-1 Added: tomcat/taglibs/taglibs-parent/tags/taglibs-parent-1/ - copied from r1293675, tomcat/taglibs/taglibs-parent/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1294943 - in /tomcat/taglibs/taglibs-parent/trunk: LICENSE.txt NOTICE.txt
Author: jboynes Date: Wed Feb 29 02:19:53 2012 New Revision: 1294943 URL: http://svn.apache.org/viewvc?rev=1294943&view=rev Log: remove LICENCE.txt and NOTICE.txt as they are automatically added by Maven release process Removed: tomcat/taglibs/taglibs-parent/trunk/LICENSE.txt tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1295193 - in /tomcat/taglibs/taglibs-parent/trunk: LICENSE.txt NOTICE.txt
Author: jboynes Date: Wed Feb 29 18:04:45 2012 New Revision: 1295193 URL: http://svn.apache.org/viewvc?rev=1295193&view=rev Log: reverting r1294943 Added: tomcat/taglibs/taglibs-parent/trunk/LICENSE.txt - copied unchanged from r1294942, tomcat/taglibs/taglibs-parent/trunk/LICENSE.txt tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt - copied unchanged from r1294942, tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1302235 - in /tomcat/taglibs/taglibs-parent/trunk: LICENSE LICENSE.txt NOTICE NOTICE.txt
Author: jboynes Date: Sun Mar 18 22:09:48 2012 New Revision: 1302235 URL: http://svn.apache.org/viewvc?rev=1302235&view=rev Log: remove extension from LICENSE and NOTICE Added: tomcat/taglibs/taglibs-parent/trunk/LICENSE - copied unchanged from r1302138, tomcat/taglibs/taglibs-parent/trunk/LICENSE.txt tomcat/taglibs/taglibs-parent/trunk/NOTICE - copied unchanged from r1302138, tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt Removed: tomcat/taglibs/taglibs-parent/trunk/LICENSE.txt tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1302239 - /tomcat/taglibs/standard/trunk/pom.xml
Author: jboynes Date: Sun Mar 18 22:28:29 2012 New Revision: 1302239 URL: http://svn.apache.org/viewvc?rev=1302239&view=rev Log: remove relative path now we have a published parent pom Modified: tomcat/taglibs/standard/trunk/pom.xml Modified: tomcat/taglibs/standard/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/pom.xml?rev=1302239&r1=1302238&r2=1302239&view=diff == --- tomcat/taglibs/standard/trunk/pom.xml (original) +++ tomcat/taglibs/standard/trunk/pom.xml Sun Mar 18 22:28:29 2012 @@ -28,7 +28,6 @@ org.apache.taglibs taglibs-parent 1 -../taglibs-parent/pom.xml pom - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1302241 - in /tomcat/taglibs/standard/trunk: LICENSE LICENSE.txt NOTICE NOTICE.txt compat/LICENSE.txt compat/NOTICE.txt impl/LICENSE.txt impl/NOTICE.txt jstlel/LICENSE.txt jstlel/NOTICE.t
Author: jboynes Date: Sun Mar 18 22:32:13 2012 New Revision: 1302241 URL: http://svn.apache.org/viewvc?rev=1302241&view=rev Log: rename trunk level license files and remove from modules Added: tomcat/taglibs/standard/trunk/LICENSE - copied unchanged from r1302235, tomcat/taglibs/standard/trunk/LICENSE.txt tomcat/taglibs/standard/trunk/NOTICE - copied unchanged from r1302235, tomcat/taglibs/standard/trunk/NOTICE.txt Removed: tomcat/taglibs/standard/trunk/LICENSE.txt tomcat/taglibs/standard/trunk/NOTICE.txt tomcat/taglibs/standard/trunk/compat/LICENSE.txt tomcat/taglibs/standard/trunk/compat/NOTICE.txt tomcat/taglibs/standard/trunk/impl/LICENSE.txt tomcat/taglibs/standard/trunk/impl/NOTICE.txt tomcat/taglibs/standard/trunk/jstlel/LICENSE.txt tomcat/taglibs/standard/trunk/jstlel/NOTICE.txt tomcat/taglibs/standard/trunk/spec/LICENSE.txt tomcat/taglibs/standard/trunk/spec/NOTICE.txt - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1302245 - /tomcat/taglibs/extended/trunk/pom.xml
Author: jboynes Date: Sun Mar 18 22:46:11 2012 New Revision: 1302245 URL: http://svn.apache.org/viewvc?rev=1302245&view=rev Log: switch extended to using released parent pom Modified: tomcat/taglibs/extended/trunk/pom.xml Modified: tomcat/taglibs/extended/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/extended/trunk/pom.xml?rev=1302245&r1=1302244&r2=1302245&view=diff == --- tomcat/taglibs/extended/trunk/pom.xml (original) +++ tomcat/taglibs/extended/trunk/pom.xml Sun Mar 18 22:46:11 2012 @@ -23,8 +23,7 @@ org.apache.taglibs taglibs-parent -1-SNAPSHOT -../taglibs-parent/pom.xml +1 taglibs-extended - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1302246 - /tomcat/taglibs/rdc/trunk/pom.xml
Author: jboynes Date: Sun Mar 18 22:48:10 2012 New Revision: 1302246 URL: http://svn.apache.org/viewvc?rev=1302246&view=rev Log: switch rdc to using released parent pom Modified: tomcat/taglibs/rdc/trunk/pom.xml Modified: tomcat/taglibs/rdc/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/pom.xml?rev=1302246&r1=1302245&r2=1302246&view=diff == --- tomcat/taglibs/rdc/trunk/pom.xml (original) +++ tomcat/taglibs/rdc/trunk/pom.xml Sun Mar 18 22:48:10 2012 @@ -23,8 +23,7 @@ org.apache.taglibs taglibs-parent -1-SNAPSHOT -../taglibs-parent/pom.xml +1 taglibs-rdc-parent - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304808 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Sat Mar 24 14:28:56 2012 New Revision: 1304808 URL: http://svn.apache.org/viewvc?rev=1304808&view=rev Log: [maven-release-plugin] prepare release taglibs-parent-2 Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1304808&r1=1304807&r2=1304808&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sat Mar 24 14:28:56 2012 @@ -25,7 +25,7 @@ org.apache.taglibs taglibs-parent - 2-SNAPSHOT + 2 Apache Taglibs Parent pom @@ -52,9 +52,9 @@ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk - scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk -http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk + scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2 + scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2 + http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304809 - /tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2/
Author: jboynes Date: Sat Mar 24 14:28:58 2012 New Revision: 1304809 URL: http://svn.apache.org/viewvc?rev=1304809&view=rev Log: [maven-release-plugin] copy for tag taglibs-parent-2 Added: tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2/ - copied from r1304808, tomcat/taglibs/taglibs-parent/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304810 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Sat Mar 24 14:28:59 2012 New Revision: 1304810 URL: http://svn.apache.org/viewvc?rev=1304810&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1304810&r1=1304809&r2=1304810&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sat Mar 24 14:28:59 2012 @@ -25,7 +25,7 @@ org.apache.taglibs taglibs-parent - 2 + 3-SNAPSHOT Apache Taglibs Parent pom @@ -52,9 +52,9 @@ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2 - scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2 - http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2 + scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk + scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk +http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304812 - /tomcat/taglibs/site/pom.xml
Author: jboynes Date: Sat Mar 24 14:48:09 2012 New Revision: 1304812 URL: http://svn.apache.org/viewvc?rev=1304812&view=rev Log: update site after staging release 2 of parent Modified: tomcat/taglibs/site/pom.xml Modified: tomcat/taglibs/site/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/pom.xml?rev=1304812&r1=1304811&r2=1304812&view=diff == --- tomcat/taglibs/site/pom.xml (original) +++ tomcat/taglibs/site/pom.xml Sat Mar 24 14:48:09 2012 @@ -23,7 +23,7 @@ org.apache.taglibs taglibs-parent -2-SNAPSHOT +3-SNAPSHOT ../taglibs-parent/pom.xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305219 - /tomcat/taglibs/taglibs-parent/trunk/NOTICE
Author: jboynes Date: Mon Mar 26 04:46:06 2012 New Revision: 1305219 URL: http://svn.apache.org/viewvc?rev=1305219&view=rev Log: update NOTICE to match inception date Modified: tomcat/taglibs/taglibs-parent/trunk/NOTICE Modified: tomcat/taglibs/taglibs-parent/trunk/NOTICE URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/NOTICE?rev=1305219&r1=1305218&r2=1305219&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/NOTICE (original) +++ tomcat/taglibs/taglibs-parent/trunk/NOTICE Mon Mar 26 04:46:06 2012 @@ -1,5 +1,5 @@ Apache Tomcat Taglib Parent -Copyright 2009-2012 The Apache Software Foundation +Copyright 2000-2012 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305220 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Mon Mar 26 04:54:42 2012 New Revision: 1305220 URL: http://svn.apache.org/viewvc?rev=1305220&view=rev Log: [maven-release-plugin] prepare release taglibs-parent-3 Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1305220&r1=1305219&r2=1305220&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Mon Mar 26 04:54:42 2012 @@ -25,7 +25,7 @@ org.apache.taglibs taglibs-parent - 3-SNAPSHOT + 3 Apache Taglibs Parent pom @@ -52,9 +52,9 @@ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk - scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk -http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk + scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3 + scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3 + http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305221 - /tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3/
Author: jboynes Date: Mon Mar 26 04:54:45 2012 New Revision: 1305221 URL: http://svn.apache.org/viewvc?rev=1305221&view=rev Log: [maven-release-plugin] copy for tag taglibs-parent-3 Added: tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3/ - copied from r1305220, tomcat/taglibs/taglibs-parent/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305222 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Mon Mar 26 04:54:46 2012 New Revision: 1305222 URL: http://svn.apache.org/viewvc?rev=1305222&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1305222&r1=1305221&r2=1305222&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Mon Mar 26 04:54:46 2012 @@ -25,7 +25,7 @@ org.apache.taglibs taglibs-parent - 3 + 4-SNAPSHOT Apache Taglibs Parent pom @@ -52,9 +52,9 @@ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3 - scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3 - http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3 + scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk + scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk +http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305224 - /tomcat/taglibs/site/pom.xml
Author: jboynes Date: Mon Mar 26 04:59:55 2012 New Revision: 1305224 URL: http://svn.apache.org/viewvc?rev=1305224&view=rev Log: update to use new parent POM version Modified: tomcat/taglibs/site/pom.xml Modified: tomcat/taglibs/site/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/pom.xml?rev=1305224&r1=1305223&r2=1305224&view=diff == --- tomcat/taglibs/site/pom.xml (original) +++ tomcat/taglibs/site/pom.xml Mon Mar 26 04:59:55 2012 @@ -23,7 +23,7 @@ org.apache.taglibs taglibs-parent -3-SNAPSHOT +4-SNAPSHOT ../taglibs-parent/pom.xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1307680 - /tomcat/taglibs/standard/trunk/pom.xml
Author: jboynes Date: Sat Mar 31 01:16:01 2012 New Revision: 1307680 URL: http://svn.apache.org/viewvc?rev=1307680&view=rev Log: update standard to use released parent pom Modified: tomcat/taglibs/standard/trunk/pom.xml Modified: tomcat/taglibs/standard/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/pom.xml?rev=1307680&r1=1307679&r2=1307680&view=diff == --- tomcat/taglibs/standard/trunk/pom.xml (original) +++ tomcat/taglibs/standard/trunk/pom.xml Sat Mar 31 01:16:01 2012 @@ -27,7 +27,7 @@ org.apache.taglibs taglibs-parent -1 +3 pom - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1307701 - in /tomcat/taglibs/standard/trunk: build-tools/pom.xml compat/pom.xml impl/pom.xml jstlel/pom.xml spec/pom.xml
Author: jboynes Date: Sat Mar 31 02:35:49 2012 New Revision: 1307701 URL: http://svn.apache.org/viewvc?rev=1307701&view=rev Log: start cleaning up site prior to release shorten module names so they fit in the site menu Modified: tomcat/taglibs/standard/trunk/build-tools/pom.xml tomcat/taglibs/standard/trunk/compat/pom.xml tomcat/taglibs/standard/trunk/impl/pom.xml tomcat/taglibs/standard/trunk/jstlel/pom.xml tomcat/taglibs/standard/trunk/spec/pom.xml Modified: tomcat/taglibs/standard/trunk/build-tools/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/build-tools/pom.xml?rev=1307701&r1=1307700&r2=1307701&view=diff == --- tomcat/taglibs/standard/trunk/build-tools/pom.xml (original) +++ tomcat/taglibs/standard/trunk/build-tools/pom.xml Sat Mar 31 02:35:49 2012 @@ -32,7 +32,7 @@ taglibs-build-tools 1.2-SNAPSHOT -Apache Standard Taglib - Build Tools +Build Tools Build tool settings common to all Standard Taglib modules Modified: tomcat/taglibs/standard/trunk/compat/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1307701&r1=1307700&r2=1307701&view=diff == --- tomcat/taglibs/standard/trunk/compat/pom.xml (original) +++ tomcat/taglibs/standard/trunk/compat/pom.xml Sat Mar 31 02:35:49 2012 @@ -34,15 +34,13 @@ 1.2-SNAPSHOT bundle -Apache Standard Taglib - JSTL 1.0 Compatibility +JSTL 1.0 Compatibility 2001 -An implementation of the JSP Standard Tag Library (JSTL). +Supports JSTL 1.0 tags using the Servlet container's EL implementation. -http://tomcat.apache.org/taglibs/standard/ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat @@ -51,51 +49,23 @@ - -Pierre Delisle - - -Shawn Bayern - - -Nathan Abramson - - -Hans Bergsten - - -Scott Hasse - - -Justyna Horwat - - -Mark Kolb - - -Jan Luehe - - -Glenn Nielsen - - -Dmitri Plotnikov - - -Felipe Leme - - -Henri Yandell - - -Bjorn Townsend - +Pierre Delisle +Shawn Bayern +Nathan Abramson +Hans Bergsten +Scott Hasse +Justyna Horwat +Mark Kolb +Jan Luehe +Glenn Nielsen +Dmitri Plotnikov +Felipe Leme +Henri Yandell +Bjorn Townsend - -Robert Goff - +Robert Goff Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1307701&r1=1307700&r2=1307701&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Sat Mar 31 02:35:49 2012 @@ -34,15 +34,13 @@ 1.2-SNAPSHOT bundle -Apache Standard Taglib - JSTL Implementation +JSTL Implementation 2001 An implementation of the JSP Standard Tag Library (JSTL). -http://tomcat.apache.org/taglibs/standard/ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/impl scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/impl @@ -51,51 +49,23 @@ - -Pierre Delisle - - -Shawn Bayern - - -Nathan Abramson - - -Hans Bergsten - - -Scott Hasse - - -Justyna Horwat - - -Mark Kolb - - -Jan Luehe - - -Glenn Nielsen - - -Dmitri Plotnikov - - -Felipe Leme - - -Henri Yandell - - -Bjorn Townsend - +Pierre Delisle +Shawn Bayern +Nathan Abramson +Hans Bergsten +Scott Hasse +Justyna Horwat +Mark Kolb +Jan Luehe +Glenn Nielsen +Dmitri Plotnikov +Felipe Leme +Henri Yandell +Bjorn Townsend - -Robert Goff - +Robert Goff Modified: tomcat/taglibs/standard/trunk/jstlel/pom.
svn commit: r1307820 - /tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml
Author: jboynes Date: Sat Mar 31 15:00:22 2012 New Revision: 1307820 URL: http://svn.apache.org/viewvc?rev=1307820&view=rev Log: update spec reference to Oracle's site indicate this library is not yet release but the spec is approved Modified: tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml Modified: tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml?rev=1307820&r1=1307819&r2=1307820&view=diff == --- tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml (original) +++ tomcat/taglibs/standard/trunk/src/site/xdoc/index.xml Sat Mar 31 15:00:22 2012 @@ -27,7 +27,7 @@ JSP(tm) Standard Tag Library implementations Apache hosts the Apache Standard Taglib, an implementation of - the http://java.sun.com/products/jsp/jstl";>JSP Standard Tag + the http://www.oracle.com/technetwork/java/jstl-137486.html";>JSP Standard Tag Library (JSTL) specification. Various versions are available. @@ -39,8 +39,8 @@ Getting the Taglib -Standard 1.2 -JSTL 1.2 (not yet JCP approved) +Standard 1.2 (not yet released) +JSTL 1.2 Servlet 2.5, JavaServer Pages 2.1 http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/";>svn - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1330303 - /tomcat/taglibs/standard/trunk/pom.xml
Author: jboynes
Date: Wed Apr 25 14:19:04 2012
New Revision: 1330303
URL: http://svn.apache.org/viewvc?rev=1330303&view=rev
Log:
update site and ci locations
Modified:
tomcat/taglibs/standard/trunk/pom.xml
Modified: tomcat/taglibs/standard/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/pom.xml?rev=1330303&r1=1330302&r2=1330303&view=diff
==
--- tomcat/taglibs/standard/trunk/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/pom.xml Wed Apr 25 14:19:04 2012
@@ -41,7 +41,7 @@
An implementation of the JSP Standard Tag Library (JSTL).
- http://tomcat.apache.org/taglibs/standard/
+ http://tomcat.apache.org/taglibs/standard-${project.version}
scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk
@@ -53,10 +53,15 @@
apache.website
Apache Website
-
scpexe://people.apache.org/www/tomcat.apache.org/taglibs/standard/
+
scpexe://people.apache.org/www/tomcat.apache.org/taglibs/standard-${project.version}/
+
+jenkins
+https://builds.apache.org/job/taglib-standard/
+
+
Pierre Delisle
Shawn Bayern
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r962608 - /tomcat/taglibs/standard/trunk/standard-test/pom.xml
Author: jboynes Date: Fri Jul 9 16:45:27 2010 New Revision: 962608 URL: http://svn.apache.org/viewvc?rev=962608&view=rev Log: attach cactifywar goal to pre-integration phase to allow Gump to run package Modified: tomcat/taglibs/standard/trunk/standard-test/pom.xml Modified: tomcat/taglibs/standard/trunk/standard-test/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/standard-test/pom.xml?rev=962608&r1=962607&r2=962608&view=diff == --- tomcat/taglibs/standard/trunk/standard-test/pom.xml (original) +++ tomcat/taglibs/standard/trunk/standard-test/pom.xml Fri Jul 9 16:45:27 2010 @@ -154,7 +154,7 @@ cactus-cactifywar -package +pre-integration-test cactifywar - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1003878 - /tomcat/taglibs/standard/trunk/impl/pom.xml
Author: jboynes Date: Sat Oct 2 20:33:17 2010 New Revision: 1003878 URL: http://svn.apache.org/viewvc?rev=1003878&view=rev Log: add TLD files into the output jar Modified: tomcat/taglibs/standard/trunk/impl/pom.xml Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1003878&r1=1003877&r2=1003878&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Sat Oct 2 20:33:17 2010 @@ -134,6 +134,10 @@ **/*.properties + +src/main/resources/META-INF/tlds +META-INF + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1003898 - /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
Author: jboynes
Date: Sat Oct 2 22:02:37 2010
New Revision: 1003898
URL: http://svn.apache.org/viewvc?rev=1003898&view=rev
Log:
whitespace police
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java?rev=1003898&r1=1003897&r2=1003898&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
Sat Oct 2 22:02:37 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.tag.common.xml;
@@ -23,7 +23,6 @@ import java.io.Reader;
import java.io.StringReader;
import java.io.Writer;
import java.util.List;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspTagException;
@@ -66,37 +65,37 @@ public abstract class TransformSupport e
//*
// Protected state
-protected Object xml; // attribute
-protected String xmlSystemId; // attribute
-protected Object xslt; // attribute
-protected String xsltSystemId; // attribute
-protected Result result; // attribute
+protected Object xml; // attribute
+protected String xmlSystemId; // attribute
+protected Object xslt; // attribute
+protected String xsltSystemId; // attribute
+protected Result result;// attribute
//*
// Private state
-private String var;// 'var' attribute
-private int scope;// processed 'scope' attr
-private Transformer t;// actual Transformer
-private TransformerFactory tf;// reusable factory
-private DocumentBuilder db; // reusable factory
-private DocumentBuilderFactory dbf; // reusable factory
+private String var; // 'var' attribute
+private int scope; // processed 'scope' attr
+private Transformer t; // actual Transformer
+private TransformerFactory tf; // reusable factory
+private DocumentBuilder db; // reusable factory
+private DocumentBuilderFactory dbf; // reusable factory
//*
// Constructor and initialization
public TransformSupport() {
- super();
- init();
+super();
+init();
}
private void init() {
- xml = xslt = null;
- xmlSystemId = xsltSystemId = null;
- var = null;
- result = null;
- tf = null;
+xml = xslt = null;
+xmlSystemId = xsltSystemId = null;
+var = null;
+result = null;
+tf = null;
scope = PageContext.PAGE_SCOPE;
}
@@ -105,121 +104,125 @@ public abstract class TransformSupport e
// Tag logic
public int doStartTag() throws JspException {
- /*
- * We can set up our Transformer here, so we do so, and we let
- * it receive parameters directly from subtags (instead of
- * caching them.
- */
- try {
-
- //
- // Initialize
-
- // set up our DocumentBuilderFactory if necessary
- if (dbf == null) {
- dbf = DocumentBuilderFactory.newInstance();
-dbf.setNamespaceAware(true);
-dbf.setValidating(false);
- }
-if (db == null)
- db = dbf.newDocumentBuilder();
-
- // set up the TransformerFactory if necessary
-if (tf == null)
-tf = TransformerFactory.newInstance();
-
- //
- // Produce transformer
-
- Source s;
- if (xslt != null) {
- if (!(xslt instanceof String) && !(xslt instanceof Reader)
-&& !(xslt instanceof javax.xml.transform.Source))
- throw new JspTagException(
- Resources.getMessage("
svn commit: r1004032 - in /tomcat/taglibs/standard/trunk/impl: ./ src/main/java/org/apache/taglibs/standard/resources/ src/main/java/org/apache/taglibs/standard/tag/common/xml/ src/main/java/org/apach
Author: jboynes
Date: Sun Oct 3 19:46:54 2010
New Revision: 1004032
URL: http://svn.apache.org/viewvc?rev=1004032&view=rev
Log:
refactor transform tag and add more parameter validation
Added:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/TestTransformSupport.java
Modified:
tomcat/taglibs/standard/trunk/impl/pom.xml
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.properties
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/el/xml/TransformTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java
Modified: tomcat/taglibs/standard/trunk/impl/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1004032&r1=1004031&r2=1004032&view=diff
==
--- tomcat/taglibs/standard/trunk/impl/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/impl/pom.xml Sun Oct 3 19:46:54 2010
@@ -157,6 +157,7 @@
org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTests.java
org/apache/taglibs/standard/TestVersion.java
org/apache/taglibs/standard/tag/common/core/TestSetSupport.java
+
org/apache/taglibs/standard/tag/common/xml/TestTransformSupport.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.properties
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.properties?rev=1004032&r1=1004031&r2=1004032&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.properties
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.properties
Sun Oct 3 19:46:54 2010
@@ -235,17 +235,35 @@ PARSE_NO_SAXTRANSFORMER=\
Filter supplied to <parse>, but default TransformerFactory \
does not support SAX.
-TRANSFORM_NO_TRANSFORMER=\
-<transform> was not passed an XSLT stylesheet
+TRANSFORM_XSLT_IS_NULL=\
+<transform> 'xslt' attribute must not be null
-TRANSFORM_SOURCE_INVALID_LIST=\
-<transform> encountered an invalid java.util.List while processing
'xml' attribute. This error is typically caused if you pass a node-set with
more than one node to <transform>'s 'xml' attribute.
+TRANSFORM_XSLT_IS_EMPTY=\
+<transform> 'xslt' attribute must not be an empty String
-TRANSFORM_SOURCE_UNRECOGNIZED=\
-<transform> encountered an unknown type while processing 'xml'
attribute
+TRANSFORM_XSLT_UNSUPPORTED_TYPE=\
+<transform> 'xslt' attribute was of an unsupported type: {0}
-TRANSFORM_XSLT_UNRECOGNIZED=\
-<transform> encountered an unknown type while processing 'xslt'
attribute
+TRANSFORM_XML_IS_NULL=\
+<transform> 'xml' or 'doc' attribute must not be null
+
+TRANSFORM_XML_IS_EMPTY=\
+<transform> 'xml' or 'doc' attribute must not be an empty String
+
+TRANSFORM_XML_LIST_SIZE=\
+<transform> 'xml' or 'doc' attribute of List type may only contain 1
element
+
+TRANSFORM_XML_UNSUPPORTED_TYPE=\
+<transform> 'xml' or 'doc' attribute was of an unsupported type: {0}
+
+TRANSFORM_BODY_IS_NULL=\
+<transform> body content was null
+
+TRANSFORM_BODY_CONTENT_IS_NULL=\
+<transform> body content value was null
+
+TRANSFORM_BODY_IS_EMPTY=\
+<transform> body content evaluated to an empty String
UNABLE_TO_RESOLVE_ENTITY=\
Could not resolve entity reference: "{0}"
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java?rev=1004032&r1=1004031&r2=1004032&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
Sun Oct 3 19:46:54 2010
@@ -66,6 +66,7 @@ public
svn commit: r1004049 - /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
Author: jboynes
Date: Sun Oct 3 20:57:49 2010
New Revision: 1004049
URL: http://svn.apache.org/viewvc?rev=1004049&view=rev
Log:
allow for the case where ServletExceptions might be nested
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java?rev=1004049&r1=1004048&r2=1004049&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
Sun Oct 3 20:57:49 2010
@@ -306,6 +306,9 @@ public abstract class ImportSupport exte
throw new JspException(ex);
} catch (ServletException ex) {
Throwable rc = ex.getRootCause();
+while (rc instanceof ServletException) {
+rc = ((ServletException) rc).getRootCause();
+}
if (rc == null)
throw new JspException(ex);
else
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1005686 - /tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/TestFunctions.java
Author: jboynes
Date: Fri Oct 8 00:52:27 2010
New Revision: 1005686
URL: http://svn.apache.org/viewvc?rev=1005686&view=rev
Log:
add test for bug #50057
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/TestFunctions.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/TestFunctions.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/TestFunctions.java?rev=1005686&r1=1005685&r2=1005686&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/TestFunctions.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/TestFunctions.java
Fri Oct 8 00:52:27 2010
@@ -30,6 +30,11 @@ import static org.apache.taglibs.standar
public class TestFunctions {
@Test
+public void testEndsWith() {
+Assert.assertTrue(endsWith("00", "0")); // verify bug 50057 was fixed
+}
+
+@Test
public void testSubstring() {
Assert.assertEquals("el", substring("Hello", 1, 3));
Assert.assertEquals("", substring("Hello", 10, 0));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1005692 - in /tomcat/taglibs/standard/trunk/impl: ./ src/main/java/org/apache/taglibs/standard/resources/ src/test/java/org/apache/taglibs/standard/resources/
Author: jboynes
Date: Fri Oct 8 01:20:19 2010
New Revision: 1005692
URL: http://svn.apache.org/viewvc?rev=1005692&view=rev
Log:
refactor Resources to use varargs
Added:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/resources/
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/resources/TestResources.java
Modified:
tomcat/taglibs/standard/trunk/impl/pom.xml
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.properties
Modified: tomcat/taglibs/standard/trunk/impl/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1005692&r1=1005691&r2=1005692&view=diff
==
--- tomcat/taglibs/standard/trunk/impl/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/impl/pom.xml Fri Oct 8 01:20:19 2010
@@ -156,6 +156,7 @@
org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTests.java
org/apache/taglibs/standard/TestVersion.java
+
org/apache/taglibs/standard/resources/TestResources.java
org/apache/taglibs/standard/tag/common/core/TestSetSupport.java
org/apache/taglibs/standard/tag/common/xml/TestTransformSupport.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.java?rev=1005692&r1=1005691&r2=1005692&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.java
Fri Oct 8 01:20:19 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.resources;
@@ -24,104 +24,54 @@ import java.util.ResourceBundle;
/**
* Provides locale-neutral access to string resources. Only the
* documentation and code are in English. :-)
- *
+ *
* The major goal, aside from globalization, is convenience.
* Access to resources with no parameters is made in the form:
*
* Resources.getMessage(MESSAGE_NAME);
*
- *
+ *
* Access to resources with one parameter works like
*
* Resources.getMessage(MESSAGE_NAME, arg1);
*
- *
+ *
* ... and so on.
*
* @author Shawn Bayern
*/
public class Resources {
-//*
-// Static data
-
-/** The location of our resources. */
-private static final String RESOURCE_LOCATION
- = "org.apache.taglibs.standard.resources.Resources";
-
-/** Our class-wide ResourceBundle. */
-private static ResourceBundle rb =
- ResourceBundle.getBundle(RESOURCE_LOCATION);
+/**
+ * Our class-wide ResourceBundle.
+ */
+private static final ResourceBundle rb =
ResourceBundle.getBundle(Resources.class.getName());
//*
// Public static methods
-/** Retrieves a message with no arguments. */
-public static String getMessage(String name)
- throws MissingResourceException {
- return rb.getString(name);
+/**
+ * Retrieves a message with no arguments.
+ *
+ * @param name the name of the message
+ * @return the localized message text
+ * @throws MissingResourceException if the message does not exist
+ */
+public static String getMessage(String name) throws
MissingResourceException {
+return rb.getString(name);
+}
+
+/**
+ * Retrieves a message with arbitrarily many arguments.
+ *
+ * @param name the name of the message
+ * @param aarguments to be substituted into the message text
+ * @return the localized message text
+ * @throws MissingResourceException if the message does not exist
+ */
+public static String getMessage(String name, Object... a) throws
MissingResourceException {
+String res = rb.getString(name);
+return MessageFormat.format(res, a);
}
-
-/** Retrieves a message with arbitrarily many arguments. */
-public static String getMessage(String name, Object[] a)
- throws MissingResourceException {
- String res = rb.getString(name);
- return MessageFormat.format(res, a);
-}
-
-/** Retrieves a message with one argument. */
-
svn commit: r1006229 - /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
Author: jboynes
Date: Sat Oct 9 22:26:48 2010
New Revision: 1006229
URL: http://svn.apache.org/viewvc?rev=1006229&view=rev
Log:
apply patch from Jarek Gawor for bugzilla #48773
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java?rev=1006229&r1=1006228&r2=1006229&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
Sat Oct 9 22:26:48 2010
@@ -19,8 +19,10 @@ package org.apache.taglibs.standard.tag.
import java.io.PrintWriter;
import java.sql.Connection;
+import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
+import java.util.Properties;
import javax.sql.DataSource;
@@ -34,7 +36,7 @@ import org.apache.taglibs.standard.resou
* @author Hans Bergsten
*/
public class DataSourceWrapper implements DataSource {
-private String driverClassName;
+private Driver driver;
private String jdbcURL;
private String userName;
private String password;
@@ -43,8 +45,6 @@ public class DataSourceWrapper implement
throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
-this.driverClassName = driverClassName;
-
//get the classloader
ClassLoader cl;
SecurityManager sm = System.getSecurityManager();
@@ -57,7 +57,10 @@ public class DataSourceWrapper implement
}
//done getting classloader
-Class.forName(driverClassName, true, cl).newInstance();
+Object instance = Class.forName(driverClassName, true,
cl).newInstance();
+if (instance instanceof Driver) {
+driver = (Driver) instance;
+}
}
public void setJdbcURL(String jdbcURL) {
@@ -77,16 +80,27 @@ public class DataSourceWrapper implement
* set properties.
*/
public Connection getConnection() throws SQLException {
- Connection conn = null;
- if (userName != null) {
- conn = DriverManager.getConnection(jdbcURL, userName, password);
- }
- else {
- conn = DriverManager.getConnection(jdbcURL);
- }
- return conn;
+Connection conn = null;
+if (driver != null) {
+Properties props = new Properties();
+if (userName != null) {
+props.put("user", userName);
+}
+if (password != null) {
+props.put("password", password);
+}
+conn = driver.connect(jdbcURL, props);
+}
+if (conn == null) {
+if (userName != null) {
+conn = DriverManager.getConnection(jdbcURL, userName,
password);
+} else {
+conn = DriverManager.getConnection(jdbcURL);
+}
+}
+return conn;
}
-
+
/**
* Always throws a SQLException. Username and password are set
* in the constructor and can not be changed.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006230 - /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DriverTag.java
Author: jboynes Date: Sat Oct 9 22:46:59 2010 New Revision: 1006230 URL: http://svn.apache.org/viewvc?rev=1006230&view=rev Log: remove obsolete DriverTag implementation as it has been replaced with SetDataSource and is no longer used Removed: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DriverTag.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006231 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Sat Oct 9 23:07:29 2010 New Revision: 1006231 URL: http://svn.apache.org/viewvc?rev=1006231&view=rev Log: update parent POM with other mail archives that are online Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1006231&r1=1006230&r2=1006231&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sat Oct 9 23:07:29 2010 @@ -59,14 +59,14 @@ taglibs-user-unsubscr...@tomcat.apache.org taglibs-u...@tomcat.apache.org http://mail-archives.apache.org/mod_mbox/tomcat-taglibs-user/ - - --> Old Taglibs User Archive - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006232 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Sat Oct 9 23:21:41 2010 New Revision: 1006232 URL: http://svn.apache.org/viewvc?rev=1006232&view=rev Log: Configure resource path in parent POM to include LICENSE and NOTICE files in addition to default Maven resource path Add NOTICE file Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1006232&r1=1006231&r2=1006232&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sat Oct 9 23:21:41 2010 @@ -114,8 +114,7 @@ -src/main/resources/META-INF -META-INF +src/main/resources - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006233 - in /tomcat/taglibs/standard/trunk: NOTICE.txt impl/LICENSE.txt impl/NOTICE.txt impl/pom.xml spec/LICENSE.txt spec/NOTICE.txt
Author: jboynes Date: Sat Oct 9 23:22:49 2010 New Revision: 1006233 URL: http://svn.apache.org/viewvc?rev=1006233&view=rev Log: ensure LICENSE and NOTICE file are included in every project jar Added: tomcat/taglibs/standard/trunk/impl/LICENSE.txt - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/LICENSE.txt tomcat/taglibs/standard/trunk/impl/NOTICE.txt (with props) tomcat/taglibs/standard/trunk/spec/LICENSE.txt - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/LICENSE.txt tomcat/taglibs/standard/trunk/spec/NOTICE.txt (with props) Modified: tomcat/taglibs/standard/trunk/NOTICE.txt tomcat/taglibs/standard/trunk/impl/pom.xml Modified: tomcat/taglibs/standard/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/NOTICE.txt?rev=1006233&r1=1006232&r2=1006233&view=diff == --- tomcat/taglibs/standard/trunk/NOTICE.txt (original) +++ tomcat/taglibs/standard/trunk/NOTICE.txt Sat Oct 9 23:22:49 2010 @@ -1,7 +1,5 @@ -Apache Jakarta Standards Taglib +Apache Tomcat Standard Taglib Copyright 2001-2010 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). - -Includes code from Commons Collections (LRUMap and the classes/interfaces it requires). Added: tomcat/taglibs/standard/trunk/impl/NOTICE.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/NOTICE.txt?rev=1006233&view=auto == --- tomcat/taglibs/standard/trunk/impl/NOTICE.txt (added) +++ tomcat/taglibs/standard/trunk/impl/NOTICE.txt Sat Oct 9 23:22:49 2010 @@ -0,0 +1,5 @@ +Apache Tomcat Standard Taglib Implementation +Copyright 2001-2010 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). Propchange: tomcat/taglibs/standard/trunk/impl/NOTICE.txt -- svn:eol-style = native Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1006233&r1=1006232&r2=1006233&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Sat Oct 9 23:22:49 2010 @@ -129,6 +129,14 @@ +. +META-INF + + NOTICE.txt + LICENSE.txt + + + src/main/java **/*.properties Added: tomcat/taglibs/standard/trunk/spec/NOTICE.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/NOTICE.txt?rev=1006233&view=auto == --- tomcat/taglibs/standard/trunk/spec/NOTICE.txt (added) +++ tomcat/taglibs/standard/trunk/spec/NOTICE.txt Sat Oct 9 23:22:49 2010 @@ -0,0 +1,5 @@ +Apache Tomcat Standard Taglib Specification API +Copyright 2001-2010 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). Propchange: tomcat/taglibs/standard/trunk/spec/NOTICE.txt -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006234 - in /tomcat/taglibs/standard/trunk/impl: ./ src/main/java/org/apache/taglibs/standard/lang/jstl/ src/main/java/org/apache/taglibs/standard/resources/ src/main/resources/META-INF/
Author: jboynes Date: Sat Oct 9 23:33:46 2010 New Revision: 1006234 URL: http://svn.apache.org/viewvc?rev=1006234&view=rev Log: move resources to location in default Maven resources tree to remove need for custom definition Added: tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_0-rt.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/c-1_0-rt.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_0.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/c-1_0.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_1.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/c-1_1.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/c.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0-rt.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/fmt-1_0-rt.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/fmt-1_0.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/fmt.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fn.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/fn.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/permittedTaglibs.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/permittedTaglibs.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/scriptfree.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/scriptfree.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0-rt.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/sql-1_0-rt.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/sql-1_0.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/sql.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0-rt.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/x-1_0-rt.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/x-1_0.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x.tld - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/tlds/x.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/org/ tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/ tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/ tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/ tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/ tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/jstl/ tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources.properties (props changed) - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/lang/jstl/Resources.properties tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources_ja.properties (props changed) - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/lang/jstl/Resources_ja.properties tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/resources/ tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/resources/Resources.properties (props changed) - copied unchanged from r1005806, tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.properties tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/resources/Resources_ja.proper
svn commit: r1006235 - /tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt
Author: jboynes Date: Sat Oct 9 23:34:55 2010 New Revision: 1006235 URL: http://svn.apache.org/viewvc?rev=1006235&view=rev Log: fix project name Modified: tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt Modified: tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt?rev=1006235&r1=1006234&r2=1006235&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt (original) +++ tomcat/taglibs/taglibs-parent/trunk/NOTICE.txt Sat Oct 9 23:34:55 2010 @@ -1,4 +1,4 @@ -Apache Jakarta Taglib Parent +Apache Tomcat Taglib Parent Copyright 2009-2010 The Apache Software Foundation This product includes software developed by - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006237 - in /tomcat/taglibs: standard/trunk/impl/pom.xml standard/trunk/spec/pom.xml taglibs-parent/trunk/pom.xml
Author: jboynes
Date: Sun Oct 10 00:37:21 2010
New Revision: 1006237
URL: http://svn.apache.org/viewvc?rev=1006237&view=rev
Log:
Set JDK level using default maven.compiler.* properties
Modified:
tomcat/taglibs/standard/trunk/impl/pom.xml
tomcat/taglibs/standard/trunk/spec/pom.xml
tomcat/taglibs/taglibs-parent/trunk/pom.xml
Modified: tomcat/taglibs/standard/trunk/impl/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1006237&r1=1006236&r2=1006237&view=diff
==
--- tomcat/taglibs/standard/trunk/impl/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/impl/pom.xml Sun Oct 10 00:37:21 2010
@@ -122,20 +122,10 @@
UTF-8
UTF-8
-1.5
-1.5
-
-org.apache.maven.plugins
-maven-compiler-plugin
-
- 1.5
- 1.5
-
-
org.apache.maven.plugins
@@ -166,7 +156,7 @@
maven-pmd-plugin
2.3
- ${maven.compile.target}
+ ${maven.compiler.target}
Modified: tomcat/taglibs/standard/trunk/spec/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/pom.xml?rev=1006237&r1=1006236&r2=1006237&view=diff
==
--- tomcat/taglibs/standard/trunk/spec/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/spec/pom.xml Sun Oct 10 00:37:21 2010
@@ -84,17 +84,4 @@
-
-
-
-org.apache.maven.plugins
-maven-compiler-plugin
-
- 1.5
- 1.5
-
-
-
-
-
Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1006237&r1=1006236&r2=1006237&view=diff
==
--- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original)
+++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sun Oct 10 00:37:21 2010
@@ -131,8 +131,8 @@
${project.version}
${project.organization.name}
org.apache
-
${maven.compile.source}
-
${maven.compile.target}
+
${maven.compiler.source}
+
${maven.compiler.target}
@@ -150,8 +150,8 @@
${project.version}
${project.organization.name}
org.apache
-
${maven.compile.source}
-
${maven.compile.target}
+
${maven.compiler.source}
+
${maven.compiler.target}
@@ -197,10 +197,9 @@
-
+1.5
+1.5
+
${project.artifactId}
RC1
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006238 - in /tomcat/taglibs/standard/trunk: impl/pom.xml spec/pom.xml
Author: jboynes Date: Sun Oct 10 00:40:14 2010 New Revision: 1006238 URL: http://svn.apache.org/viewvc?rev=1006238&view=rev Log: fix project names Modified: tomcat/taglibs/standard/trunk/impl/pom.xml tomcat/taglibs/standard/trunk/spec/pom.xml Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1006238&r1=1006237&r2=1006238&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Sun Oct 10 00:40:14 2010 @@ -32,7 +32,7 @@ taglibs-standard-impl 1.2-SNAPSHOT - Jakarta Standard Taglib - JSTL Implementation + Apache Standard Taglib - JSTL Implementation 2001 Modified: tomcat/taglibs/standard/trunk/spec/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/pom.xml?rev=1006238&r1=1006237&r2=1006238&view=diff == --- tomcat/taglibs/standard/trunk/spec/pom.xml (original) +++ tomcat/taglibs/standard/trunk/spec/pom.xml Sun Oct 10 00:40:14 2010 @@ -28,7 +28,7 @@ taglibs-standard-spec 1.2-SNAPSHOT - Jakarta Standard Taglib - JSTL Specification API + Apache Standard Taglib - JSTL Specification API 2001 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006239 - in /tomcat/taglibs/standard/trunk: ./ impl/ spec/ standard-test/
Author: jboynes Date: Sun Oct 10 00:45:34 2010 New Revision: 1006239 URL: http://svn.apache.org/viewvc?rev=1006239&view=rev Log: set svn:ignore to ignore IDE files and build target Modified: tomcat/taglibs/standard/trunk/ (props changed) tomcat/taglibs/standard/trunk/impl/ (props changed) tomcat/taglibs/standard/trunk/spec/ (props changed) tomcat/taglibs/standard/trunk/standard-test/ (props changed) Propchange: tomcat/taglibs/standard/trunk/ -- --- svn:ignore (added) +++ svn:ignore Sun Oct 10 00:45:34 2010 @@ -0,0 +1 @@ +*.iml Propchange: tomcat/taglibs/standard/trunk/impl/ -- --- svn:ignore (added) +++ svn:ignore Sun Oct 10 00:45:34 2010 @@ -0,0 +1,2 @@ +target +*.iml Propchange: tomcat/taglibs/standard/trunk/spec/ -- --- svn:ignore (added) +++ svn:ignore Sun Oct 10 00:45:34 2010 @@ -0,0 +1,2 @@ +target +*.iml Propchange: tomcat/taglibs/standard/trunk/standard-test/ -- --- svn:ignore (added) +++ svn:ignore Sun Oct 10 00:45:34 2010 @@ -0,0 +1,2 @@ +target +*.iml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006240 - in /tomcat/taglibs/standard/trunk/impl: ./ src/test/java/org/apache/taglibs/standard/ src/test/java/org/apache/taglibs/standard/functions/ src/test/java/org/apache/taglibs/stand
Author: jboynes
Date: Sun Oct 10 01:00:38 2010
New Revision: 1006240
URL: http://svn.apache.org/viewvc?rev=1006240&view=rev
Log:
Rename tests to match default **/*Test.java pattern
Added:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
(contents, props changed)
- copied, changed from r1006238,
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/TestVersion.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/FunctionsTest.java
(contents, props changed)
- copied, changed from r1006238,
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/TestFunctions.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTest.java
(contents, props changed)
- copied, changed from r1006238,
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTests.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/resources/ResourcesTest.java
- copied, changed from r1006238,
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/resources/TestResources.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java
(contents, props changed)
- copied, changed from r1006238,
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/core/TestSetSupport.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/TransformSupportTest.java
- copied, changed from r1006238,
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/TestTransformSupport.java
Removed:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/TestVersion.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/TestFunctions.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTests.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/resources/TestResources.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/core/TestSetSupport.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/TestTransformSupport.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/el/
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/testutil/
Modified:
tomcat/taglibs/standard/trunk/impl/pom.xml
Modified: tomcat/taglibs/standard/trunk/impl/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1006240&r1=1006239&r2=1006240&view=diff
==
--- tomcat/taglibs/standard/trunk/impl/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/impl/pom.xml Sun Oct 10 01:00:38 2010
@@ -131,13 +131,6 @@
org.apache.maven.plugins
maven-surefire-plugin
-
-
org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTests.java
-org/apache/taglibs/standard/TestVersion.java
-
org/apache/taglibs/standard/resources/TestResources.java
-
org/apache/taglibs/standard/tag/common/core/TestSetSupport.java
-
org/apache/taglibs/standard/tag/common/xml/TestTransformSupport.java
-
Copied:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
(from r1006238,
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/TestVersion.java)
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java?p2=tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java&p1=tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/TestVersion.java&r1=1006238&r2=1006240&rev=1006240&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/TestVersion.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
Sun Oct 10 01:00:38 2010
@@ -19,11 +19,11 @@ package org.apache.taglibs.standard;
import junit.framework.*;
-public class TestVersion
+public class VersionTest
extends TestCase {
private Version version = null;
-public TestVersion(String name) {
+public VersionTest(String name) {
super(name);
}
Propchange:
to
svn commit: r1006241 - /tomcat/taglibs/taglibs-parent/trunk/
Author: jboynes Date: Sun Oct 10 01:01:58 2010 New Revision: 1006241 URL: http://svn.apache.org/viewvc?rev=1006241&view=rev Log: ignore IDE files Modified: tomcat/taglibs/taglibs-parent/trunk/ (props changed) Propchange: tomcat/taglibs/taglibs-parent/trunk/ -- --- svn:ignore (added) +++ svn:ignore Sun Oct 10 01:01:58 2010 @@ -0,0 +1 @@ +*.iml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006242 - /tomcat/taglibs/standard/trunk/standard-test/
Author: jboynes Date: Sun Oct 10 01:04:29 2010 New Revision: 1006242 URL: http://svn.apache.org/viewvc?rev=1006242&view=rev Log: ignore test files Modified: tomcat/taglibs/standard/trunk/standard-test/ (props changed) Propchange: tomcat/taglibs/standard/trunk/standard-test/ -- --- svn:ignore (original) +++ svn:ignore Sun Oct 10 01:04:29 2010 @@ -1,2 +1,4 @@ target *.iml +cactustest +derby.log - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006243 - in /tomcat/taglibs/standard/trunk/src: main/ test/
Author: jboynes Date: Sun Oct 10 01:08:47 2010 New Revision: 1006243 URL: http://svn.apache.org/viewvc?rev=1006243&view=rev Log: remove empty directories Removed: tomcat/taglibs/standard/trunk/src/main/ tomcat/taglibs/standard/trunk/src/test/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006244 - /tomcat/taglibs/standard/trunk/impl/pom.xml
Author: jboynes Date: Sun Oct 10 01:12:22 2010 New Revision: 1006244 URL: http://svn.apache.org/viewvc?rev=1006244&view=rev Log: remove duplicate dependency Modified: tomcat/taglibs/standard/trunk/impl/pom.xml Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1006244&r1=1006243&r2=1006244&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Sun Oct 10 01:12:22 2010 @@ -69,11 +69,6 @@ - junit - junit - 4.8.1 - - org.apache.taglibs taglibs-standard-spec 1.2-SNAPSHOT - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006320 - in /tomcat/taglibs/standard/trunk/impl/src: main/java/org/apache/taglibs/standard/tag/common/fmt/ test/java/org/apache/taglibs/standard/tag/common/fmt/
Author: jboynes
Date: Sun Oct 10 17:13:16 2010
New Revision: 1006320
URL: http://svn.apache.org/viewvc?rev=1006320&view=rev
Log:
add test to confirm bugzilla #49900 and verify fix
Added:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java?rev=1006320&r1=1006319&r2=1006320&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
Sun Oct 10 17:13:16 2010
@@ -111,7 +111,8 @@ public abstract class BundleSupport exte
// Releases any resources we may have (or inherit)
public void release() {
- init();
+super.release();
+ init();
}
Added:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java?rev=1006320&view=auto
==
---
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
(added)
+++
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
Sun Oct 10 17:13:16 2010
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.taglibs.standard.tag.common.fmt;
+
+import javax.servlet.jsp.tagext.BodyContent;
+
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ */
+public class BundleSupportTest {
+
+private BundleSupport tag;
+
+@Before
+public void setup() {
+tag = new BundleSupport() {
+};
+}
+
+// test for bugzilla #49900 that bodyContent is not released
+@Test
+public void testBodyContentIsRelease() {
+BodyContent b = EasyMock.createMock(BodyContent.class);
+tag.setBodyContent(b);
+tag.release();
+Assert.assertNull(tag.getBodyContent());
+}
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1006338 - in /tomcat/taglibs/standard/trunk/impl: ./ src/test/java/org/apache/taglibs/standard/lang/jstl/test/ src/test/resources/ src/test/resources/org/ src/test/resources/org/apache/ s
Author: jboynes
Date: Sun Oct 10 19:04:15 2010
New Revision: 1006338
URL: http://svn.apache.org/viewvc?rev=1006338&view=rev
Log:
make ParserTest pass, assuming EL functions should be allowed
Added:
tomcat/taglibs/standard/trunk/impl/src/test/resources/
tomcat/taglibs/standard/trunk/impl/src/test/resources/org/
tomcat/taglibs/standard/trunk/impl/src/test/resources/org/apache/
tomcat/taglibs/standard/trunk/impl/src/test/resources/org/apache/taglibs/
tomcat/taglibs/standard/trunk/impl/src/test/resources/org/apache/taglibs/standard/
tomcat/taglibs/standard/trunk/impl/src/test/resources/org/apache/taglibs/standard/lang/
tomcat/taglibs/standard/trunk/impl/src/test/resources/org/apache/taglibs/standard/lang/jstl/
tomcat/taglibs/standard/trunk/impl/src/test/resources/org/apache/taglibs/standard/lang/jstl/test/
tomcat/taglibs/standard/trunk/impl/src/test/resources/org/apache/taglibs/standard/lang/jstl/test/parserTests.txt
(contents, props changed)
- copied, changed from r1006238,
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/parserTests.txt
tomcat/taglibs/standard/trunk/impl/src/test/resources/org/apache/taglibs/standard/lang/jstl/test/parserTestsOutput.txt
(contents, props changed)
- copied, changed from r1006238,
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/parserTestsOutput.txt
Removed:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/parserTests.txt
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/parserTestsOutput.txt
Modified:
tomcat/taglibs/standard/trunk/impl/pom.xml
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
Modified: tomcat/taglibs/standard/trunk/impl/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1006338&r1=1006337&r2=1006338&view=diff
==
--- tomcat/taglibs/standard/trunk/impl/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/impl/pom.xml Sun Oct 10 19:04:15 2010
@@ -130,8 +130,6 @@
org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java
-
-
org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java?rev=1006338&r1=1006337&r2=1006338&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
Sun Oct 10 19:04:15 2010
@@ -13,236 +13,126 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.lang.jstl.test;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
+import java.io.BufferedReader;
+import java.io.CharArrayReader;
+import java.io.CharArrayWriter;
import java.io.IOException;
-import java.io.PrintStream;
-
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.io.PrintWriter;
+import java.nio.charset.Charset;
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.lang.jstl.Evaluator;
-
import junit.framework.TestCase;
+import org.apache.taglibs.standard.lang.jstl.Evaluator;
+import org.junit.Assert;
+import org.junit.Test;
/**
- *
* This runs a series of tests specifically for the parser. It
* parses various expressions and prints out the canonical
* representation of those parsed expressions.
- *
+ *
* The expressions are stored in an input text file, with one line
* per expression. Blank lines and lines that start with # are
* ignored. The results are written to an output file (blank lines
* and # lines are included in the output file). The output file may
* be compared against an existing output file to do regression
* testing.
- *
+ *
* @author Nathan Abramson - Art Technology Group
* @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
- **/
+ */
public class ParserTest extends TestCase {
+private final Charset U
svn commit: r1006340 - /tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
Author: jboynes
Date: Sun Oct 10 19:07:44 2010
New Revision: 1006340
URL: http://svn.apache.org/viewvc?rev=1006340&view=rev
Log:
fix method renamed for debugging
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java?rev=1006340&r1=1006339&r2=1006340&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
Sun Oct 10 19:07:44 2010
@@ -59,7 +59,7 @@ public class ParserTest extends TestCase
CharArrayWriter writer = new CharArrayWriter();
PrintWriter out = new PrintWriter(writer);
-x(in, out);
+runTests(in, out);
out.close();
in.close();
@@ -78,7 +78,7 @@ public class ParserTest extends TestCase
* Runs the tests, reading expressions from pIn and writing the
* results to pOut.
*/
-public static void x(BufferedReader pIn, PrintWriter pOut)
+public static void runTests(BufferedReader pIn, PrintWriter pOut)
throws IOException {
while (true) {
String str = pIn.readLine();
@@ -87,12 +87,6 @@ public class ParserTest extends TestCase
"".equals(str.trim())) {
pOut.println(str);
} else {
-// For testing non-ASCII values, the string @@non-ascii gets
-// converted internally to '\u'
-if ("@@non-ascii".equals(str)) {
-str = "\u";
-}
-
pOut.println("Attribute value: " + str);
try {
String result = Evaluator.parseAndRender(str);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026619 - in /tomcat/taglibs/standard/trunk: compat/ compat/LICENSE.txt compat/NOTICE.txt compat/pom.xml jstlel/ jstlel/LICENSE.txt jstlel/NOTICE.txt jstlel/pom.xml pom.xml
Author: jboynes Date: Sat Oct 23 14:33:47 2010 New Revision: 1026619 URL: http://svn.apache.org/viewvc?rev=1026619&view=rev Log: Add compat and jstlel modules to start refactoring 1.0 support Added: tomcat/taglibs/standard/trunk/compat/ (with props) tomcat/taglibs/standard/trunk/compat/LICENSE.txt tomcat/taglibs/standard/trunk/compat/NOTICE.txt tomcat/taglibs/standard/trunk/compat/pom.xml tomcat/taglibs/standard/trunk/jstlel/ (with props) tomcat/taglibs/standard/trunk/jstlel/LICENSE.txt tomcat/taglibs/standard/trunk/jstlel/NOTICE.txt tomcat/taglibs/standard/trunk/jstlel/pom.xml Modified: tomcat/taglibs/standard/trunk/pom.xml Propchange: tomcat/taglibs/standard/trunk/compat/ -- --- svn:ignore (added) +++ svn:ignore Sat Oct 23 14:33:47 2010 @@ -0,0 +1,2 @@ +*.iml +target Added: tomcat/taglibs/standard/trunk/compat/LICENSE.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/LICENSE.txt?rev=1026619&view=auto == --- tomcat/taglibs/standard/trunk/compat/LICENSE.txt (added) +++ tomcat/taglibs/standard/trunk/compat/LICENSE.txt Sat Oct 23 14:33:47 2010 @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated wit
svn commit: r1026635 - in /tomcat/taglibs/standard/trunk: impl/src/main/java/org/apache/taglibs/standard/extra/ impl/src/main/java/org/apache/taglibs/standard/lang/ impl/src/main/java/org/apache/tagli
Author: jboynes Date: Sat Oct 23 16:18:34 2010 New Revision: 1026635 URL: http://svn.apache.org/viewvc?rev=1026635&view=rev Log: refactor 1.0 EL tag support into jstlel module Added: tomcat/taglibs/standard/trunk/jstlel/src/ tomcat/taglibs/standard/trunk/jstlel/src/main/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/ - copied from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/lang/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/ - copied from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/el/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELSqlTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELXmlTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/ValidationUtil.java tomcat/taglibs/standard/trunk/jstlel/src/main/resources/ tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/ tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/c-1_0.tld (contents, props changed) - copied, changed from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_0.tld tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/fmt-1_0.tld (contents, props changed) - copied, changed from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0.tld tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/sql-1_0.tld (contents, props changed) - copied, changed from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0.tld tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/x-1_0.tld (contents, props changed) - copied, changed from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0.tld tomcat/taglibs/standard/trunk/jstlel/src/test/ tomcat/taglibs/standard/trunk/jstlel/src/test/java/ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/ - copied from r1026616, tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/ tomcat/taglibs/standard/trunk/jstlel/src/test/resources/ - copied from r1026616, tomcat/taglibs/standard/trunk/impl/src/test/resources/ Removed: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/extra/ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/lang/ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/el/ tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_0.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0.tld tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/ tomcat/taglibs/standard/trunk/impl/src/test/resources/ Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java tomcat/taglibs/standard/trunk/jstlel/pom.xml Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java?rev=1026635&r1=1026634&r2=1026635&view=diff == --- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java (original) +++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/
svn commit: r1026644 - in /tomcat/taglibs/standard/trunk: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ impl/src/test/java
Author: jboynes
Date: Sat Oct 23 16:44:03 2010
New Revision: 1026644
URL: http://svn.apache.org/viewvc?rev=1026644&view=rev
Log:
refactor c:set to resolve memory leak from bug #33934
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/SetTag.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/SetTag.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java?rev=1026644&r1=1026643&r2=1026644&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
Sat Oct 23 16:44:03 2010
@@ -26,6 +26,7 @@ import java.lang.reflect.Method;
import java.util.Map;
+import javax.servlet.jsp.JspApplicationContext;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspFactory;
import javax.servlet.jsp.JspTagException;
@@ -44,22 +45,13 @@ import org.apache.taglibs.standard.resou
/**
* Support for handlers of the <set> tag.
*
- * The protected value and valueSpecified
- * attributes must be set in sync. That is, if you set the value then
- * you should set valueSpecified to true, if you
unset the value, then
- * you should set valueSpecified to false.
- *
* @author Shawn Bayern
*/
-public class SetSupport extends BodyTagSupport {
+public abstract class SetSupport extends BodyTagSupport {
//*
// Internal state
-protected Object value; // tag attribute
-protected boolean valueSpecified; // status
-protected Object target;// tag attribute
-protected String property; // tag attribute
private String var; // tag attribute
private String scope; // tag attribute
@@ -71,20 +63,14 @@ public class SetSupport extends BodyTagS
* not provide other constructors and are expected to call the
* superclass constructor.
*/
-public SetSupport() {
+protected SetSupport() {
super();
-init();
-}
-
-// resets local state
-private void init() {
-value = target = property = var = scope = null;
-valueSpecified = false;
}
// Releases any resources we may have (or inherit)
public void release() {
-init();
+var = null;
+scope = null;
super.release();
}
@@ -94,27 +80,30 @@ public class SetSupport extends BodyTagS
public int doEndTag() throws JspException {
-// what we'll store in scope:var
-Object result = getResult();
-
// decide what to do with the result
if (var != null) {
-exportToVariable(result);
-} else if (target == null) {
-// can happen if target evaluates to null
-throw new
JspTagException(Resources.getMessage("SET_INVALID_TARGET"));
-} else if (target instanceof Map) {
-exportToMapProperty(result);
+exportToVariable(getResult());
} else {
-exportToBeanProperty(result);
+Object target = evalTarget();
+if (target == null) {
+// can happen if target evaluates to null
+throw new
JspTagException(Resources.getMessage("SET_INVALID_TARGET"));
+}
+
+String property = evalProperty();
+if (target instanceof Map) {
+exportToMapProperty(target, property, getResult());
+} else {
+exportToBeanProperty(target, property, getResult());
+}
}
return EVAL_PAGE;
}
-Object getResult() {
-if (valueSpecified) {
-return value;
+Object getResult() throws JspException {
+if (isValueSpecified()) {
+return evalValue();
} else if (bodyContent == null) {
return "";
} else {
@@ -128,6 +117,38 @@ public class SetSupport extends BodyTagS
}
/**
+ * Indicates that the value attribute was specified.
+ * If no value attribute is supplied then the value is taken from the
tag's body content.
+ *
+ * @return true if the value attribute was specified
+ */
+protected abstra
svn commit: r1026649 - /tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/SetTag.java
Author: jboynes
Date: Sat Oct 23 16:54:20 2010
New Revision: 1026649
URL: http://svn.apache.org/viewvc?rev=1026649&view=rev
Log:
clean up null value handling
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/SetTag.java
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/SetTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/SetTag.java?rev=1026649&r1=1026648&r2=1026649&view=diff
==
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/SetTag.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/SetTag.java
Sat Oct 23 16:54:20 2010
@@ -19,7 +19,7 @@ package org.apache.taglibs.standard.tag.
import javax.servlet.jsp.JspException;
-import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
+import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.core.SetSupport;
/**
@@ -67,26 +67,16 @@ public class SetTag extends SetSupport {
@Override
protected Object evalValue() throws JspException {
-try {
-return ExpressionUtil.evalNotNull("set", "value", valueExpression,
Object.class, this, pageContext);
-} catch (NullAttributeException ex) {
-// explicitly let 'value' be null
-return null;
-}
+return ExpressionEvaluatorManager.evaluate("value", valueExpression,
Object.class, this, pageContext);
}
@Override
protected Object evalTarget() throws JspException {
-return ExpressionUtil.evalNotNull("set", "target", targetExpression,
Object.class, this, pageContext);
+return ExpressionEvaluatorManager.evaluate("target", targetExpression,
Object.class, this, pageContext);
}
@Override
protected String evalProperty() throws JspException {
-try {
-return (String) ExpressionUtil.evalNotNull("set", "property",
propertyExpression, String.class, this, pageContext);
-} catch (NullAttributeException ex) {
-// explicitly let 'property' be null
-return null;
-}
+return (String) ExpressionEvaluatorManager.evaluate("property",
propertyExpression, String.class, this, pageContext);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026717 - /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java
Author: jboynes
Date: Sun Oct 24 00:37:58 2010
New Revision: 1026717
URL: http://svn.apache.org/viewvc?rev=1026717&view=rev
Log:
Add helper class for working with javax.el expressions
Added:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java
Added:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java?rev=1026717&view=auto
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java
(added)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java
Sun Oct 24 00:37:58 2010
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.taglibs.standard.util;
+
+import javax.el.ExpressionFactory;
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspApplicationContext;
+import javax.servlet.jsp.JspFactory;
+import javax.servlet.jsp.PageContext;
+
+/**
+ * Helper functions for working with EL expressions.
+ */
+public class ExpressionUtil {
+
+/**
+ * Create a value expression.
+ *
+ * @param pageContext the context in which the expression will be parsed
+ * @param expression the expression
+ * @param expectedType the expected type of result
+ * @return a parsed expression
+ */
+public static ValueExpression createValueExpression(PageContext
pageContext, String expression, Class expectedType) {
+ExpressionFactory factory = getExpressionFactory(pageContext);
+return factory.createValueExpression(pageContext.getELContext(),
expression, expectedType);
+}
+
+/**
+ * Return the JSP's ExpressionFactory.
+ *
+ * @param pageContext the context for the JSP
+ * @return the ExpressionFactory to use for EL expressions in that JSP
+ */
+public static ExpressionFactory getExpressionFactory(PageContext
pageContext) {
+JspApplicationContext appContext =
JspFactory.getDefaultFactory().getJspApplicationContext(pageContext.getServletContext());
+return appContext.getExpressionFactory();
+}
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026719 - in /tomcat/taglibs/standard/trunk/compat/src: ./ main/ main/java/ main/java/org/ main/java/org/apache/ main/java/org/apache/taglibs/ main/java/org/apache/taglibs/standard/ main/
Author: jboynes
Date: Sun Oct 24 00:39:22 2010
New Revision: 1026719
URL: http://svn.apache.org/viewvc?rev=1026719&view=rev
Log:
Add JSTL 1.0 ForEach tag that uses javax.el to process EL expressions
Added:
tomcat/taglibs/standard/trunk/compat/src/
tomcat/taglibs/standard/trunk/compat/src/main/
tomcat/taglibs/standard/trunk/compat/src/main/java/
tomcat/taglibs/standard/trunk/compat/src/main/java/org/
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
Added:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java?rev=1026719&view=auto
==
---
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
(added)
+++
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
Sun Oct 24 00:39:22 2010
@@ -0,0 +1,76 @@
+package org.apache.taglibs.standard.tag.compat.core;
+
+import java.util.Collections;
+import javax.el.ExpressionFactory;
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspApplicationContext;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspFactory;
+
+import org.apache.taglibs.standard.tag.common.core.ForEachSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * JSTL 1.0 compatible implementation of <foreach> that uses JSP EL
support.
+ */
+public class ForEachTag extends ForEachSupport {
+
+private ValueExpression beginExpression;
+private ValueExpression endExpression;
+private ValueExpression stepExpression;
+private ValueExpression itemsExpression;
+
+public ForEachTag() {
+}
+
+@Override
+public void release() {
+beginExpression = null;
+endExpression = null;
+stepExpression = null;
+itemsExpression = null;
+super.release();
+}
+
+@Override
+public int doStartTag() throws JspException {
+if (beginSpecified) {
+begin = (Integer)
beginExpression.getValue(pageContext.getELContext());
+validateBegin();
+}
+if (endSpecified) {
+end = (Integer) endExpression.getValue(pageContext.getELContext());
+validateEnd();
+}
+if (stepSpecified) {
+step = (Integer)
stepExpression.getValue(pageContext.getELContext());
+validateStep();
+}
+if (itemsExpression != null) {
+rawItems = itemsExpression.getValue(pageContext.getELContext());
+if (rawItems == null) {
+rawItems = Collections.emptyList();
+}
+}
+return super.doStartTag();
+}
+
+public void setBegin(String begin) {
+beginExpression = ExpressionUtil.createValueExpression(pageContext,
begin, Integer.TYPE);
+beginSpecified = true;
+}
+
+public void setEnd(String end) {
+endExpression = ExpressionUtil.createValueExpression(pageContext, end,
Integer.TYPE);
+endSpecified = true;
+}
+
+public void setStep(String step) {
+stepExpression = ExpressionUtil.createValueExpression(pageContext,
step, Integer.TYPE);
+stepSpecified = true;
+}
+
+public void setItems(String items) {
+itemsExpression = ExpressionUtil.createValueExpression(pageContext,
items, Object.class);
+}
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026720 - /tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
Author: jboynes
Date: Sun Oct 24 00:39:53 2010
New Revision: 1026720
URL: http://svn.apache.org/viewvc?rev=1026720&view=rev
Log:
Add JSTL 1.0 ForTokens tag that uses javax.el to process EL expressions
Added:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
Added:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java?rev=1026720&view=auto
==
---
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
(added)
+++
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
Sun Oct 24 00:39:53 2010
@@ -0,0 +1,87 @@
+package org.apache.taglibs.standard.tag.compat.core;
+
+import javax.el.ExpressionFactory;
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspApplicationContext;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspFactory;
+
+import org.apache.taglibs.standard.tag.common.core.ForTokensSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * JSTL 1.0 compatible implementation of <fortokens> that uses JSP EL
support.
+ */
+public class ForTokensTag extends ForTokensSupport {
+
+private ValueExpression beginExpression;
+private ValueExpression endExpression;
+private ValueExpression stepExpression;
+private ValueExpression itemsExpression;
+private ValueExpression delimsExpression;
+
+public ForTokensTag() {
+}
+
+@Override
+public void release() {
+beginExpression = null;
+endExpression = null;
+stepExpression = null;
+itemsExpression = null;
+delimsExpression = null;
+super.release();
+}
+
+@Override
+public int doStartTag() throws JspException {
+if (beginSpecified) {
+begin = (Integer)
beginExpression.getValue(pageContext.getELContext());
+validateBegin();
+}
+if (endSpecified) {
+end = (Integer) endExpression.getValue(pageContext.getELContext());
+validateEnd();
+}
+if (stepSpecified) {
+step = (Integer)
stepExpression.getValue(pageContext.getELContext());
+validateStep();
+}
+if (itemsExpression != null) {
+items = itemsExpression.getValue(pageContext.getELContext());
+if (items == null) {
+items = "";
+}
+}
+if (delimsExpression != null) {
+delims = (String)
delimsExpression.getValue(pageContext.getELContext());
+if (delims == null) {
+delims = "";
+}
+}
+return super.doStartTag();
+}
+
+public void setBegin(String begin) {
+beginExpression = ExpressionUtil.createValueExpression(pageContext,
begin, Integer.TYPE);
+beginSpecified = true;
+}
+
+public void setEnd(String end) {
+endExpression = ExpressionUtil.createValueExpression(pageContext, end,
Integer.TYPE);
+endSpecified = true;
+}
+
+public void setStep(String step) {
+stepExpression = ExpressionUtil.createValueExpression(pageContext,
step, Integer.TYPE);
+stepSpecified = true;
+}
+
+public void setItems(String items) {
+itemsExpression = ExpressionUtil.createValueExpression(pageContext,
items, Object.class);
+}
+
+public void setDelims(String delims) {
+delimsExpression = ExpressionUtil.createValueExpression(pageContext,
delims, String.class);
+}
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026721 - /tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/IfTag.java
Author: jboynes
Date: Sun Oct 24 00:40:10 2010
New Revision: 1026721
URL: http://svn.apache.org/viewvc?rev=1026721&view=rev
Log:
Add JSTL 1.0 If tag that uses javax.el to process EL expressions
Added:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/IfTag.java
Added:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/IfTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/IfTag.java?rev=1026721&view=auto
==
---
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/IfTag.java
(added)
+++
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/IfTag.java
Sun Oct 24 00:40:10 2010
@@ -0,0 +1,32 @@
+package org.apache.taglibs.standard.tag.compat.core;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.jstl.core.ConditionalTagSupport;
+
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * JSTL 1.0 compatible implementation of <if> that uses JSP EL support.
+ */
+public class IfTag extends ConditionalTagSupport {
+private ValueExpression testExpression;
+
+public IfTag() {
+}
+
+@Override
+public void release() {
+testExpression = null;
+super.release();
+}
+
+@Override
+protected boolean condition() throws JspTagException {
+return (Boolean) testExpression.getValue(pageContext.getELContext());
+}
+
+public void setTest(String test) {
+testExpression = ExpressionUtil.createValueExpression(pageContext,
test, Boolean.TYPE);
+}
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026722 - /tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ImportTag.java
Author: jboynes
Date: Sun Oct 24 00:42:26 2010
New Revision: 1026722
URL: http://svn.apache.org/viewvc?rev=1026722&view=rev
Log:
Add JSTL 1.0 Import tag that uses javax.el to process EL expressions
Added:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ImportTag.java
Added:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ImportTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ImportTag.java?rev=1026722&view=auto
==
---
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ImportTag.java
(added)
+++
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ImportTag.java
Sun Oct 24 00:42:26 2010
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.taglibs.standard.tag.compat.core;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.core.ImportSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ */
+public class ImportTag extends ImportSupport {
+
+private ValueExpression urlExpression;
+private ValueExpression contextExpression;
+private ValueExpression charEncodingExpression;
+
+public ImportTag() {
+}
+
+@Override
+public void release() {
+urlExpression = null;
+contextExpression = null;
+charEncodingExpression = null;
+super.release();
+}
+
+@Override
+public int doStartTag() throws JspException {
+url = (String) urlExpression.getValue(pageContext.getELContext());
+if (contextExpression != null) {
+context = (String)
contextExpression.getValue(pageContext.getELContext());
+}
+if (charEncodingExpression != null) {
+charEncoding = (String)
charEncodingExpression.getValue(pageContext.getELContext());
+}
+return super.doStartTag();
+}
+
+public void setUrl(String url) {
+urlExpression = ExpressionUtil.createValueExpression(pageContext, url,
String.class);
+}
+
+public void setContext(String context) {
+contextExpression = ExpressionUtil.createValueExpression(pageContext,
context, String.class);
+}
+
+public void setCharEncoding(String charEncoding) {
+charEncodingExpression =
ExpressionUtil.createValueExpression(pageContext, charEncoding, String.class);
+}
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1026723 - in /tomcat/taglibs/standard/trunk: compat/ compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ impl
Author: jboynes
Date: Sun Oct 24 00:43:55 2010
New Revision: 1026723
URL: http://svn.apache.org/viewvc?rev=1026723&view=rev
Log:
Add JSTL 1.0 Out tag that uses javax.el to process EL expressions
Refactor existing tags for deferred evaluation to avoid memory leak from
retained references
Added:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/OutTag.java
Modified:
tomcat/taglibs/standard/trunk/compat/pom.xml
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/OutTag.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/OutTag.java
Modified: tomcat/taglibs/standard/trunk/compat/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1026723&r1=1026722&r2=1026723&view=diff
==
--- tomcat/taglibs/standard/trunk/compat/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/compat/pom.xml Sun Oct 24 00:43:55 2010
@@ -70,9 +70,13 @@
org.apache.taglibs
+ taglibs-standard-spec
+ 1.2-SNAPSHOT
+
+
+ org.apache.taglibs
taglibs-standard-impl
1.2-SNAPSHOT
- provided
Added:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/OutTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/OutTag.java?rev=1026723&view=auto
==
---
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/OutTag.java
(added)
+++
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/OutTag.java
Sun Oct 24 00:43:55 2010
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.taglibs.standard.tag.compat.core;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.core.OutSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ */
+public class OutTag extends OutSupport {
+
+private ValueExpression valueExpression;
+private ValueExpression defaultExpression;
+private ValueExpression escapeXmlExpression;
+
+public OutTag() {
+}
+
+@Override
+public void release() {
+valueExpression = null;
+defaultExpression = null;
+escapeXmlExpression = null;
+super.release();
+}
+
+public void setValue(String value) {
+valueExpression = ExpressionUtil.createValueExpression(pageContext,
value, Object.class);
+}
+
+public void setDefault(String def) {
+defaultExpression = ExpressionUtil.createValueExpression(pageContext,
def, String.class);
+}
+
+public void setEscapeXml(String escapeXml) {
+escapeXmlExpression =
ExpressionUtil.createValueExpression(pageContext, escapeXml, Boolean.TYPE);
+}
+
+@Override
+protected Object evalValue() throws JspException {
+if (valueExpression == null) {
+return null;
+}
+return valueExpression.getValue(pageContext.getELContext());
+}
+
+@Override
+protected String evalDefault() throws JspException {
+if (defaultExpression == null) {
+return null;
+}
+return (String) defaultExpression.getValue(pageContext.getELContext());
+}
+
+@Override
+protected boolean evalEscapeXml() throws JspException {
+if (escapeXmlExpression == null) {
+return true;
+}
+return (Boolean)
escapeXmlExpression.getValue(pageContext.getELContext());
+}
+}
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/
svn commit: r1026871 - in /tomcat/taglibs/standard/trunk: compat/ compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ impl/src/main/java/org/apache/taglibs/standard/util/ impl/src/test/j
Author: jboynes Date: Sun Oct 24 19:35:09 2010 New Revision: 1026871 URL: http://svn.apache.org/viewvc?rev=1026871&view=rev Log: fix svn:eol-style property Modified: tomcat/taglibs/standard/trunk/compat/LICENSE.txt (props changed) tomcat/taglibs/standard/trunk/compat/NOTICE.txt (props changed) tomcat/taglibs/standard/trunk/compat/pom.xml (props changed) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java (props changed) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java (props changed) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/IfTag.java (props changed) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ImportTag.java (props changed) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/OutTag.java (props changed) tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/EscapeXML.java (props changed) tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java (props changed) tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/resources/ResourcesTest.java (props changed) tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java (props changed) tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/TransformSupportTest.java (props changed) tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/util/EscapeXMLTest.java (props changed) tomcat/taglibs/standard/trunk/jstlel/LICENSE.txt (props changed) tomcat/taglibs/standard/trunk/jstlel/NOTICE.txt (props changed) tomcat/taglibs/standard/trunk/jstlel/pom.xml (props changed) tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java (props changed) tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java (props changed) tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELSqlTLV.java (props changed) tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELXmlTLV.java (props changed) tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/ValidationUtil.java (props changed) Propchange: tomcat/taglibs/standard/trunk/compat/LICENSE.txt -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/compat/NOTICE.txt -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/compat/pom.xml -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/IfTag.java -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ImportTag.java -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/OutTag.java -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/EscapeXML.java -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/resources/ResourcesTest.java -- svn:eol-style = native Propchange: to
svn commit: r1026876 - in /tomcat/taglibs/standard/trunk: ./ standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/ standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/
Author: jboynes Date: Sun Oct 24 20:00:06 2010 New Revision: 1026876 URL: http://svn.apache.org/viewvc?rev=1026876&view=rev Log: set svn:eol-style for remaining files Modified: tomcat/taglibs/standard/trunk/NOTICE.txt (props changed) tomcat/taglibs/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/TestOutTag.jsp (props changed) tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestOutTag.java (props changed) tomcat/taglibs/standard/trunk/standard-test/src/test/resources/org/apache/taglibs/standard/tag/el/core/TestOutTag.txt (props changed) Propchange: tomcat/taglibs/standard/trunk/NOTICE.txt -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/standard-test/src/main/webapp/org/apache/taglibs/standard/tag/el/core/TestOutTag.jsp -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestOutTag.java -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/standard-test/src/test/resources/org/apache/taglibs/standard/tag/el/core/TestOutTag.txt -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1029386 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes
Date: Sun Oct 31 15:44:28 2010
New Revision: 1029386
URL: http://svn.apache.org/viewvc?rev=1029386&view=rev
Log:
Apply patch from Rex Wang for creating OSGi bundle bug #50064
Modified:
tomcat/taglibs/taglibs-parent/trunk/pom.xml
Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1029386&r1=1029385&r2=1029386&view=diff
==
--- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original)
+++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sun Oct 31 15:44:28 2010
@@ -120,43 +120,6 @@
-maven-jar-plugin
-
-
-
- ${project.name}
- ${project.version}
-
${project.organization.name}
- ${project.name}
-
${project.version}
-
${project.organization.name}
- org.apache
-
${maven.compiler.source}
-
${maven.compiler.target}
-
-
-
-
-
-org.apache.maven.plugins
-maven-war-plugin
-
-
-
- ${project.name}
- ${project.version}
-
${project.organization.name}
- ${project.name}
-
${project.version}
-
${project.organization.name}
- org.apache
-
${maven.compiler.source}
-
${maven.compiler.target}
-
-
-
-
-
maven-assembly-plugin
@@ -166,6 +129,19 @@
gnu
+
+org.apache.felix
+maven-bundle-plugin
+2.0.1
+true
+
+
+${project.name}
+
${project.version}
+${project.url}
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1029387 - in /tomcat/taglibs/standard/trunk: compat/pom.xml impl/pom.xml jstlel/pom.xml spec/pom.xml
Author: jboynes
Date: Sun Oct 31 15:44:45 2010
New Revision: 1029387
URL: http://svn.apache.org/viewvc?rev=1029387&view=rev
Log:
Apply patch from Rex Wang for creating OSGi bundle bug #50064
Modified:
tomcat/taglibs/standard/trunk/compat/pom.xml
tomcat/taglibs/standard/trunk/impl/pom.xml
tomcat/taglibs/standard/trunk/jstlel/pom.xml
tomcat/taglibs/standard/trunk/spec/pom.xml
Modified: tomcat/taglibs/standard/trunk/compat/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1029387&r1=1029386&r2=1029387&view=diff
==
--- tomcat/taglibs/standard/trunk/compat/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/compat/pom.xml Sun Oct 31 15:44:45 2010
@@ -32,6 +32,8 @@
taglibs-standard-compat
1.2-SNAPSHOT
+ bundle
+
Apache Standard Taglib - JSTL 1.0 Compatibility
2001
@@ -123,6 +125,22 @@
UTF-8
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+
+true
+
+ *;version="1.2"
+
org.apache.x*;resolution:=optional,*
+
+
+
+
+
+
Modified: tomcat/taglibs/standard/trunk/impl/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1029387&r1=1029386&r2=1029387&view=diff
==
--- tomcat/taglibs/standard/trunk/impl/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/impl/pom.xml Sun Oct 31 15:44:45 2010
@@ -32,6 +32,8 @@
taglibs-standard-impl
1.2-SNAPSHOT
+ bundle
+
Apache Standard Taglib - JSTL Implementation
2001
@@ -118,7 +120,23 @@
UTF-8
UTF-8
-
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+
+ true
+
+*;version="1.2"
+
org.apache.x*;resolution:=optional,*
+
+
+
+
+
+
Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/pom.xml?rev=1029387&r1=1029386&r2=1029387&view=diff
==
--- tomcat/taglibs/standard/trunk/jstlel/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/jstlel/pom.xml Sun Oct 31 15:44:45 2010
@@ -32,6 +32,8 @@
taglibs-standard-jstlel
1.2-SNAPSHOT
+ bundle
+
Apache Standard Taglib - JSTL 1.0 EL Support
2001
@@ -123,6 +125,22 @@
UTF-8
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+
+true
+
+ *;version="1.2"
+
org.apache.x*;resolution:=optional,*
+
+
+
+
+
+
Modified: tomcat/taglibs/standard/trunk/spec/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/pom.xml?rev=1029387&r1=1029386&r2=1029387&view=diff
==
--- tomcat/taglibs/standard/trunk/spec/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/spec/pom.xml Sun Oct 31 15:44:45 2010
@@ -28,6 +28,8 @@
taglibs-standard-spec
1.2-SNAPSHOT
+ bundle
+
Apache Standard Taglib - JSTL Specification API
2001
@@ -83,5 +85,22 @@
provided
-
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+
+
+
${groupId}.${artifactId};singleton=true
+JSR-052 JavaServer Pages Standard Tag Library
Specification
+Sun Microsystems, Inc.
+1.2
+
javax.servlet.jsp.jstl*;version=1.2
+
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1029427 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes
Date: Sun Oct 31 17:26:17 2010
New Revision: 1029427
URL: http://svn.apache.org/viewvc?rev=1029427&view=rev
Log:
update to V7 of apache parent pom
Modified:
tomcat/taglibs/taglibs-parent/trunk/pom.xml
Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1029427&r1=1029426&r2=1029427&view=diff
==
--- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original)
+++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sun Oct 31 17:26:17 2010
@@ -23,7 +23,7 @@
org.apache
apache
-4
+7
org.apache.taglibs
@@ -104,19 +104,20 @@
-
-
-.
-META-INF
-
- NOTICE.txt
- LICENSE.txt
-
-
-
-src/main/resources
-
-
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+2.0.2
+
+ ${maven.compiler.source}
+ ${maven.compiler.target}
+ ${project.build.sourceEncoding}
+
+
+
+
@@ -175,10 +176,8 @@
1.5
1.5
-
-
-${project.artifactId}
-RC1
+UTF-8
+UTF-8
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1029428 - in /tomcat/taglibs/standard/trunk: compat/pom.xml impl/pom.xml jstlel/pom.xml
Author: jboynes Date: Sun Oct 31 17:26:25 2010 New Revision: 1029428 URL: http://svn.apache.org/viewvc?rev=1029428&view=rev Log: update to V7 of apache parent pom Modified: tomcat/taglibs/standard/trunk/compat/pom.xml tomcat/taglibs/standard/trunk/impl/pom.xml tomcat/taglibs/standard/trunk/jstlel/pom.xml Modified: tomcat/taglibs/standard/trunk/compat/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1029428&r1=1029427&r2=1029428&view=diff == --- tomcat/taglibs/standard/trunk/compat/pom.xml (original) +++ tomcat/taglibs/standard/trunk/compat/pom.xml Sun Oct 31 17:26:25 2010 @@ -120,11 +120,6 @@ - -UTF-8 -UTF-8 - - Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1029428&r1=1029427&r2=1029428&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Sun Oct 31 17:26:25 2010 @@ -116,11 +116,6 @@ - -UTF-8 -UTF-8 - - Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/pom.xml?rev=1029428&r1=1029427&r2=1029428&view=diff == --- tomcat/taglibs/standard/trunk/jstlel/pom.xml (original) +++ tomcat/taglibs/standard/trunk/jstlel/pom.xml Sun Oct 31 17:26:25 2010 @@ -120,11 +120,6 @@ - -UTF-8 -UTF-8 - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1029947 - in /tomcat/taglibs/standard/trunk: compat/pom.xml impl/pom.xml jstlel/pom.xml spec/pom.xml
Author: jboynes Date: Tue Nov 2 04:10:22 2010 New Revision: 1029947 URL: http://svn.apache.org/viewvc?rev=1029947&view=rev Log: revert bundle packaging as it breaks Gump Modified: tomcat/taglibs/standard/trunk/compat/pom.xml tomcat/taglibs/standard/trunk/impl/pom.xml tomcat/taglibs/standard/trunk/jstlel/pom.xml tomcat/taglibs/standard/trunk/spec/pom.xml Modified: tomcat/taglibs/standard/trunk/compat/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1029947&r1=1029946&r2=1029947&view=diff == --- tomcat/taglibs/standard/trunk/compat/pom.xml (original) +++ tomcat/taglibs/standard/trunk/compat/pom.xml Tue Nov 2 04:10:22 2010 @@ -32,7 +32,6 @@ taglibs-standard-compat 1.2-SNAPSHOT - bundle Apache Standard Taglib - JSTL 1.0 Compatibility Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1029947&r1=1029946&r2=1029947&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Tue Nov 2 04:10:22 2010 @@ -32,7 +32,6 @@ taglibs-standard-impl 1.2-SNAPSHOT - bundle Apache Standard Taglib - JSTL Implementation Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/pom.xml?rev=1029947&r1=1029946&r2=1029947&view=diff == --- tomcat/taglibs/standard/trunk/jstlel/pom.xml (original) +++ tomcat/taglibs/standard/trunk/jstlel/pom.xml Tue Nov 2 04:10:22 2010 @@ -32,7 +32,6 @@ taglibs-standard-jstlel 1.2-SNAPSHOT - bundle Apache Standard Taglib - JSTL 1.0 EL Support Modified: tomcat/taglibs/standard/trunk/spec/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/pom.xml?rev=1029947&r1=1029946&r2=1029947&view=diff == --- tomcat/taglibs/standard/trunk/spec/pom.xml (original) +++ tomcat/taglibs/standard/trunk/spec/pom.xml Tue Nov 2 04:10:22 2010 @@ -28,7 +28,6 @@ taglibs-standard-spec 1.2-SNAPSHOT - bundle Apache Standard Taglib - JSTL Specification API - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1030841 - in /tomcat/taglibs/standard/trunk: compat/pom.xml impl/pom.xml jstlel/pom.xml spec/pom.xml
Author: jboynes Date: Thu Nov 4 06:01:40 2010 New Revision: 1030841 URL: http://svn.apache.org/viewvc?rev=1030841&view=rev Log: re-enable bundle packaging now Gump uses install goal Modified: tomcat/taglibs/standard/trunk/compat/pom.xml tomcat/taglibs/standard/trunk/impl/pom.xml tomcat/taglibs/standard/trunk/jstlel/pom.xml tomcat/taglibs/standard/trunk/spec/pom.xml Modified: tomcat/taglibs/standard/trunk/compat/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1030841&r1=1030840&r2=1030841&view=diff == --- tomcat/taglibs/standard/trunk/compat/pom.xml (original) +++ tomcat/taglibs/standard/trunk/compat/pom.xml Thu Nov 4 06:01:40 2010 @@ -32,6 +32,7 @@ taglibs-standard-compat 1.2-SNAPSHOT + bundle Apache Standard Taglib - JSTL 1.0 Compatibility Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1030841&r1=1030840&r2=1030841&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Thu Nov 4 06:01:40 2010 @@ -32,7 +32,8 @@ taglibs-standard-impl 1.2-SNAPSHOT - + bundle + Apache Standard Taglib - JSTL Implementation 2001 Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/pom.xml?rev=1030841&r1=1030840&r2=1030841&view=diff == --- tomcat/taglibs/standard/trunk/jstlel/pom.xml (original) +++ tomcat/taglibs/standard/trunk/jstlel/pom.xml Thu Nov 4 06:01:40 2010 @@ -32,6 +32,7 @@ taglibs-standard-jstlel 1.2-SNAPSHOT + bundle Apache Standard Taglib - JSTL 1.0 EL Support Modified: tomcat/taglibs/standard/trunk/spec/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/pom.xml?rev=1030841&r1=1030840&r2=1030841&view=diff == --- tomcat/taglibs/standard/trunk/spec/pom.xml (original) +++ tomcat/taglibs/standard/trunk/spec/pom.xml Thu Nov 4 06:01:40 2010 @@ -28,7 +28,8 @@ taglibs-standard-spec 1.2-SNAPSHOT - + bundle + Apache Standard Taglib - JSTL Specification API 2001 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1034762 [2/2] - in /tomcat/taglibs/standard/trunk: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ impl/src/
Modified:
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==
---
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java
(original)
+++
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java
Sat Nov 13 14:11:15 2010
@@ -29,10 +29,12 @@ public class TestSetTag
super(name);
}
+@Override
protected void setUp() throws Exception {
super.setUp();
}
+@Override
protected void tearDown() throws Exception {
super.tearDown();
}
Modified:
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==
---
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java
(original)
+++
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java
Sat Nov 13 14:11:15 2010
@@ -27,10 +27,12 @@ public class TestDateTag extends JspTest
super(name);
}
+@Override
protected void setUp() throws Exception {
super.setUp();
}
+@Override
protected void tearDown() throws Exception {
super.tearDown();
}
Modified:
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==
---
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java
(original)
+++
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java
Sat Nov 13 14:11:15 2010
@@ -28,6 +28,7 @@ public class Test33054 extends JspTestCa
super(name);
}
+@Override
protected void setUp() throws Exception {
super.setUp();
Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
@@ -47,6 +48,7 @@ public class Test33054 extends JspTestCa
conn.close();
}
+@Override
protected void tearDown() throws Exception {
super.tearDown();
Connection conn = DriverManager.getConnection("jdbc:derby:cactustest");
Modified:
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==
---
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java
(original)
+++
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java
Sat Nov 13 14:11:15 2010
@@ -28,6 +28,7 @@ public class Test43831 extends JspTestCa
super(name);
}
+@Override
protected void setUp() throws Exception {
super.setUp();
Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
@@ -47,6 +48,7 @@ public class Test43831 extends JspTestCa
conn.close();
}
+@Override
protected void tearDown() throws Exception {
super.tearDown();
Connection conn = DriverManager.getConnection("jdbc:derby:cactustest");
Modified:
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java?rev=1034762&r1=1034761&r2=1034762&view=diff
==
---
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java
(original)
+++
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java
Sat Nov 13 14:11:15 2010
@@ -27,10 +27,12 @@ public class Test30068 extends JspTestCa
super(name);
}
svn commit: r1034773 - /tomcat/taglibs/standard/trunk/README_src.txt
Author: jboynes Date: Sat Nov 13 14:49:48 2010 New Revision: 1034773 URL: http://svn.apache.org/viewvc?rev=1034773&view=rev Log: update README_src.txt for new build environment Modified: tomcat/taglibs/standard/trunk/README_src.txt Modified: tomcat/taglibs/standard/trunk/README_src.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/README_src.txt?rev=1034773&r1=1034772&r2=1034773&view=diff == --- tomcat/taglibs/standard/trunk/README_src.txt (original) +++ tomcat/taglibs/standard/trunk/README_src.txt Sat Nov 13 14:49:48 2010 @@ -1,344 +1,51 @@ --- -Standard Tag Library 1.1 -- SOURCE DISTRIBUTION +Apache Standard Tag Library 1.2 -- SOURCE DISTRIBUTION --- -Thanks for downloading the source code of the Standard tag library, -an implementation of the JavaServer Pages(tm)(JSP) -Standard Tag Library (JSTL). - -JSTL is an effort of the Java Community Process (JCP) and -comes out of the JSR-052 expert group. For more information on JSTL, -please go to http://java.sun.com/products/jstl. +Thanks for downloading the source code for the Apache Software Foundation's +implementation of the JavaServer Pages(tm)(JSP) Standard Tag Library (JSTL) +specification. This code is licensed to you by the Apache Software +Foundation and its contributors under the terms of the Apache License V2.0; +please see the included NOTICE.txt and LICENSE.txt files for details. --- BUILD ENVIRONMENT SETUP -J2SE (Java 2 Standard Edition) +For the 1.2 release, the project migrated to the Apache Maven build system. +Download and install version 2.2 or higher from http://maven.apache.org -Download and install Sun's distribution of J2SE 1.4.2 (or higher) -for your operating system platform. J2SE can be found at -http://java.sun.com/j2se. - -Sun's distribution of J2SE 1.4.2 includes many of the libraries that -standard 1.1 depends on. However, please note that standard 1.1 will -compile and run on previous versions of J2SE (from 1.3 up to 1.4.1) as -long as the standard 1.1 dependencies not included in these versions -of the J2SE are properly setup. See section 'LIBRARY DEPENDENCIES' -for details. - - - Set a JAVA_HOME environment variable to point at the directory -where J2SE is installed. - - Add the JAVA_HOME/bin directory to your PATH. - -Ant - -Download and install version 1.5 or higher of the Jakarta Ant Project -distribution. Ant can be fount at http://ant.apache.org. - - - Set the ANT_HOME environment variable to point at your Ant -distribution directory - - Add the ANT_HOME/bin directory to your PATH. +The build requires a Java Development Kit Version 5 or higher. --- -LIBRARY DEPENDENCIES +BUILDING -This version of the Standard Tag Library has the following compile-time -dependencies: +From the 'standard' directory, the entire project can be built with the +normal Maven goals: - 1. Dependencies not included in J2SE: - - Servlet 2.4 - - JSP 2.0 - - 2. Dependencies included in newer J2SEs (1.4.2 and higher) - - JAXP 1.2 - - Xalan 2.5 - - JDBC Standard Extension 2.0 - -Since all of the dependencies in (2) are included in Sun's -distribution of J2SE 1.4.2 (or higher), this is therefore the J2SE -version of choice to compile and run the standard tag library. - -If you still need the jar files for the dependencies listed in (2), -instructions on where you can get these jar files are included below. - -build.properties - -- Copy the file standard/build_sample_standard.properties to build.properties. - -- Edit build.properties and make the following modifications: -- Set the "base.dir" property in build.properties to the base directory - of your 'standard' distribution. It must be an absolute path. -- Set the jar file properties to the absolute path and filename - for the jar files required to build the standard tag library - (see below). - -Servlet 2.4 and JSP 2.0 - -Download and install the Servlet 2.4 and JSP 2.0 APIs. The jar files -for these APIs may be found in distributions of jakarta-servlet-api-5-bin -and jakarta-jsp-api-5-bin at http://cvs.apache.org/builds/jakarta-tomcat-5/nightly. -They are also included in Tomcat 5, available at http://jakarta.apache.org/tomcat. - -Set the following properties in build.properties to the -file paths of the jars: - - servlet24.jar - - jsp20.jar - -JAXP 1.2 -[required only if building with versions of J2SE that do not include -the JAXP APIs, such as J2SE 1.3] - -The JAXP 1.2 jar files can be obtained in the Java Web Servic
svn commit: r1034805 - in /tomcat/taglibs/standard/trunk: compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ impl/src/main
Author: jboynes Date: Sat Nov 13 16:52:19 2010 New Revision: 1034805 URL: http://svn.apache.org/viewvc?rev=1034805&view=rev Log: apply patch from Sebb for #50266 to fix javadoc and imports Modified: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/OutTag.java tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java Modified: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java?rev=1034805&r1=1034804&r2=1034805&view=diff == --- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java (original) +++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java Sat Nov 13 16:52:19 2010 @@ -1,12 +1,8 @@ package org.apache.taglibs.standard.tag.compat.core; import java.util.Collections; -import javax.el.ExpressionFactory; import javax.el.ValueExpression; -import javax.servlet.jsp.JspApplicationContext; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspFactory; - import org.apache.taglibs.standard.tag.common.core.ForEachSupport; import org.apache.taglibs.standard.util.ExpressionUtil; Modified: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java?rev=1034805&r1=1034804&r2=1034805&view=diff == --- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java (original) +++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java Sat Nov 13 16:52:19 2010 @@ -1,11 +1,7 @@ package org.apache.taglibs.standard.tag.compat.core; -import javax.el.ExpressionFactory; import javax.el.ValueExpression; -import javax.servlet.jsp.JspApplicationContext; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspFactory; - import org.apache.taglibs.standard.tag.common.core.ForTokensSupport; import org.apache.taglibs.standard.util.ExpressionUtil; Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java?rev=1034805&r1=1034804&r2=1034805&view=diff == --- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java (original) +++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java Sat Nov 13 16:52:19 2010 @@ -161,7 +161,7 @@ public abstract class BundleSupport exte * javax.servlet.jsp.jstl.fmt.fallbackLocale configuration * setting) and the available locales, for the given base name. * - * @param pageContext Page in which the resource bundle with the + * @param pc Page in which the resource bundle with the * given base name is requested * @param basename Resource bundle base name * Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java?rev=1034805&r1=1034804&r2=1034805&view=diff =
svn commit: r1035039 - in /tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core: ParamTag.java RedirectTag.java SetTag.java UrlTag.java WhenTag.java
Author: jboynes
Date: Sun Nov 14 18:32:53 2010
New Revision: 1035039
URL: http://svn.apache.org/viewvc?rev=1035039&view=rev
Log:
add remaining core tags for compat module
Added:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ParamTag.java
(with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java
(with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/SetTag.java
(with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/UrlTag.java
(with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/WhenTag.java
(with props)
Added:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ParamTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ParamTag.java?rev=1035039&view=auto
==
---
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ParamTag.java
(added)
+++
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ParamTag.java
Sun Nov 14 18:32:53 2010
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.taglibs.standard.tag.compat.core;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.core.ParamSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ */
+public class ParamTag extends ParamSupport {
+
+private ValueExpression nameExpression;
+private ValueExpression valueExpression;
+
+public ParamTag() {
+}
+
+@Override
+public int doStartTag() throws JspException {
+name = (String) nameExpression.getValue(pageContext.getELContext());
+value = (String) valueExpression.getValue(pageContext.getELContext());
+return super.doStartTag();
+}
+
+@Override
+public void release() {
+nameExpression = null;
+valueExpression = null;
+super.release();
+}
+
+public void setName(String name) {
+nameExpression = ExpressionUtil.createValueExpression(pageContext,
name, String.class);
+}
+
+public void setValue(String value) {
+valueExpression = ExpressionUtil.createValueExpression(pageContext,
value, String.class);
+}
+}
Propchange:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ParamTag.java
--
svn:eol-style = native
Added:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java?rev=1035039&view=auto
==
---
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java
(added)
+++
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java
Sun Nov 14 18:32:53 2010
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS
svn commit: r1037280 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Sat Nov 20 17:58:31 2010 New Revision: 1037280 URL: http://svn.apache.org/viewvc?rev=1037280&view=rev Log: remove taglib report as it fails due to multiple tlds Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1037280&r1=1037279&r2=1037280&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sat Nov 20 17:58:31 2010 @@ -149,10 +149,6 @@ -net.sourceforge.maven-taglib -maven-taglib-plugin - - maven-javadoc-plugin true - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1037284 [6/12] - in /tomcat/taglibs/standard/trunk/jstlel: ./ src/main/java/org/apache/taglibs/standard/lang/jstl/ src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ src/main/jav
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java?rev=1037284&r1=1037283&r2=1037284&view=diff
==
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java
Sat Nov 20 18:14:00 2010
@@ -13,62 +13,59 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.lang.jstl;
/**
- *
* This is the superclass for all relational operators (except ==
* or !=)
- *
+ *
* @author Nathan Abramson - Art Technology Group
* @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
- **/
+ */
public abstract class RelationalOperator
- extends BinaryOperator
-{
- //-
- /**
- *
- * Applies the operator to the given value
- **/
- public Object apply (Object pLeft,
- Object pRight,
- Object pContext,
- Logger pLogger)
-throws ELException
- {
-return Coercions.applyRelationalOperator (pLeft, pRight, this, pLogger);
- }
-
- //-
- /**
- *
- * Applies the operator to the given double values
- **/
- public abstract boolean apply (double pLeft,
-double pRight,
-Logger pLogger);
-
- //-
- /**
- *
- * Applies the operator to the given long values
- **/
- public abstract boolean apply (long pLeft,
-long pRight,
-Logger pLogger);
-
- //-
- /**
- *
- * Applies the operator to the given String values
- **/
- public abstract boolean apply (String pLeft,
-String pRight,
-Logger pLogger);
+extends BinaryOperator {
+//-
+
+/**
+ * Applies the operator to the given value
+ */
+public Object apply(Object pLeft,
+Object pRight,
+Object pContext,
+Logger pLogger)
+throws ELException {
+return Coercions.applyRelationalOperator(pLeft, pRight, this, pLogger);
+}
+
+//-
+
+/**
+ * Applies the operator to the given double values
+ */
+public abstract boolean apply(double pLeft,
+ double pRight,
+ Logger pLogger);
+
+//-
+
+/**
+ * Applies the operator to the given long values
+ */
+public abstract boolean apply(long pLeft,
+ long pRight,
+ Logger pLogger);
+
+//-
+
+/**
+ * Applies the operator to the given String values
+ */
+public abstract boolean apply(String pLeft,
+ String pRight,
+ Logger pLogger);
- //-
+//-
}
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java?rev=1037284&r1=1037283&r2=1037284&view=diff
==
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
Sat Nov 20 18:14:00 2010
@@ -13,172 +13,156 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.lang.jstl;
/**
- *
* An expression representing a String literal value.
- *
+ *
* @author Nathan Abramson - Art Technology Group
* @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
- **/
+ */
public class StringLiteral
- extends Literal
-{
- //-
- /**
- *
- * Construct
svn commit: r1037284 [12/12] - in /tomcat/taglibs/standard/trunk/jstlel: ./ src/main/java/org/apache/taglibs/standard/lang/jstl/ src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ src/main/ja
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java?rev=1037284&r1=1037283&r2=1037284&view=diff
==
---
tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java
Sat Nov 20 18:14:00 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.lang.jstl.test;
@@ -21,257 +21,351 @@ import java.util.List;
import java.util.Map;
/**
- *
* This is a test bean with a set of properties
- *
+ *
* @author Nathan Abramson - Art Technology Group
* @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
- **/
+ */
+
+public class Bean1 {
+//-
+// Properties
+//-
+// property boolean1
+
+boolean mBoolean1;
+
+public boolean getBoolean1() {
+return mBoolean1;
+}
+
+public void setBoolean1(boolean pBoolean1) {
+mBoolean1 = pBoolean1;
+}
+
+//-
+// property byte1
+
+byte mByte1;
+
+public byte getByte1() {
+return mByte1;
+}
+
+public void setByte1(byte pByte1) {
+mByte1 = pByte1;
+}
+
+//-
+// property char1
+
+char mChar1;
+
+public char getChar1() {
+return mChar1;
+}
+
+public void setChar1(char pChar1) {
+mChar1 = pChar1;
+}
+
+//-
+// property short1
+
+short mShort1;
+
+public short getShort1() {
+return mShort1;
+}
+
+public void setShort1(short pShort1) {
+mShort1 = pShort1;
+}
+
+//-
+// property int1
+
+int mInt1;
+
+public int getInt1() {
+return mInt1;
+}
+
+public void setInt1(int pInt1) {
+mInt1 = pInt1;
+}
+
+//-
+// property long1
+
+long mLong1;
+
+public long getLong1() {
+return mLong1;
+}
+
+public void setLong1(long pLong1) {
+mLong1 = pLong1;
+}
+
+//-
+// property float1
+
+float mFloat1;
+
+public float getFloat1() {
+return mFloat1;
+}
+
+public void setFloat1(float pFloat1) {
+mFloat1 = pFloat1;
+}
+
+//-
+// property double1
+
+double mDouble1;
+
+public double getDouble1() {
+return mDouble1;
+}
+
+public void setDouble1(double pDouble1) {
+mDouble1 = pDouble1;
+}
+
+//-
+// property boolean2
+
+Boolean mBoolean2;
+
+public Boolean getBoolean2() {
+return mBoolean2;
+}
+
+public void setBoolean2(Boolean pBoolean2) {
+mBoolean2 = pBoolean2;
+}
+
+//-
+// property byte2
+
+Byte mByte2;
+
+public Byte getByte2() {
+return mByte2;
+}
+
+public void setByte2(Byte pByte2) {
+mByte2 = pByte2;
+}
+
+//-
+// property char2
+
+Character mChar2;
+
+public Character getChar2() {
+return mChar2;
+}
+
+public void setChar2(Character pChar2) {
+mChar2 = pChar2;
+}
+
+//-
+// property short2
+
+Short mShort2;
+
+public Short getShort2() {
+return mShort2;
+}
+
+public void setShort2(Short pShort2) {
+mShort2 = pShort2;
+}
+
+//-
+// property int2
+
+Integer mInt2;
+
+public Integer getInt2() {
+return mInt2;
+}
+
+public void setInt2(Integer pInt2) {
+mInt2 = pInt2;
+}
+
+//-
+// property long2
+
+Long mLong2;
+
+public Long getLong2() {
+return mLong2;
+}
+
+public void setLong2(Long pLong2) {
+mLong2 = pLong2;
+}
+
+//-
+// property float2
+
+Float mFloat2;
+
+public Float getFloat2() {
+return mFloat2;
+}
+
+public void setFloat2(Float pFloat2) {
+mFloat2 = pFloat2;
+}
+
+//-
+// property double2
+
+Double mDouble2;
+
+public Double getDouble2() {
+return mDouble2;
+}
svn commit: r1037286 - in /tomcat/taglibs/standard/trunk/compat: pom.xml src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java src/main/java/org/apache/taglibs/standard/tag/compat/
Author: jboynes Date: Sat Nov 20 18:16:25 2010 New Revision: 1037286 URL: http://svn.apache.org/viewvc?rev=1037286&view=rev Log: reformat code to clean up tabs Modified: tomcat/taglibs/standard/trunk/compat/pom.xml tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java Modified: tomcat/taglibs/standard/trunk/compat/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1037286&r1=1037285&r2=1037286&view=diff == --- tomcat/taglibs/standard/trunk/compat/pom.xml (original) +++ tomcat/taglibs/standard/trunk/compat/pom.xml Sat Nov 20 18:16:25 2010 @@ -20,161 +20,190 @@ Enable Cactus tests --> http://maven.apache.org/POM/4.0.0"; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - 4.0.0 - -org.apache.taglibs -taglibs-parent -1-SNAPSHOT - - - taglibs-standard-compat - 1.2-SNAPSHOT - bundle - - Apache Standard Taglib - JSTL 1.0 Compatibility - - 2001 - -An implementation of the JSP Standard Tag Library (JSTL). - - - http://tomcat.apache.org/taglibs/standard/ - - - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat - scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat - http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat - - - -Pierre Delisle -Shawn Bayern -Nathan Abramson -Hans Bergsten -Scott Hasse -Justyna Horwat -Mark Kolb -Jan Luehe -Glenn Nielsen -Dmitri Plotnikov -Felipe Leme -Henri Yandell -Bjorn Townsend - - - -Robert Goff - - - - - org.apache.taglibs - taglibs-standard-spec - 1.2-SNAPSHOT - - - org.apache.taglibs - taglibs-standard-impl - 1.2-SNAPSHOT - - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.el - el-api - 1.0 - provided - - - xalan - xalan - 2.7.1 - provided - - - - junit - junit - 4.8.1 - test - - - org.easymock - easymock - 3.0 - test - - +xmlns="http://maven.apache.org/POM/4.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +4.0.0 + +org.apache.taglibs +taglibs-parent +1-SNAPSHOT + + +taglibs-standard-compat +1.2-SNAPSHOT +bundle + +Apache Standard Taglib - JSTL 1.0 Compatibility + +2001 + +An implementation of the JSP Standard Tag Library (JSTL). + + +http://tomcat.apache.org/taglibs/standard/ + + + scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat + scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat + + http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat + + + + +Pierre Delisle + + +Shawn Bayern + + +Nathan Abramson + + +Hans Bergsten + + +Scott Hasse + + +Justyna Horwat + + +Mark Kolb + + +Jan Luehe + + +Glenn Nielsen + + +Dmitri Plotnikov + + +Felipe Leme + + +Henri Yandell + + +Bjorn Townsend + + + + + +Robert Goff + + + + + +org.apache.taglibs +taglibs-standard-spec +1.2-SNAPSHOT + + +org.apache.taglibs +taglibs-standard-impl +1.2-SNAPSHOT + + + +javax.servlet +servlet-api +2.5 +provided + + +javax.servlet.jsp +jsp-api +2.1 +provided + + +javax.el +el-api +1.0 +provided + + +xalan +xalan +2.7.1 +provided + + + +junit +junit +4.8.1 +test + + +
svn commit: r1037290 - in /tomcat/taglibs/standard/trunk: compat/pom.xml jstlel/pom.xml
Author: jboynes Date: Sat Nov 20 18:26:15 2010 New Revision: 1037290 URL: http://svn.apache.org/viewvc?rev=1037290&view=rev Log: remove extraneous package import that caused a build warning Modified: tomcat/taglibs/standard/trunk/compat/pom.xml tomcat/taglibs/standard/trunk/jstlel/pom.xml Modified: tomcat/taglibs/standard/trunk/compat/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1037290&r1=1037289&r2=1037290&view=diff == --- tomcat/taglibs/standard/trunk/compat/pom.xml (original) +++ tomcat/taglibs/standard/trunk/compat/pom.xml Sat Nov 20 18:26:15 2010 @@ -158,7 +158,6 @@ true *;version="1.2" - org.apache.x*;resolution:=optional,* Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/pom.xml?rev=1037290&r1=1037289&r2=1037290&view=diff == --- tomcat/taglibs/standard/trunk/jstlel/pom.xml (original) +++ tomcat/taglibs/standard/trunk/jstlel/pom.xml Sat Nov 20 18:26:15 2010 @@ -158,7 +158,6 @@ true *;version="1.2" - org.apache.x*;resolution:=optional,* - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1037291 [5/5] - in /tomcat/taglibs/standard/trunk/examples: src/org/apache/taglibs/standard/examples/beans/ src/org/apache/taglibs/standard/examples/i18n/ src/org/apache/taglibs/standard/
Modified: tomcat/taglibs/standard/trunk/examples/web/xml/Out.jsp URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/web/xml/Out.jsp?rev=1037291&r1=1037290&r2=1037291&view=diff == --- tomcat/taglibs/standard/trunk/examples/web/xml/Out.jsp (original) +++ tomcat/taglibs/standard/trunk/examples/web/xml/Out.jsp Sat Nov 20 18:34:03 2010 @@ -3,7 +3,7 @@ - JSTL: XML Support -- Parse / Out +JSTL: XML Support -- Parse / Out @@ -15,51 +15,67 @@ - - - - - - Expression - Result - -<%-- - - 3 + 3 - - ---%> - - $doc//sport - - - - $doc/games/country/* - - - - $doc//* - - - - $doc/games/country - - - - $doc/games/country[last()] - - - - $doc//@id - - - - $doc//count...@id='Denmark'] - - - - - + + + + + + + +Expression +Result + +<%-- + + 3 + 3 + + +--%> + +$doc//sport + + + + + +$doc/games/country/* + + + + + +$doc//* + + + + + +$doc/games/country + + + + + +$doc/games/country[last()] + + + + + +$doc//@id + + + + + +$doc//count...@id='Denmark'] + + + + + + + Modified: tomcat/taglibs/standard/trunk/examples/web/xml/Parse.jsp URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/web/xml/Parse.jsp?rev=1037291&r1=1037290&r2=1037291&view=diff == --- tomcat/taglibs/standard/trunk/examples/web/xml/Parse.jsp (original) +++ tomcat/taglibs/standard/trunk/examples/web/xml/Parse.jsp Sat Nov 20 18:34:03 2010 @@ -3,25 +3,25 @@ - JSTL: XML Support -- Parse +JSTL: XML Support -- Parse Parse from Objects and URLs - - - - foo - - - - bar - - - + + + +foo + + + +bar + + + - + Modified: tomcat/taglibs/standard/trunk/examples/web/xml/ParseWithEntities.jsp URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/web/xml/ParseWithEntities.jsp?rev=1037291&r1=1037290&r2=1037291&view=diff == --- tomcat/taglibs/standard/trunk/examples/web/xml/ParseWithEntities.jsp (original) +++ tomcat/taglibs/standard/trunk/examples/web/xml/ParseWithEntities.jsp Sat Nov 20 18:34:03 2010 @@ -3,21 +3,21 @@ - JSTL: XML Support -- Parse +JSTL: XML Support -- Parse Parse from Objects and URLs - + - -]> - - &included; - - +]> + +&included; + + Modified: tomcat/taglibs/standard/trunk/examples/web/xml/Set.jsp URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/web/xml/Set.jsp?rev=1037291&r1=1037290&r2=1037291&view=diff == --- tomcat/taglibs/standard/trunk/examples/web/xml/Set.jsp (original) +++ tomcat/taglibs/standard/trunk/examples/web/xml/Set.jsp Sat Nov 20 18:34:03 2010 @@ -2,30 +2,30 @@ - JSTL: XML Support -- Parse / Set / Out +JSTL: XML Support -- Parse / Set / Out Parse / Set / Out - - - - foo - - - - - bar - - - + + + +foo + + + + +bar + + + - + Modified: tomcat/taglibs/standard/trunk/examples/web/xml/Transform.jsp URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/web/xml/Transform.jsp?rev=1037291&r1=1037290&r2=1037
svn commit: r1037312 - in /tomcat/taglibs/standard/trunk: ./ build-tools/ build-tools/src/ build-tools/src/main/ build-tools/src/main/resources/ build-tools/src/main/resources/taglibs/ compat/ impl/ j
Author: jboynes Date: Sat Nov 20 19:47:07 2010 New Revision: 1037312 URL: http://svn.apache.org/viewvc?rev=1037312&view=rev Log: add common module for tool configuration; use common checkstyle rules for all modules Added: tomcat/taglibs/standard/trunk/build-tools/ (with props) tomcat/taglibs/standard/trunk/build-tools/pom.xml (with props) tomcat/taglibs/standard/trunk/build-tools/src/ tomcat/taglibs/standard/trunk/build-tools/src/main/ tomcat/taglibs/standard/trunk/build-tools/src/main/resources/ tomcat/taglibs/standard/trunk/build-tools/src/main/resources/taglibs/ tomcat/taglibs/standard/trunk/build-tools/src/main/resources/taglibs/checkstyle.xml (props changed) - copied unchanged from r1037291, tomcat/taglibs/standard/trunk/impl/checkstyle.xml Removed: tomcat/taglibs/standard/trunk/impl/checkstyle.xml Modified: tomcat/taglibs/standard/trunk/compat/pom.xml tomcat/taglibs/standard/trunk/impl/pom.xml tomcat/taglibs/standard/trunk/jstlel/pom.xml tomcat/taglibs/standard/trunk/pom.xml tomcat/taglibs/standard/trunk/spec/pom.xml Propchange: tomcat/taglibs/standard/trunk/build-tools/ -- --- svn:ignore (added) +++ svn:ignore Sat Nov 20 19:47:07 2010 @@ -0,0 +1,2 @@ +*.iml +target Added: tomcat/taglibs/standard/trunk/build-tools/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/build-tools/pom.xml?rev=1037312&view=auto == --- tomcat/taglibs/standard/trunk/build-tools/pom.xml (added) +++ tomcat/taglibs/standard/trunk/build-tools/pom.xml Sat Nov 20 19:47:07 2010 @@ -0,0 +1,46 @@ + + + +http://maven.apache.org/POM/4.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +4.0.0 + +org.apache.taglibs +taglibs-parent +1-SNAPSHOT + + +taglibs-build-tools +1.2-SNAPSHOT +Apache Standard Taglib - Build Tools + +Build tool settings common to all Standard Taglib modules + + + scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/build-tools + scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/build-tools + + http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/build-tools + + + Propchange: tomcat/taglibs/standard/trunk/build-tools/pom.xml -- svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/build-tools/src/main/resources/taglibs/checkstyle.xml -- svn:eol-style = native Modified: tomcat/taglibs/standard/trunk/compat/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1037312&r1=1037311&r2=1037312&view=diff == --- tomcat/taglibs/standard/trunk/compat/pom.xml (original) +++ tomcat/taglibs/standard/trunk/compat/pom.xml Sat Nov 20 19:47:07 2010 @@ -161,6 +161,18 @@ + +org.apache.maven.plugins +maven-checkstyle-plugin +2.6 + + +org.apache.taglibs +taglibs-build-tools +1.2-SNAPSHOT + + + @@ -201,6 +213,14 @@ + +org.apache.maven.plugins +maven-checkstyle-plugin +2.6 + +taglibs/checkstyle.xml + + Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1037312&r1=1037311&r2=1037312&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Sat Nov 20 19:47:07 2010 @@ -158,6 +158,18 @@ + +org.apache.maven.plugins +maven-checkstyle-plugin +2.6 + + +org.apache.taglibs +taglibs-build-tools +1.2-SNAPSHOT + + + @@ -207,7 +219,7 @@ maven-checkstyle-plugin 2.6 -
svn commit: r1042524 - /tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/
Author: jboynes Date: Mon Dec 6 06:31:18 2010 New Revision: 1042524 URL: http://svn.apache.org/viewvc?rev=1042524&view=rev Log: remove empty directory Removed: tomcat/taglibs/standard/trunk/impl/src/main/resources/org/apache/taglibs/standard/lang/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1050912 - in /tomcat/taglibs/standard/trunk/impl/src: main/java/org/apache/taglibs/standard/tag/rt/core/ test/java/org/apache/taglibs/standard/tag/rt/ test/java/org/apache/taglibs/standar
Author: jboynes
Date: Sun Dec 19 17:30:34 2010
New Revision: 1050912
URL: http://svn.apache.org/viewvc?rev=1050912&view=rev
Log:
Apply patch from Rex Wang for #50461 and add test case
Added:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/rt/
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/rt/core/
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/rt/core/OutTagTest.java
(with props)
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/OutTag.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/OutTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/OutTag.java?rev=1050912&r1=1050911&r2=1050912&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/OutTag.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/OutTag.java
Sun Dec 19 17:30:34 2010
@@ -29,7 +29,7 @@ public class OutTag extends OutSupport {
private Object value;
private String def;
-private boolean escapeXml;
+private boolean escapeXml = true;
//*
// Accessors
Added:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/rt/core/OutTagTest.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/rt/core/OutTagTest.java?rev=1050912&view=auto
==
---
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/rt/core/OutTagTest.java
(added)
+++
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/rt/core/OutTagTest.java
Sun Dec 19 17:30:34 2010
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.taglibs.standard.tag.rt.core;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ */
+public class OutTagTest {
+
+private OutTag tag = new OutTag();
+
+@Test
+public void testDefaults() {
+Assert.assertNull(tag.evalValue());
+Assert.assertNull(tag.evalDefault());
+Assert.assertTrue(tag.evalEscapeXml());
+}
+}
Propchange:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/rt/core/OutTagTest.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1050966 - in /tomcat/taglibs/standard/trunk/jstlel/src/main: java/org/apache/taglibs/standard/tlv/ java/org/apache/taglibs/standard/tlv/el/ resources/META-INF/
Author: jboynes Date: Mon Dec 20 01:09:29 2010 New Revision: 1050966 URL: http://svn.apache.org/viewvc?rev=1050966&view=rev Log: Fix #50414 by moving EL TLVs to sub-package Added: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELCoreTLV.java (contents, props changed) - copied, changed from r1050272, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELFmtTLV.java (contents, props changed) - copied, changed from r1050272, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELSqlTLV.java (contents, props changed) - copied, changed from r1050272, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELSqlTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELXmlTLV.java (contents, props changed) - copied, changed from r1050272, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELXmlTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/ValidationUtil.java (contents, props changed) - copied, changed from r1050272, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/ValidationUtil.java Removed: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELSqlTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELXmlTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/ValidationUtil.java Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/c-1_0.tld tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/fmt-1_0.tld tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/sql-1_0.tld tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/x-1_0.tld Copied: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELCoreTLV.java (from r1050272, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java) URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELCoreTLV.java?p2=tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELCoreTLV.java&p1=tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java&r1=1050272&r2=1050966&rev=1050966&view=diff == --- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELCoreTLV.java Mon Dec 20 01:09:29 2010 @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.taglibs.standard.tlv; +package org.apache.taglibs.standard.tlv.el; + +import org.apache.taglibs.standard.tlv.JstlCoreTLV; /** */ Propchange: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELCoreTLV.java -- svn:eol-style = native Copied: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELFmtTLV.java (from r1050272, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java) URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELFmtTLV.java?p2=tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELFmtTLV.java&p1=tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java&r1=1050272&r2=1050966&rev=1050966&view=diff == --- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELFmtTLV.j
svn commit: r1054176 - /tomcat/taglibs/standard/trunk/impl/pom.xml
Author: jboynes Date: Fri Dec 31 23:31:00 2010 New Revision: 1054176 URL: http://svn.apache.org/viewvc?rev=1054176&view=rev Log: remove optional OSGi dependency on org.apache.x* Modified: tomcat/taglibs/standard/trunk/impl/pom.xml Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1054176&r1=1054175&r2=1054176&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Fri Dec 31 23:31:00 2010 @@ -154,7 +154,6 @@ true *;version="1.2" - org.apache.x*;resolution:=optional,* - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1054177 - in /tomcat/taglibs/standard/trunk: compat/pom.xml impl/pom.xml jstlel/pom.xml
Author: jboynes Date: Fri Dec 31 23:38:33 2010 New Revision: 1054177 URL: http://svn.apache.org/viewvc?rev=1054177&view=rev Log: make Xalan dependency optional as only XML tags require it Modified: tomcat/taglibs/standard/trunk/compat/pom.xml tomcat/taglibs/standard/trunk/impl/pom.xml tomcat/taglibs/standard/trunk/jstlel/pom.xml Modified: tomcat/taglibs/standard/trunk/compat/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1054177&r1=1054176&r2=1054177&view=diff == --- tomcat/taglibs/standard/trunk/compat/pom.xml (original) +++ tomcat/taglibs/standard/trunk/compat/pom.xml Fri Dec 31 23:38:33 2010 @@ -133,6 +133,7 @@ xalan 2.7.1 provided +true Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1054177&r1=1054176&r2=1054177&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Fri Dec 31 23:38:33 2010 @@ -129,6 +129,7 @@ xalan 2.7.1 provided +true Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/pom.xml?rev=1054177&r1=1054176&r2=1054177&view=diff == --- tomcat/taglibs/standard/trunk/jstlel/pom.xml (original) +++ tomcat/taglibs/standard/trunk/jstlel/pom.xml Fri Dec 31 23:38:33 2010 @@ -133,6 +133,7 @@ xalan 2.7.1 provided +true - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1054183 - /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/UnresolvableException.java
Author: jboynes Date: Sat Jan 1 01:19:52 2011 New Revision: 1054183 URL: http://svn.apache.org/viewvc?rev=1054183&view=rev Log: remove obsolete exception class Removed: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/UnresolvableException.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1054436 - /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
Author: jboynes
Date: Sun Jan 2 17:34:19 2011
New Revision: 1054436
URL: http://svn.apache.org/viewvc?rev=1054436&view=rev
Log:
fix bug #50265 by undoing caching change
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java?rev=1054436&r1=1054435&r2=1054436&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
Sun Jan 2 17:34:19 2011
@@ -20,11 +20,8 @@ package org.apache.taglibs.standard.tag.
import java.io.IOException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import java.util.Collections;
import java.util.Date;
-import java.util.LinkedHashMap;
import java.util.Locale;
-import java.util.Map;
import java.util.TimeZone;
import javax.servlet.jsp.JspException;
@@ -47,25 +44,10 @@ public abstract class FormatDateSupport
//*
// Private constants
-/**
- * Name of configuration setting for maximum number of entries in the
- * cached dateformat map
- */
-private static final String DATE_CACHE_PARAM =
-"org.apache.taglibs.standard.tag.common.fmt.dateFormatCacheSize";
-
private static final String DATE = "date";
private static final String TIME = "time";
private static final String DATETIME = "both";
-private static Map dateFormatCache = null;
-
-/**
- * Default maximum cache size
- */
-private static final int MAX_SIZE = 100;
-
-
//*
// Protected state
@@ -194,82 +176,23 @@ public abstract class FormatDateSupport
// Private utility methods
private DateFormat createFormatter(Locale loc, String pattern) throws
JspException {
-DateFormat formatter = null;
-
-// lazy initialization of cache
-if (dateFormatCache == null) {
-String value =
pageContext.getServletContext().getInitParameter(DATE_CACHE_PARAM);
-final int maxSize = (value != null) ? Integer.parseInt(value) :
MAX_SIZE;
-dateFormatCache = Collections.synchronizedMap(new LinkedHashMap() {
-@Override
-protected boolean removeEldestEntry(Map.Entry eldest) {
-return size() > maxSize;
-}
-});
-}
-
// Apply pattern, if present
if (pattern != null) {
-if ((type == null) || DATE.equalsIgnoreCase(type)) {
-String key = DATE + pattern + loc;
-formatter = (DateFormat) dateFormatCache.get(key);
-if (formatter == null) {
-formatter = new SimpleDateFormat(pattern, loc);
-dateFormatCache.put(key, formatter);
-}
-} else if (TIME.equalsIgnoreCase(type)) {
-String key = TIME + pattern + loc;
-formatter = (DateFormat) dateFormatCache.get(key);
-if (formatter == null) {
-formatter = new SimpleDateFormat(pattern, loc);
-dateFormatCache.put(key, formatter);
-}
-} else if (DATETIME.equalsIgnoreCase(type)) {
-String key = DATETIME + pattern + loc;
-formatter = (DateFormat) dateFormatCache.get(key);
-if (formatter == null) {
-formatter = new SimpleDateFormat(pattern, loc);
-dateFormatCache.put(key, formatter);
-}
-} else {
-throw new JspException(
-Resources.getMessage("FORMAT_DATE_INVALID_TYPE",
-type));
-}
-return formatter;
+return new SimpleDateFormat(pattern, loc);
}
if ((type == null) || DATE.equalsIgnoreCase(type)) {
int style = Util.getStyle(dateStyle,
"FORMAT_DATE_INVALID_DATE_STYLE");
-String key = DATE + style + loc;
-formatter = (DateFormat) dateFormatCache.get(key);
-if (formatter == null) {
-formatter = DateFormat.getDateInstance(style, loc);
-dateFormatCache.put(key, formatter);
-}
+return DateFormat.getDateInstance(style, loc);
}
svn commit: r1085963 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes
Date: Sun Mar 27 15:33:57 2011
New Revision: 1085963
URL: http://svn.apache.org/viewvc?rev=1085963&view=rev
Log:
applied parent patch for #50674 from Olivier Lamy
Modified:
tomcat/taglibs/taglibs-parent/trunk/pom.xml
Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1085963&r1=1085962&r2=1085963&view=diff
==
--- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original)
+++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sun Mar 27 15:33:57 2011
@@ -23,7 +23,7 @@
org.apache
apache
-7
+8
org.apache.taglibs
@@ -109,28 +109,24 @@
org.apache.maven.plugins
maven-compiler-plugin
-2.0.2
+2.3.2
${maven.compiler.source}
${maven.compiler.target}
${project.build.sourceEncoding}
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+2.7.2
+
-maven-assembly-plugin
-
-
-src/assembly/bin.xml
-src/assembly/src.xml
-
- gnu
-
-
-
org.apache.felix
maven-bundle-plugin
2.0.1
@@ -149,14 +145,22 @@
+org.apache.maven.plugins
maven-javadoc-plugin
+2.7
true
+
+http://download.oracle.com/javase/1.4.2/1.4.2/docs/api
+http://download.oracle.com/javaee/1.4/docs/api
+http://download.oracle.com/javase/1.5.0/docs/api
+
org.apache.maven.plugins
maven-changes-plugin
+2.3
@@ -165,6 +169,21 @@
+
+org.apache.maven.plugins
+maven-jxr-plugin
+2.2
+
+
+org.apache.maven.plugins
+maven-project-info-reports-plugin
+2.2
+
+
+org.apache.maven.plugins
+maven-surefire-report-plugin
+2.7.2
+
@@ -176,4 +195,41 @@
UTF-8
+
+
+
+ maven-3
+
+
+
+ ${basedir}
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
+ 3.0-beta-3
+
+
+
+
+
+maven-site-plugin
+
+
+attach-descriptor
+
+ attach-descriptor
+
+
+
+
+
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1085964 - in /tomcat/taglibs/standard/trunk: compat/pom.xml impl/pom.xml jstlel/pom.xml spec/pom.xml
Author: jboynes
Date: Sun Mar 27 15:34:08 2011
New Revision: 1085964
URL: http://svn.apache.org/viewvc?rev=1085964&view=rev
Log:
applied standard patch for #50674 from Olivier Lamy
Modified:
tomcat/taglibs/standard/trunk/compat/pom.xml
tomcat/taglibs/standard/trunk/impl/pom.xml
tomcat/taglibs/standard/trunk/jstlel/pom.xml
tomcat/taglibs/standard/trunk/spec/pom.xml
Modified: tomcat/taglibs/standard/trunk/compat/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1085964&r1=1085963&r2=1085964&view=diff
==
--- tomcat/taglibs/standard/trunk/compat/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/compat/pom.xml Sun Mar 27 15:34:08 2011
@@ -180,6 +180,7 @@
+org.apache.maven.plugins
maven-pmd-plugin
2.3
@@ -207,7 +208,7 @@
org.codehaus.mojo
findbugs-maven-plugin
-1.2
+2.3.1
Normal
Default
Modified: tomcat/taglibs/standard/trunk/impl/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1085964&r1=1085963&r2=1085964&view=diff
==
--- tomcat/taglibs/standard/trunk/impl/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/impl/pom.xml Sun Mar 27 15:34:08 2011
@@ -176,10 +176,7 @@
-org.codehaus.mojo
-jxr-maven-plugin
-
-
+org.apache.maven.plugins
maven-pmd-plugin
2.3
@@ -207,7 +204,7 @@
org.codehaus.mojo
findbugs-maven-plugin
-1.2
+2.3.1
Normal
Default
Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/pom.xml?rev=1085964&r1=1085963&r2=1085964&view=diff
==
--- tomcat/taglibs/standard/trunk/jstlel/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/jstlel/pom.xml Sun Mar 27 15:34:08 2011
@@ -180,6 +180,7 @@
+org.apache.maven.plugins
maven-pmd-plugin
2.3
@@ -207,7 +208,7 @@
org.codehaus.mojo
findbugs-maven-plugin
-1.2
+2.3.1
Normal
Default
Modified: tomcat/taglibs/standard/trunk/spec/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/pom.xml?rev=1085964&r1=1085963&r2=1085964&view=diff
==
--- tomcat/taglibs/standard/trunk/spec/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/spec/pom.xml Sun Mar 27 15:34:08 2011
@@ -122,7 +122,7 @@
maven-bundle-plugin
-
${groupId}.${artifactId};singleton=true
+
${project.groupId}.${project.artifactId};singleton=true
JSR-052 JavaServer Pages Standard
Tag Library Specification
Sun Microsystems,
Inc.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1085965 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes
Date: Sun Mar 27 15:49:47 2011
New Revision: 1085965
URL: http://svn.apache.org/viewvc?rev=1085965&view=rev
Log:
upgrade to ASF parent 9
Modified:
tomcat/taglibs/taglibs-parent/trunk/pom.xml
Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1085965&r1=1085964&r2=1085965&view=diff
==
--- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original)
+++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sun Mar 27 15:49:47 2011
@@ -23,7 +23,7 @@
org.apache
apache
-8
+9
org.apache.taglibs
@@ -116,12 +116,6 @@
${project.build.sourceEncoding}
-
-
-org.apache.maven.plugins
-maven-surefire-plugin
-2.7.2
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1086034 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Sun Mar 27 20:49:31 2011 New Revision: 1086034 URL: http://svn.apache.org/viewvc?rev=1086034&view=rev Log: remove links to old JDK docs Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1086034&r1=1086033&r2=1086034&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sun Mar 27 20:49:31 2011 @@ -145,8 +145,6 @@ true -http://download.oracle.com/javase/1.4.2/1.4.2/docs/api -http://download.oracle.com/javaee/1.4/docs/api http://download.oracle.com/javase/1.5.0/docs/api - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1086035 - /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
Author: jboynes
Date: Sun Mar 27 20:53:10 2011
New Revision: 1086035
URL: http://svn.apache.org/viewvc?rev=1086035&view=rev
Log:
fix warning from JavaDoc report
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java?rev=1086035&r1=1086034&r2=1086035&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
Sun Mar 27 20:53:10 2011
@@ -34,7 +34,8 @@ import org.apache.taglibs.standard.resou
* subtag for <import> in JSTL 1.0.
*
* @author Shawn Bayern
- * @see ParamParent, ImportSupport, URLEncodeSupport
+ * @see ParamParent
+ * @see ImportSupport
*/
public abstract class ParamSupport extends BodyTagSupport {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662635 - in /tomcat/taglibs/site: changes.xml src/site/xdoc/index.xml src/site/xdoc/standard/index.xml
Author: jboynes Date: Fri Feb 27 05:31:51 2015 New Revision: 1662635 URL: http://svn.apache.org/r1662635 Log: Update taglibs website for 1.2.3 release Modified: tomcat/taglibs/site/changes.xml tomcat/taglibs/site/src/site/xdoc/index.xml tomcat/taglibs/site/src/site/xdoc/standard/index.xml Modified: tomcat/taglibs/site/changes.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/changes.xml?rev=1662635&r1=1662634&r2=1662635&view=diff == --- tomcat/taglibs/site/changes.xml (original) +++ tomcat/taglibs/site/changes.xml Fri Feb 27 05:31:51 2015 @@ -21,6 +21,8 @@ + + Modified: tomcat/taglibs/site/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/src/site/xdoc/index.xml?rev=1662635&r1=1662634&r2=1662635&view=diff == --- tomcat/taglibs/site/src/site/xdoc/index.xml (original) +++ tomcat/taglibs/site/src/site/xdoc/index.xml Fri Feb 27 05:31:51 2015 @@ -46,6 +46,12 @@ + 2015/02/20 +[Standard] + +The Apache Standard Taglib 1.2.3, a minor bugfix version, has been released. + + 2014/01/02 [Standard] Modified: tomcat/taglibs/site/src/site/xdoc/standard/index.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/src/site/xdoc/standard/index.xml?rev=1662635&r1=1662634&r2=1662635&view=diff == --- tomcat/taglibs/site/src/site/xdoc/standard/index.xml (original) +++ tomcat/taglibs/site/src/site/xdoc/standard/index.xml Fri Feb 27 05:31:51 2015 @@ -39,7 +39,7 @@ Getting the Taglib -Standard 1.2.1 +Standard 1.2.3 JSTL 1.2 Servlet 2.5, JavaServer Pages 2.1 http://tomcat.apache.org/download-taglibs.cgi";>download (javadoc) @@ -67,6 +67,10 @@ Item +2015/02/20 +The Apache Standard Taglib 1.2.3, a minor bugfix version, has been released. + + 2014/01/02 The Apache Standard Taglib 1.2.1, an implementation of JSTL 1.2, has been released. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662637 - in /tomcat/site/trunk: docs/ docs/taglibs/ docs/taglibs/site/ docs/taglibs/standard/ xdocs/
Author: jboynes Date: Fri Feb 27 05:43:12 2015 New Revision: 1662637 URL: http://svn.apache.org/r1662637 Log: Update Tomcat site for Taglibs 1.2.3 release Modified: tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/docs/taglibs/dependencies.html tomcat/site/trunk/docs/taglibs/dependency-info.html tomcat/site/trunk/docs/taglibs/distribution-management.html tomcat/site/trunk/docs/taglibs/index.html tomcat/site/trunk/docs/taglibs/integration.html tomcat/site/trunk/docs/taglibs/issue-tracking.html tomcat/site/trunk/docs/taglibs/license.html tomcat/site/trunk/docs/taglibs/mail-lists.html tomcat/site/trunk/docs/taglibs/plugin-management.html tomcat/site/trunk/docs/taglibs/plugins.html tomcat/site/trunk/docs/taglibs/project-info.html tomcat/site/trunk/docs/taglibs/project-reports.html tomcat/site/trunk/docs/taglibs/project-summary.html tomcat/site/trunk/docs/taglibs/site/building.html tomcat/site/trunk/docs/taglibs/site/news.html tomcat/site/trunk/docs/taglibs/site/tutorial.html tomcat/site/trunk/docs/taglibs/site/using.html tomcat/site/trunk/docs/taglibs/source-repository.html tomcat/site/trunk/docs/taglibs/standard/index.html tomcat/site/trunk/docs/taglibs/surefire-report.html tomcat/site/trunk/docs/taglibs/team-list.html tomcat/site/trunk/xdocs/download-taglibs.xml Modified: tomcat/site/trunk/docs/download-taglibs.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1662637&r1=1662636&r2=1662637&view=diff == --- tomcat/site/trunk/docs/download-taglibs.html (original) +++ tomcat/site/trunk/docs/download-taglibs.html Fri Feb 27 05:43:12 2015 @@ -204,7 +204,7 @@ https://www.apache.org/dist/tomcat/taglibs/KEYS";>KEYS | -Standard Taglib 1.2.1 | +Standard Taglib 1.2.3 | Browse | http://archive.apache.org/dist/tomcat/taglibs/";>Archives @@ -252,7 +252,7 @@ -Standard-1.2.1 +Standard-1.2.3 @@ -264,15 +264,15 @@ -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/README_src.txt"; rel="nofollow">Source README +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/README_src.txt"; rel="nofollow">Source README -zip - (https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-1.2.1-source-release.zip.asc";>pgp, - https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-1.2.1-source-release.zip.md5";>md5) +zip + (https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-1.2.3-source-release.zip.asc";>pgp, + https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-1.2.3-source-release.zip.md5";>md5) @@ -289,7 +289,7 @@ -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/README_bin.txt"; rel="nofollow">Binary README +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/README_bin.txt"; rel="nofollow">Binary README @@ -298,9 +298,9 @@ -taglibs-standard-impl-1.2.1.jar -(https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-impl-1.2.1.jar.asc";>pgp, -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-impl-1.2.1.jar.md5";>md5) +taglibs-standard-impl-1.2.3.jar +(https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-impl-1.2.3.jar.asc";>pgp, +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-impl-1.2.3.jar.md5";>md5) @@ -312,9 +312,9 @@ -taglibs-standard-spec-1.2.1.jar -(https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-spec-1.2.1.jar.asc";>pgp, -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-spec-1.2.1.jar.md5";>md5) +taglibs-standard-spec-1.2.3.jar +(https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-spec-1.2.3.jar.asc";>pgp, +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-spec-1.2.3.jar.md5";>md5) @@ -326,9 +326,9 @@ -taglibs-standard-jstlel-1.2.1.jar -(https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.1/taglibs-standard-jstlel-1.2.1.jar.asc";>pgp, -https://www.apache.org
svn commit: r1662736 - in /tomcat/trunk/webapps/examples/WEB-INF/lib: jstl.jar standard.jar taglibs-standard-impl-1.2.3.jar taglibs-standard-spec-1.2.3.jar
Author: jboynes Date: Fri Feb 27 16:26:21 2015 New Revision: 1662736 URL: http://svn.apache.org/r1662736 Log: Replace old taglibs library with Apache Standard Taglib 1.2.3 Added: tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar Removed: tomcat/trunk/webapps/examples/WEB-INF/lib/jstl.jar tomcat/trunk/webapps/examples/WEB-INF/lib/standard.jar Added: tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar?rev=1662736&view=auto == Binary files tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar (added) and tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar Fri Feb 27 16:26:21 2015 differ Added: tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar?rev=1662736&view=auto == Binary files tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar (added) and tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar Fri Feb 27 16:26:21 2015 differ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662747 - in /tomcat/tc8.0.x/trunk: ./ webapps/examples/WEB-INF/lib/jstl.jar webapps/examples/WEB-INF/lib/standard.jar webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar webapps
Author: jboynes Date: Fri Feb 27 16:50:07 2015 New Revision: 1662747 URL: http://svn.apache.org/r1662747 Log: Backport r1662736 to fix #57644 Update examples to use Apache Taglibs 1.2.3 Added: tomcat/tc8.0.x/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar - copied unchanged from r1662736, tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar tomcat/tc8.0.x/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar - copied unchanged from r1662736, tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar Removed: tomcat/tc8.0.x/trunk/webapps/examples/WEB-INF/lib/jstl.jar tomcat/tc8.0.x/trunk/webapps/examples/WEB-INF/lib/standard.jar Modified: tomcat/tc8.0.x/trunk/ (props changed) Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 27 16:50:07 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815
svn commit: r1662749 - in /tomcat/tc7.0.x/trunk: ./ conf/ webapps/examples/WEB-INF/lib/
Author: jboynes Date: Fri Feb 27 17:02:52 2015 New Revision: 1662749 URL: http://svn.apache.org/r1662749 Log: Backport r1662736 to fix #57644 Update examples to use Apache Taglibs 1.2.3 Exclude taglibs-standard-spec API jar from TLD scanning Added: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar - copied unchanged from r1662736, tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar - copied unchanged from r1662736, tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar Removed: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/lib/jstl.jar tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/lib/standard.jar Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/conf/catalina.properties Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 27 17:02:52 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190-1659191,1659266,1659294,1659308,1659383,1659386,1659429,1659472,1659507,1659517,1659522,1659563,1659807 ,1659816,1659835-1659864,1659968,1660953,1660970,1662178,1662537,1662549,1662551,1662627,1662632 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461
svn commit: r1662753 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jboynes Date: Fri Feb 27 17:12:08 2015 New Revision: 1662753 URL: http://svn.apache.org/r1662753 Log: Proposal to backport r1662736 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1662753&r1=1662752&r2=1662753&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Feb 27 17:12:08 2015 @@ -28,7 +28,9 @@ None PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] -None + 1) http://svn.apache.org/r1662736 + Update examples to use Apache Standard Taglibs 1.2.3 + +1: jboynes PATCHES/ISSUES THAT ARE STALLED: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662988 - in /tomcat/trunk: java/org/apache/jasper/servlet/TldScanner.java test/org/apache/jasper/servlet/TestTldScanner.java
Author: jboynes
Date: Sat Feb 28 18:59:14 2015
New Revision: 1662988
URL: http://svn.apache.org/r1662988
Log:
Add repro for #57647
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java
Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1662988&r1=1662987&r2=1662988&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Sat Feb 28
18:59:14 2015
@@ -277,7 +277,7 @@ public class TldScanner {
}
}
-private class TldScannerCallback implements JarScannerCallback {
+class TldScannerCallback implements JarScannerCallback {
private boolean tldFound = false;
private boolean jarFound = false;
@@ -381,7 +381,7 @@ public class TldScanner {
}
-private boolean scanFoundNoTLDs() {
+boolean scanFoundNoTLDs() {
return jarFound && !tldFound;
}
}
Modified: tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java?rev=1662988&r1=1662987&r2=1662988&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java (original)
+++ tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java Sat Feb 28
18:59:14 2015
@@ -17,11 +17,15 @@
package org.apache.jasper.servlet;
import java.io.File;
+import java.lang.reflect.Constructor;
+import java.net.JarURLConnection;
+import java.net.URL;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -29,6 +33,7 @@ import org.apache.catalina.startup.Tomca
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.scan.StandardJarScanner;
+import org.easymock.EasyMock;
public class TestTldScanner extends TomcatBaseTest {
@@ -86,4 +91,30 @@ public class TestTldScanner extends Tomc
Assert.assertTrue(result, result.indexOf("" + expected + "") >
0);
}
+@Ignore("Illustrates Bug 57647")
+@Test
+public void testBug57647() throws Exception {
+TldScanner scanner = EasyMock.createMock(TldScanner.class);
+Constructor constructor =
+
TldScanner.TldScannerCallback.class.getDeclaredConstructor(TldScanner.class);
+constructor.setAccessible(true);
+TldScanner.TldScannerCallback callback =
constructor.newInstance((TldScanner) scanner);
+
+File webappDir = new File("webapps/examples");
+Assert.assertFalse(callback.scanFoundNoTLDs());
+scan(callback, webappDir,
"WEB-INF/lib/taglibs-standard-spec-1.2.3.jar");
+Assert.assertTrue(callback.scanFoundNoTLDs());
+scan(callback, webappDir,
"WEB-INF/lib/taglibs-standard-impl-1.2.3.jar");
+Assert.assertTrue(callback.scanFoundNoTLDs());
+}
+
+private static void scan(TldScanner.TldScannerCallback callback, File
webapp, String path)
+throws Exception {
+String fullPath = new File(webapp, path).toURI().toString();
+URL jarUrl = new URL("jar:" + fullPath + "!/");
+JarURLConnection connection = (JarURLConnection)
jarUrl.openConnection();
+callback.scan(connection, path, true);
+}
+
}
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662989 - in /tomcat/trunk: java/org/apache/jasper/servlet/TldScanner.java test/org/apache/jasper/servlet/TestTldScanner.java
Author: jboynes
Date: Sat Feb 28 18:59:16 2015
New Revision: 1662989
URL: http://svn.apache.org/r1662989
Log:
Log warning if any jar scan does not find a TLD
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java
Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1662989&r1=1662988&r2=1662989&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Sat Feb 28
18:59:16 2015
@@ -278,17 +278,13 @@ public class TldScanner {
}
class TldScannerCallback implements JarScannerCallback {
-private boolean tldFound = false;
-private boolean jarFound = false;
+private boolean foundJarWithoutTld = false;
@Override
public void scan(JarURLConnection urlConn, String webappPath,
boolean isWebapp) throws IOException {
-if (!jarFound) {
-jarFound = true;
-}
boolean found = false;
-URL jarURL = null;
+URL jarURL;
try (Jar jar = JarFactory.newInstance(urlConn.getURL())) {
jarURL = jar.getJarFileURL();
jar.nextEntry();
@@ -309,9 +305,8 @@ public class TldScanner {
}
}
}
-if (found) {
-tldFound = true;
-} else {
+if (!found) {
+foundJarWithoutTld = true;
if (log.isDebugEnabled()) {
log.debug(Localizer.getMessage("jsp.tldCache.noTldInJar",
jarURL.toString()));
@@ -322,9 +317,6 @@ public class TldScanner {
@Override
public void scan(File file, final String webappPath, boolean isWebapp)
throws IOException {
-if (!jarFound) {
-jarFound = true;
-}
File metaInf = new File(file, "META-INF");
if (!metaInf.isDirectory()) {
return;
@@ -356,7 +348,6 @@ public class TldScanner {
URL url = file.toUri().toURL();
TldResourcePath path = new TldResourcePath(url,
resourcePath);
parseTld(path);
-tldFound = true;
} catch (SAXException e) {
throw new IOException(e);
}
@@ -382,7 +373,7 @@ public class TldScanner {
boolean scanFoundNoTLDs() {
-return jarFound && !tldFound;
+return foundJarWithoutTld;
}
}
}
Modified: tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java?rev=1662989&r1=1662988&r2=1662989&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java (original)
+++ tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java Sat Feb 28
18:59:16 2015
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -91,14 +90,13 @@ public class TestTldScanner extends Tomc
Assert.assertTrue(result, result.indexOf("" + expected + "") >
0);
}
-@Ignore("Illustrates Bug 57647")
@Test
public void testBug57647() throws Exception {
TldScanner scanner = EasyMock.createMock(TldScanner.class);
Constructor constructor =
TldScanner.TldScannerCallback.class.getDeclaredConstructor(TldScanner.class);
constructor.setAccessible(true);
-TldScanner.TldScannerCallback callback =
constructor.newInstance((TldScanner) scanner);
+TldScanner.TldScannerCallback callback =
constructor.newInstance(scanner);
File webappDir = new File("webapps/examples");
Assert.assertFalse(callback.scanFoundNoTLDs());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1662991 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/servlet/TldScanner.java test/org/apache/jasper/servlet/TestTldScanner.java
Author: jboynes Date: Sat Feb 28 19:34:09 2015 New Revision: 1662991 URL: http://svn.apache.org/r1662991 Log: Backport fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57647 Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/TldScanner.java tomcat/tc8.0.x/trunk/test/org/apache/jasper/servlet/TestTldScanner.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 28 19:34:09 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648
