[Bug 57549] pom.xml files of Standard taglib reference 1.2-SNAPSHOT build of taglibs-build-tools
https://issues.apache.org/bugzilla/show_bug.cgi?id=57549 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Konstantin Kolinko --- Fixed by r1658295, will be in 1.2.3. Tested with "mvn checkstyle:checkstyle" and "mvn checkstyle:check" -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658297 - in /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common: core/ForEachSupport.java fmt/LocaleUtil.java sql/DataSourceWrapper.java
Author: kkolinko Date: Mon Feb 9 03:10:22 2015 New Revision: 1658297 URL: http://svn.apache.org/r1658297 Log: Fix checkstyle warnings: Java imports formatting. Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtil.java 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/core/ForEachSupport.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java?rev=1658297&r1=1658296&r2=1658297&view=diff == --- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java (original) +++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java Mon Feb 9 03:10:22 2015 @@ -17,7 +17,13 @@ package org.apache.taglibs.standard.tag.common.core; -import org.apache.taglibs.standard.resources.Resources; +import java.lang.reflect.Array; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.StringTokenizer; import javax.el.ValueExpression; import javax.servlet.jsp.JspTagException; @@ -25,8 +31,8 @@ import javax.servlet.jsp.jstl.core.Index import javax.servlet.jsp.jstl.core.IteratedExpression; import javax.servlet.jsp.jstl.core.IteratedValueExpression; import javax.servlet.jsp.jstl.core.LoopTagSupport; -import java.lang.reflect.Array; -import java.util.*; + +import org.apache.taglibs.standard.resources.Resources; /** * Support for tag handlers for, the core iteration Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtil.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtil.java?rev=1658297&r1=1658296&r2=1658297&view=diff == --- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtil.java (original) +++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtil.java Mon Feb 9 03:10:22 2015 @@ -17,10 +17,10 @@ package org.apache.taglibs.standard.tag.common.fmt; -import org.apache.taglibs.standard.resources.Resources; - import java.util.Locale; +import org.apache.taglibs.standard.resources.Resources; + /** * Utility functions for working with Locales. * 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=1658297&r1=1658296&r2=1658297&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 Mon Feb 9 03:10:22 2015 @@ -24,6 +24,7 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.util.Properties; import java.util.logging.Logger; + import javax.sql.DataSource; import org.apache.taglibs.standard.resources.Resources; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658296 - in /tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl: core/ConditionalTagSupport.java fmt/JakartaInline.java
Author: kkolinko
Date: Mon Feb 9 03:04:26 2015
New Revision: 1658296
URL: http://svn.apache.org/r1658296
Log:
Fix checkstyle warnings:
- Use Boolean.valueOf(). This method is available since Java 1.4.
- Replace tab character
Modified:
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java
Modified:
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java?rev=1658296&r1=1658295&r2=1658296&view=diff
==
---
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
Mon Feb 9 03:04:26 2015
@@ -148,7 +148,7 @@ public abstract class ConditionalTagSupp
private void exposeVariables() {
if (var != null) {
-pageContext.setAttribute(var, new Boolean(result), scope);
+pageContext.setAttribute(var, Boolean.valueOf(result), scope);
}
}
Modified:
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java?rev=1658296&r1=1658295&r2=1658296&view=diff
==
---
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java
(original)
+++
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java
Mon Feb 9 03:04:26 2015
@@ -229,7 +229,7 @@ class JakartaInline {
* - avail locale must be equal to preferred locale
* - avail country must be empty or equal to preferred
country
* (the equality match might have failed on the variant)
-*/
+ */
if (pref.getLanguage().equals(avail.getLanguage())
&& ("".equals(avail.getCountry()) ||
pref.getCountry().equals(avail.getCountry( {
/*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658295 - in /tomcat/taglibs/standard/trunk: CHANGES.txt compat/pom.xml impl/pom.xml jstlel/pom.xml spec/pom.xml
Author: kkolinko Date: Mon Feb 9 02:58:32 2015 New Revision: 1658295 URL: http://svn.apache.org/r1658295 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57549 Fix checkstyle configuration to do not reference a SNAPSHOT version of build-tools module. Reference the configuration file directly instead of expecting it on classpath. Tested with "mvn checkstyle:checkstyle". Modified: tomcat/taglibs/standard/trunk/CHANGES.txt 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/CHANGES.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/CHANGES.txt?rev=1658295&r1=1658294&r2=1658295&view=diff == --- tomcat/taglibs/standard/trunk/CHANGES.txt (original) +++ tomcat/taglibs/standard/trunk/CHANGES.txt Mon Feb 9 02:58:32 2015 @@ -2,6 +2,7 @@ Changes in 1.2.3 release 57547 Fix regression with running on older JREs 57548 Update library version number printed by Version class +57549 Fix reference to old SNAPSHOT version of taglibs-build-tools in pom files. Changes in 1.2.2 release [WITHDRAWN due to regressions in older JREs] Modified: tomcat/taglibs/standard/trunk/compat/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1658295&r1=1658294&r2=1658295&view=diff == --- tomcat/taglibs/standard/trunk/compat/pom.xml (original) +++ tomcat/taglibs/standard/trunk/compat/pom.xml Mon Feb 9 02:58:32 2015 @@ -133,13 +133,9 @@ org.apache.maven.plugins maven-checkstyle-plugin 2.6 - - -org.apache.taglibs -taglibs-build-tools -1.2-SNAPSHOT - - + + ../build-tools/src/main/resources/taglibs/checkstyle.xml + @@ -182,14 +178,6 @@ - -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=1658295&r1=1658294&r2=1658295&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Mon Feb 9 02:58:32 2015 @@ -129,13 +129,9 @@ org.apache.maven.plugins maven-checkstyle-plugin 2.6 - - -org.apache.taglibs -taglibs-build-tools -1.2-SNAPSHOT - - + + ../build-tools/src/main/resources/taglibs/checkstyle.xml + @@ -178,14 +174,6 @@ - -org.apache.maven.plugins -maven-checkstyle-plugin -2.6 - -taglibs/checkstyle.xml - - Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/pom.xml?rev=1658295&r1=1658294&r2=1658295&view=diff == --- tomcat/taglibs/standard/trunk/jstlel/pom.xml (original) +++ tomcat/taglibs/standard/trunk/jstlel/pom.xml Mon Feb 9 02:58:32 2015 @@ -134,13 +134,9 @@ org.apache.maven.plugins maven-checkstyle-plugin 2.6 - - -org.apache.taglibs -taglibs-build-tools -1.2-SNAPSHOT - - + + ../build-tools/src/main/resources/taglibs/checkstyle.xml + @@ -183,14 +179,6 @@ - -org.apache.maven.plugins -maven-checkstyle-plugin -2.6 - -taglibs/checkstyle.xml - - Modified: tomcat/taglibs/standard/trunk/spec/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/pom.xml?rev=1658295&r1=165829
[Bug 57549] New: pom.xml files of Standard taglib reference 1.2-SNAPSHOT build of taglibs-build-tools
https://issues.apache.org/bugzilla/show_bug.cgi?id=57549 Bug ID: 57549 Summary: pom.xml files of Standard taglib reference 1.2-SNAPSHOT build of taglibs-build-tools Product: Taglibs Version: 1.2.1 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Standard Taglib Assignee: dev@tomcat.apache.org Reporter: knst.koli...@gmail.com In POM files of compat, impl, jstlel, spec modules of taglibs-standard-1.2.1 there is the following construct: ... org.apache.maven.plugins maven-checkstyle-plugin 2.6 org.apache.taglibs taglibs-build-tools 1.2-SNAPSHOT It is bad to depend on a SNAPSHOT version here, if anyone is rebuilding from this pom. The current version is 1.2.3-SNAPSHOT, not 1.2-SNAPSHOT. Apparently the version is not updated by maven-release plugin. Manually updating it is a bad idea. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658282 - /tomcat/taglibs/standard/trunk/standard-test/
Author: kkolinko Date: Mon Feb 9 00:53:34 2015 New Revision: 1658282 URL: http://svn.apache.org/r1658282 Log: Add project files of Eclipse IDE to svn:ignore Modified: tomcat/taglibs/standard/trunk/standard-test/ (props changed) Propchange: tomcat/taglibs/standard/trunk/standard-test/ -- --- svn:ignore (original) +++ svn:ignore Mon Feb 9 00:53:34 2015 @@ -1,4 +1,5 @@ *.iml +.classpath .project .settings cactustest - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57548] Auto-generate the value for org.apache.taglibs.standard.Version class
https://issues.apache.org/bugzilla/show_bug.cgi?id=57548 --- Comment #2 from Konstantin Kolinko --- README_bin.txt README_src.txt files also need to be updated manually Updated manually for 1.2.3 in r1658280 and r1658281 The standard-test project specifies what version of main project it runs its tests against. Those values in standard-test/pom.xml are not updated by maven-release plugin. Updated manually for 1.2.3 in r1658266 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658281 - /tomcat/taglibs/standard/trunk/README_bin.txt
Author: kkolinko Date: Mon Feb 9 00:29:28 2015 New Revision: 1658281 URL: http://svn.apache.org/r1658281 Log: For https://issues.apache.org/bugzilla/show_bug.cgi?id=57548 Manually update version number in README files Modified: tomcat/taglibs/standard/trunk/README_bin.txt Modified: tomcat/taglibs/standard/trunk/README_bin.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/README_bin.txt?rev=1658281&r1=1658280&r2=1658281&view=diff == --- tomcat/taglibs/standard/trunk/README_bin.txt (original) +++ tomcat/taglibs/standard/trunk/README_bin.txt Mon Feb 9 00:29:28 2015 @@ -41,9 +41,9 @@ ADD DEPENDENCIES TO A WEB APPLICATION To use this distribution with your own web applications, add the following JAR files to the '/WEB-INF/lib' directory of your application: - - taglibs-standard-spec-1.2.1.jar - - taglibs-standard-impl-1.2.1.jar - - taglibs-standard-jstlel-1.2.1.jar + - taglibs-standard-spec-1.2.3.jar + - taglibs-standard-impl-1.2.3.jar + - taglibs-standard-jstlel-1.2.3.jar - xalan-2.7.1.jar - serializer-2.7.1.jar @@ -57,12 +57,12 @@ your pom.xml file: org.apache.taglibs taglibs-standard-spec - 1.2.1 + 1.2.3 org.apache.taglibs taglibs-standard-impl - 1.2.1 + 1.2.3 --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658280 - in /tomcat/taglibs/standard/trunk: README_bin.txt README_src.txt
Author: kkolinko Date: Mon Feb 9 00:27:41 2015 New Revision: 1658280 URL: http://svn.apache.org/r1658280 Log: For https://issues.apache.org/bugzilla/show_bug.cgi?id=57548 Manually update version number in README files Modified: tomcat/taglibs/standard/trunk/README_bin.txt tomcat/taglibs/standard/trunk/README_src.txt Modified: tomcat/taglibs/standard/trunk/README_bin.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/README_bin.txt?rev=1658280&r1=1658279&r2=1658280&view=diff == --- tomcat/taglibs/standard/trunk/README_bin.txt (original) +++ tomcat/taglibs/standard/trunk/README_bin.txt Mon Feb 9 00:27:41 2015 @@ -1,5 +1,5 @@ --- -Apache Standard Tag Library 1.2.1 -- BINARY DISTRIBUTION +Apache Standard Tag Library 1.2.3 -- BINARY DISTRIBUTION --- Thanks for downloading this release of the Standard tag library, an implementation of the JavaServer Pages(tm)(JSP) Modified: tomcat/taglibs/standard/trunk/README_src.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/README_src.txt?rev=1658280&r1=1658279&r2=1658280&view=diff == --- tomcat/taglibs/standard/trunk/README_src.txt (original) +++ tomcat/taglibs/standard/trunk/README_src.txt Mon Feb 9 00:27:41 2015 @@ -1,5 +1,5 @@ --- -Apache Standard Tag Library 1.2.1 -- SOURCE DISTRIBUTION +Apache Standard Tag Library 1.2.3 -- SOURCE DISTRIBUTION --- Thanks for downloading the source code for the Apache Software Foundation's implementation of the JavaServer Pages(tm)(JSP) Standard Tag Library (JSTL) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULT] [VOTE] Release Apache Taglibs 1.2.2
2015-02-08 22:29 GMT+03:00 Jeremy Boynes : > On Feb 5, 2015, at 10:01 AM, Konstantin Kolinko > wrote: >> >> 2015-02-02 14:05 GMT+03:00 Konstantin Kolinko : >>> 2015-01-27 19:08 GMT+03:00 Jeremy Boynes : > On Jan 27, 2015, at 7:59 AM, Konstantin Kolinko > wrote: >>> >>> Tested (taglibs-standard-spec-1.2.2.jar + >>> taglibs-standard-impl-1.2.2.jar) on my web applications. >>> >> >> Unfortunately I have to change the above to >> [x] Broken - do not release >> >> >> My tests were on Java 7 and later. >> >> The library breaks when running on Java 5. >> E.g. Tomcat 6 + JDK 5u20 + Tomcat examples webapp. >> >> I am looking for a fix. >> For starters, the project has a compilation failure under Java 5 in a >> test class. >> >> XPathFactory.newInstance(String, String, ClassLoader) method used in >> ForEachTagTest is @since Java 1.6. > > I’m canceling this vote due to regressions seen on older JREs. > The issues have been fixed. I think it is OK to go. I verified that it works in Tomcat 6 + Java 5u20. The standard-test project also builds successfully. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658275 - /tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/
Author: kkolinko
Date: Sun Feb 8 23:24:16 2015
New Revision: 1658275
URL: http://svn.apache.org/r1658275
Log:
Suppress warnings in code generated by JavaCC - followup to r1658265
Eclipse IDE does not recognize uppercase "ALL", works with "all".
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/SimpleCharStream.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java?rev=1658275&r1=1658274&r2=1658275&view=diff
==
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
Sun Feb 8 23:24:16 2015
@@ -46,7 +46,7 @@ import org.apache.taglibs.standard.lang.
* @author Shawn Bayern
*/
-@SuppressWarnings("ALL")
+@SuppressWarnings("all") // Ignore warnings in generated code
public class ELParser implements ELParserConstants {
public static void main(String args[])
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java?rev=1658275&r1=1658274&r2=1658275&view=diff
==
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
Sun Feb 8 23:24:16 2015
@@ -1,7 +1,7 @@
/* Generated By:JavaCC: Do not edit this line. ELParserConstants.java */
package org.apache.taglibs.standard.lang.jstl.parser;
-@SuppressWarnings("ALL")
+@SuppressWarnings("all") // Ignore warnings in generated code
public interface ELParserConstants {
int EOF = 0;
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java?rev=1658275&r1=1658274&r2=1658275&view=diff
==
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
Sun Feb 8 23:24:16 2015
@@ -1,7 +1,7 @@
/* Generated By:JavaCC: Do not edit this line. ELParserTokenManager.java */
package org.apache.taglibs.standard.lang.jstl.parser;
-@SuppressWarnings("ALL")
+@SuppressWarnings("all") // Ignore warnings in generated code
public class ELParserTokenManager implements ELParserConstants
{
public java.io.PrintStream debugStream = System.out;
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java?rev=1658275&r1=1658274&r2=1658275&view=diff
==
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
Sun Feb 8 23:24:16 2015
@@ -10,7 +10,7 @@ package org.apache.taglibs.standard.lang
* You can modify this class to customize your error reporting
* mechanisms so long as you retain the public fields.
*/
-@SuppressWarnings("ALL")
+@SuppressWarnin
svn commit: r1658272 - /tomcat/taglibs/standard/trunk/standard-test/src/test/resources/org/apache/taglibs/standard/tag/el/core/TestOutTag.txt
Author: kkolinko Date: Sun Feb 8 23:05:36 2015 New Revision: 1658272 URL: http://svn.apache.org/r1658272 Log: Fix failing TestOutTag test: Update expectation file. Apache license comment was added to TestOutTag.jsp in r1524888, which results in an additional empty line in the output. Modified: tomcat/taglibs/standard/trunk/standard-test/src/test/resources/org/apache/taglibs/standard/tag/el/core/TestOutTag.txt Modified: tomcat/taglibs/standard/trunk/standard-test/src/test/resources/org/apache/taglibs/standard/tag/el/core/TestOutTag.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/standard-test/src/test/resources/org/apache/taglibs/standard/tag/el/core/TestOutTag.txt?rev=1658272&r1=1658271&r2=1658272&view=diff == --- tomcat/taglibs/standard/trunk/standard-test/src/test/resources/org/apache/taglibs/standard/tag/el/core/TestOutTag.txt (original) +++ tomcat/taglibs/standard/trunk/standard-test/src/test/resources/org/apache/taglibs/standard/tag/el/core/TestOutTag.txt Sun Feb 8 23:05:36 2015 @@ -1,4 +1,5 @@ + Start Hello World cats & dogs - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658267 - /tomcat/taglibs/standard/trunk/standard-test/
Author: kkolinko Date: Sun Feb 8 22:39:35 2015 New Revision: 1658267 URL: http://svn.apache.org/r1658267 Log: Add project files of Eclipse IDE to svn:ignore Modified: tomcat/taglibs/standard/trunk/standard-test/ (props changed) Propchange: tomcat/taglibs/standard/trunk/standard-test/ -- --- svn:ignore (original) +++ svn:ignore Sun Feb 8 22:39:35 2015 @@ -1,4 +1,6 @@ -target *.iml +.project +.settings cactustest derby.log +target - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658266 - /tomcat/taglibs/standard/trunk/standard-test/pom.xml
Author: kkolinko Date: Sun Feb 8 22:37:09 2015 New Revision: 1658266 URL: http://svn.apache.org/r1658266 Log: Update taglibs-standard-test pom.xml file to run the current version of the library (1.2.3) and use the current version of taglibs-parent. 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=1658266&r1=1658265&r2=1658266&view=diff == --- tomcat/taglibs/standard/trunk/standard-test/pom.xml (original) +++ tomcat/taglibs/standard/trunk/standard-test/pom.xml Sun Feb 8 22:37:09 2015 @@ -23,11 +23,11 @@ org.apache.taglibs taglibs-parent -1-SNAPSHOT +3 taglibs-standard-test - 1.2-SNAPSHOT + 1.2.3-SNAPSHOT Apache Standard Taglib Cactus Tests war @@ -61,12 +61,12 @@ org.apache.taglibs taglibs-standard-impl - 1.2-SNAPSHOT + 1.2.3-SNAPSHOT org.apache.taglibs taglibs-standard-spec - 1.2-SNAPSHOT + 1.2.3-SNAPSHOT @@ -148,8 +148,8 @@ cactus.integration.maven2 1.8.1 - target/taglibs-standard-test-1.2-SNAPSHOT.war - target/cactus-taglibs-standard-test-1.2-SNAPSHOT.war + target/taglibs-standard-test-1.2.3-SNAPSHOT.war + target/cactus-taglibs-standard-test-1.2.3-SNAPSHOT.war @@ -213,7 +213,7 @@ 0 true - target/cactus-taglibs-standard-test-1.2-SNAPSHOT.war + target/cactus-taglibs-standard-test-1.2.3-SNAPSHOT.war - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658265 - /tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/
Author: jboynes
Date: Sun Feb 8 22:23:11 2015
New Revision: 1658265
URL: http://svn.apache.org/r1658265
Log:
Suppress warnings in generated code
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/SimpleCharStream.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java?rev=1658265&r1=1658264&r2=1658265&view=diff
==
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
Sun Feb 8 22:23:11 2015
@@ -46,6 +46,7 @@ import org.apache.taglibs.standard.lang.
* @author Shawn Bayern
*/
+@SuppressWarnings("ALL")
public class ELParser implements ELParserConstants {
public static void main(String args[])
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java?rev=1658265&r1=1658264&r2=1658265&view=diff
==
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
Sun Feb 8 22:23:11 2015
@@ -1,6 +1,7 @@
/* Generated By:JavaCC: Do not edit this line. ELParserConstants.java */
package org.apache.taglibs.standard.lang.jstl.parser;
+@SuppressWarnings("ALL")
public interface ELParserConstants {
int EOF = 0;
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java?rev=1658265&r1=1658264&r2=1658265&view=diff
==
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
Sun Feb 8 22:23:11 2015
@@ -1,6 +1,7 @@
/* Generated By:JavaCC: Do not edit this line. ELParserTokenManager.java */
package org.apache.taglibs.standard.lang.jstl.parser;
+@SuppressWarnings("ALL")
public class ELParserTokenManager implements ELParserConstants
{
public java.io.PrintStream debugStream = System.out;
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java?rev=1658265&r1=1658264&r2=1658265&view=diff
==
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
Sun Feb 8 22:23:11 2015
@@ -10,6 +10,7 @@ package org.apache.taglibs.standard.lang
* You can modify this class to customize your error reporting
* mechanisms so long as you retain the public fields.
*/
+@SuppressWarnings("ALL")
public class ParseException extends Exception {
/**
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/SimpleCharStream.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lan
[Bug 57548] Auto-generate the value for org.apache.taglibs.standard.Version class
https://issues.apache.org/bugzilla/show_bug.cgi?id=57548 Konstantin Kolinko changed: What|Removed |Added OS||All --- Comment #1 from Konstantin Kolinko --- Updated for 1.2.3 by r1658264 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658264 - in /tomcat/taglibs/standard/trunk: CHANGES.txt impl/src/main/java/org/apache/taglibs/standard/Version.java impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
Author: kkolinko
Date: Sun Feb 8 22:12:37 2015
New Revision: 1658264
URL: http://svn.apache.org/r1658264
Log:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=57548
Manually update version number for the next release (1.2.3)
I hope that this will be automated in the future.
Modified:
tomcat/taglibs/standard/trunk/CHANGES.txt
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
Modified: tomcat/taglibs/standard/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/CHANGES.txt?rev=1658264&r1=1658263&r2=1658264&view=diff
==
--- tomcat/taglibs/standard/trunk/CHANGES.txt (original)
+++ tomcat/taglibs/standard/trunk/CHANGES.txt Sun Feb 8 22:12:37 2015
@@ -1,6 +1,7 @@
Changes in 1.2.3 release
57547 Fix regression with running on older JREs
+57548 Update library version number printed by Version class
Changes in 1.2.2 release [WITHDRAWN due to regressions in older JREs]
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java?rev=1658264&r1=1658263&r2=1658264&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java
Sun Feb 8 22:12:37 2015
@@ -95,7 +95,9 @@ public class Version {
* development drop for a release.
*/
public static int getMaintenanceVersionNum() {
-return 0;
+// TODO: BZ 57548: Make this autogenerated by Maven, or read from
"Implementation-Version"
+// of Manifest. Note that there is a test class that has to be kept in
sync (VersionTest).
+return 3;
}
/**
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java?rev=1658264&r1=1658263&r2=1658264&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
Sun Feb 8 22:12:37 2015
@@ -50,7 +50,7 @@ public class VersionTest
}
public void testGetMaintenanceVersionNum() {
-int expectedReturn = 0;
+int expectedReturn = 3;
int actualReturn = version.getMaintenanceVersionNum();
assertEquals("return value", expectedReturn, actualReturn);
}
@@ -74,7 +74,7 @@ public class VersionTest
}
public void testGetVersion() {
-String expectedReturn = "standard-taglib 1.2.0";
+String expectedReturn = "standard-taglib 1.2.3";
String actualReturn = version.getVersion();
assertEquals("return value", expectedReturn, actualReturn);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658263 - /tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedExpression.java
Author: jboynes
Date: Sun Feb 8 22:11:12 2015
New Revision: 1658263
URL: http://svn.apache.org/r1658263
Log:
Remove unnecessary semi-colon
Modified:
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedExpression.java
Modified:
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedExpression.java?rev=1658263&r1=1658262&r2=1658263&view=diff
==
---
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedExpression.java
(original)
+++
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedExpression.java
Sun Feb 8 22:11:12 2015
@@ -44,7 +44,6 @@ public final class IteratedExpression {
Undefined, ACollection, AnIterator, AnEnumeration, AMap, AString
}
-;
private TypesEnum type = TypesEnum.Undefined;
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658262 - in /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv: JstlBaseTLV.java JstlCoreTLV.java JstlFmtTLV.java JstlSqlTLV.java JstlXmlTLV.java
Author: jboynes Date: Sun Feb 8 22:08:30 2015 New Revision: 1658262 URL: http://svn.apache.org/r1658262 Log: Make constant fields static Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java 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=1658262&r1=1658261&r2=1658262&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/JstlBaseTLV.java Sun Feb 8 22:08:30 2015 @@ -64,7 +64,7 @@ public abstract class JstlBaseTLV extend // Constants // parameter names -private final String EXP_ATT_PARAM = "expressionAttributes"; +private static final String EXP_ATT_PARAM = "expressionAttributes"; // attributes protected static final String VAR = "var"; Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java?rev=1658262&r1=1658261&r2=1658262&view=diff == --- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java (original) +++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java Sun Feb 8 22:08:30 2015 @@ -67,26 +67,25 @@ public class JstlCoreTLV extends JstlBas // Constants // tag names -private final String CHOOSE = "choose"; -private final String WHEN = "when"; -private final String OTHERWISE = "otherwise"; -private final String EXPR = "out"; -private final String SET = "set"; -private final String IMPORT = "import"; -private final String URL = "url"; -private final String REDIRECT = "redirect"; -private final String PARAM = "param"; -// private final String EXPLANG = "expressionLanguage"; -private final String TEXT = "text"; +private static final String CHOOSE = "choose"; +private static final String WHEN = "when"; +private static final String OTHERWISE = "otherwise"; +private static final String EXPR = "out"; +private static final String SET = "set"; +private static final String IMPORT = "import"; +private static final String URL = "url"; +private static final String REDIRECT = "redirect"; +private static final String PARAM = "param"; +private static final String TEXT = "text"; // attribute names -private final String VALUE = "value"; -private final String DEFAULT = "default"; -private final String VAR_READER = "varReader"; +private static final String VALUE = "value"; +private static final String DEFAULT = "default"; +private static final String VAR_READER = "varReader"; // alternative identifiers for tags -private final String IMPORT_WITH_READER = "import varReader=''"; -private final String IMPORT_WITHOUT_READER = "import var=''"; +private static final String IMPORT_WITH_READER = "import varReader=''"; +private static final String IMPORT_WITHOUT_READER = "import var=''"; //* Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java?rev=1658262&r1=1658261&r2=1658262&view=diff == --- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java (original) +++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java Sun Feb 8 22:08:30 2015 @@ -70,23 +70,22 @@ public class JstlFmtTLV extends JstlBase // Constants // tag names -private final String SETLOCALE = "setLocale"; -private final String SETBUNDLE = "setBundle"; -private final String SETTIMEZONE = "setTimeZone"; -private final String BUNDLE = "bundle"; -private final String MESSAGE = "message"; -private
[Bug 57548] New: Auto-generate the value for org.apache.taglibs.standard.Version class
https://issues.apache.org/bugzilla/show_bug.cgi?id=57548 Bug ID: 57548 Summary: Auto-generate the value for org.apache.taglibs.standard.Version class Product: Taglibs Version: 1.2.1 Hardware: PC Status: NEW Severity: minor Priority: P2 Component: Standard Taglib Assignee: dev@tomcat.apache.org Reporter: knst.koli...@gmail.com The standard taglib has a Version class that prints version of the library. It is called in this way: java -cp taglibs-standard-impl-*.jar org.apache.taglibs.standard.Version Currently the version there is hard-coded to be 1.2.0. I'll manually update it for 1.2.3 release, but it would be better to automate this process. Either a) Make it auto-generated by Maven b) Read the actual value from Implementation-Version entry of a manifest c) Remove this feature -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658259 - /tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtilTest.java
Author: kkolinko
Date: Sun Feb 8 21:41:52 2015
New Revision: 1658259
URL: http://svn.apache.org/r1658259
Log:
Remove unused field in a test class.
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtilTest.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtilTest.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtilTest.java?rev=1658259&r1=1658258&r2=1658259&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtilTest.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtilTest.java
Sun Feb 8 21:41:52 2015
@@ -23,8 +23,6 @@ import java.util.Locale;
public class LocaleUtilTest {
-private static final Locale DEFAULT = Locale.getDefault();
-
@Test
public void testLocaleWithLanguage() {
Assert.assertEquals(new Locale("fr"), LocaleUtil.parseLocale("fr",
null));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658258 - /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
Author: kkolinko Date: Sun Feb 8 21:40:17 2015 New Revision: 1658258 URL: http://svn.apache.org/r1658258 Log: Remove unused field. The javax.servlet.jsp.jstl.fmt.fallbackLocale setting is successfully processed at line 178 of this class, pref = SetLocaleSupport.getLocale(pc, Config.FMT_FALLBACK_LOCALE); 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=1658258&r1=1658257&r2=1658258&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 Feb 8 21:40:17 2015 @@ -57,7 +57,6 @@ public abstract class BundleSupport exte //* // Private state -private Locale fallbackLocale; private LocalizationContext locCtxt; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658256 - /tomcat/taglibs/standard/trunk/spec/src/test/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLVTest.java
Author: kkolinko
Date: Sun Feb 8 21:24:19 2015
New Revision: 1658256
URL: http://svn.apache.org/r1658256
Log:
In a test class: replace deprecated StringBufferInputStream with a
ByteArrayInputStream.
This allows to specify encoding of the source text.
Modified:
tomcat/taglibs/standard/trunk/spec/src/test/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLVTest.java
Modified:
tomcat/taglibs/standard/trunk/spec/src/test/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLVTest.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/test/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLVTest.java?rev=1658256&r1=1658255&r2=1658256&view=diff
==
---
tomcat/taglibs/standard/trunk/spec/src/test/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLVTest.java
(original)
+++
tomcat/taglibs/standard/trunk/spec/src/test/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLVTest.java
Sun Feb 8 21:24:19 2015
@@ -17,7 +17,8 @@
package javax.servlet.jsp.jstl.tlv;
-import java.io.StringBufferInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Map;
@@ -27,8 +28,8 @@ import javax.servlet.jsp.tagext.Validati
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-
import org.easymock.EasyMock;
+
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.junit.Assert.assertEquals;
@@ -50,10 +51,10 @@ public class PermittedTaglibsTLVTest {
}
@Test
-public void tagPermittedWhenDeclaredAtRoot() {
+public void tagPermittedWhenDeclaredAtRoot() throws
UnsupportedEncodingException {
initParams.put("permittedTaglibs", "urn:test");
String xmlView = "";
-expect(page.getInputStream()).andStubReturn(new
StringBufferInputStream(xmlView));
+expect(page.getInputStream()).andStubReturn(new
ByteArrayInputStream(xmlView.getBytes("UTF-8")));
replay(page);
tlv.setInitParameters(initParams);
@@ -62,10 +63,10 @@ public class PermittedTaglibsTLVTest {
}
@Test
-public void tagNotPermittedWhenDeclaredAtRoot() {
+public void tagNotPermittedWhenDeclaredAtRoot() throws
UnsupportedEncodingException {
initParams.put("permittedTaglibs", "urn:none");
String xmlView = "";
-expect(page.getInputStream()).andStubReturn(new
StringBufferInputStream(xmlView));
+expect(page.getInputStream()).andStubReturn(new
ByteArrayInputStream(xmlView.getBytes("UTF-8")));
replay(page);
tlv.setInitParameters(initParams);
@@ -76,7 +77,7 @@ public class PermittedTaglibsTLVTest {
@Ignore("https://issues.apache.org/bugzilla/show_bug.cgi?id=57290";)
@Test
-public void tagNotPermittedWhenDeclaredInPage() {
+public void tagNotPermittedWhenDeclaredInPage() throws
UnsupportedEncodingException {
initParams.put("permittedTaglibs", "urn:none");
// In the page for this XML view, 'd' and 'x' are taglibs but 'o' is
not
String xmlView = "\n" +
@@ -86,7 +87,7 @@ public class PermittedTaglibsTLVTest {
" \n" +
"\n" +
"";
-expect(page.getInputStream()).andStubReturn(new
StringBufferInputStream(xmlView));
+expect(page.getInputStream()).andStubReturn(new
ByteArrayInputStream(xmlView.getBytes("UTF-8")));
replay(page);
tlv.setInitParameters(initParams);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658255 - in /tomcat/taglibs/standard/trunk: compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ impl/src/mai
Author: kkolinko Date: Sun Feb 8 21:13:32 2015 New Revision: 1658255 URL: http://svn.apache.org/r1658255 Log: Remove unused imports Modified: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetTimeZoneTag.java tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ExprTag.java tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParamTag.java tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java Modified: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java?rev=1658255&r1=1658254&r2=1658255&view=diff == --- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java (original) +++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java Sun Feb 8 21:13:32 2015 @@ -17,8 +17,6 @@ package org.apache.taglibs.standard.tag.compat.fmt; -import java.util.Date; - import javax.el.ValueExpression; import javax.servlet.jsp.JspException; Modified: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java?rev=1658255&r1=1658254&r2=1658255&view=diff == --- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java (original) +++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java Sun Feb 8 21:13:32 2015 @@ -20,7 +20,6 @@ package org.apache.taglibs.standard.tag. import javax.el.ValueExpression; import javax.servlet.jsp.JspException; -import org.apache.taglibs.standard.tag.common.fmt.ParamSupport; import org.apache.taglibs.standard.tag.common.fmt.RequestEncodingSupport; import org.apache.taglibs.standard.util.ExpressionUtil; Modified: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java?rev=1658255&r1=1658254&r2=1658255&view=diff == --- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java (original) +++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java Sun Feb 8 21:13:32 2015 @@ -20,7 +20,6 @@ package org.apache.taglibs.standard.tag. import javax.el.ValueExpression; import javax.servlet.jsp.JspException; -import org.apache.taglibs.standard.tag.common.fmt.BundleSupport; import org.apache.taglibs.standard.tag.common.fmt.SetBundleSupport; import org.apache.taglibs.standard.util.ExpressionUtil; Modified: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java?rev=1658255&r1=1658254&r2=1658255&view=diff == --- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java (original) +++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java Sun Feb 8 21:13:32 2015 @@ -20,7 +20,6 @@ package org.apache.taglibs.standard.tag. import javax.el.ValueExpression; import javax.servlet.jsp.JspException; -import org.apache.taglibs.standard.tag.common.fmt.ParamSupport; import org.apache.taglibs.standard.tag.common.fmt.SetLocaleSupport; import org.apache.taglibs.standard.util.ExpressionUtil; Modified: tomcat/taglibs/standard/trunk/compat/src/main/java/o
[Bug 57547] 1.2.2 (release candidate) of Standard taglib fails on Java 6u45 JRE
https://issues.apache.org/bugzilla/show_bug.cgi?id=57547 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Konstantin Kolinko --- Fixed by r1658252 and r1658253. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658253 - /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
Author: kkolinko
Date: Sun Feb 8 20:50:53 2015
New Revision: 1658253
URL: http://svn.apache.org/r1658253
Log:
XLST processing needs a namespace-aware parser.
Remove unused imports.
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java?rev=1658253&r1=1658252&r2=1658253&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
Sun Feb 8 20:50:53 2015
@@ -29,7 +29,6 @@ import javax.servlet.jsp.PageContext;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.Source;
@@ -51,7 +50,6 @@ import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
/**
* Utilities for working with JAXP and SAX.
@@ -102,6 +100,7 @@ public class XmlUtil {
return SAXParserFactory.newInstance();
}
}, RuntimeException.class);
+SAXPARSER_FACTORY.setNamespaceAware(true);
SAXPARSER_FACTORY.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
} catch (ParserConfigurationException e) {
throw new ExceptionInInitializerError(e);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658252 - in /tomcat/taglibs/standard/trunk: ./ impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ impl/src/main/java/org/apache/taglibs/standard/tlv/ impl/src/main/java/org/a
Author: kkolinko
Date: Sun Feb 8 20:48:26 2015
New Revision: 1658252
URL: http://svn.apache.org/r1658252
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57547
Fix regression when running on older JREs.
Consistently use JAXP APIs to create a parser instead of using SAX API directly.
Modified:
tomcat/taglibs/standard/trunk/CHANGES.txt
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
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/tlv/JstlBaseTLV.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
Modified: tomcat/taglibs/standard/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/CHANGES.txt?rev=1658252&r1=1658251&r2=1658252&view=diff
==
--- tomcat/taglibs/standard/trunk/CHANGES.txt (original)
+++ tomcat/taglibs/standard/trunk/CHANGES.txt Sun Feb 8 20:48:26 2015
@@ -1,3 +1,7 @@
+Changes in 1.2.3 release
+
+57547 Fix regression with running on older JREs
+
Changes in 1.2.2 release [WITHDRAWN due to regressions in older JREs]
57433 Double-check locking in ExpressionEvaluatorManager
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java?rev=1658252&r1=1658251&r2=1658252&view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
Sun Feb 8 20:48:26 2015
@@ -26,6 +26,7 @@ import javax.servlet.jsp.JspTagException
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.sax.TransformerHandler;
@@ -160,6 +161,8 @@ public abstract class ParseSupport exten
throw new JspException(e);
} catch (TransformerConfigurationException e) {
throw new JspException(e);
+} catch (ParserConfigurationException e) {
+throw new JspException(e);
}
}
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=1658252&r1=1658251&r2=1658252&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 Feb 8 20:48:26 2015
@@ -25,6 +25,7 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspTagException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyTagSupport;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
@@ -115,6 +116,8 @@ public abstract class TransformSupport e
}
} catch (SAXException e) {
throw new JspException(e);
+} catch (ParserConfigurationException e) {
+throw new JspException(e);
}
try {
@@ -152,6 +155,8 @@ public abstract class TransformSupport e
throw new JspException(ex);
} catch (SAXException e) {
throw new JspException(e);
+} catch (ParserConfigurationException e) {
+throw new JspException(e);
} finally {
t = null;
}
@@ -193,7 +198,7 @@ public abstract class TransformSupport e
* @return the document Source
* @throws JspTagException if there is a problem with the attribute
*/
-Source getSourceFromXmlAttribute() throws JspTagException, SAXException {
+Source getSourceFromXmlAttribute() throws JspTagException, SAXException,
ParserConfigurationException {
Object xml = this.xml;
if (xml == null) {
throw new
JspTagException(Resources.getMessage("TRANSFORM_XML_IS_NULL"));
@@ -234,7 +239,7 @@ public abstract class TransformSupport e
* @return the doc
[Bug 57547] New: 1.2.2 (release candidate) of Standard taglib fails on Java 6u45 JRE
https://issues.apache.org/bugzilla/show_bug.cgi?id=57547 Bug ID: 57547 Summary: 1.2.2 (release candidate) of Standard taglib fails on Java 6u45 JRE Product: Taglibs Version: nightly Hardware: PC Status: NEW Severity: regression Priority: P2 Component: Standard Taglib Assignee: dev@tomcat.apache.org Reporter: knst.koli...@gmail.com Using version 1.2.2 (release candidate) of Standard taglib with Tomcat 7 example web application fails when running with Java 6u45 JRE. This is caused by using a JAXP feature on a parser created via SAX api. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1657910 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractInputBuffer.java webapps/docs/changelog.xml
On 07/02/2015 00:34, Konstantin Kolinko wrote: > Tomcat 6 has the same implementation of nextRequest() in its > InternalInputBuffer, Internal(Nio|Apr)InputBuffer classes. I've proposed a back-port although I suspect this is an error triggered by code that isn't in 6.0.x (WebSocket, non-blocking, async etc.) > Trunk buildbot > It did not notice this, though failed for a different reason (supposedly), > 1) > http://ci.apache.org/projects/tomcat/tomcat9/logs/1657907/TEST-org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.NIO2.txt > - failed. expected:<10> but was:<144> Hmm. Not sure if this change was responsible but didn't fail on the most recent run so I'll keep an eye on future runs. > 2) > TestResponsePerformance - as expected That should be filtered out now. > Tomcat 8 buildbot > 1) > http://ci.apache.org/projects/tomcat/tomcat8/logs/1657908/TEST-org.apache.catalina.connector.TestInputBuffer.BIO.txt > - an odd error. There are several other errors All gone now. As above, I'll keep an eye on it. > 2) > http://ci.apache.org/projects/tomcat/tomcat8/logs/1657908/TEST-org.apache.tomcat.websocket.TestWsWebSocketContainer.BIO.txt > - many failures (NIO, NIO2 -OK) > 3) > TestAsyncContextImpl, TestMapperPerformance - timing failure, as usual. Again, these should be filtered out now. > Tomcat 7 buildbot > Broken. It cannot delete old directories to start a new build. File system has gone RO. The build slave isn't hosted by the ASF so infra have requested that the owners take a look. They are normally pretty responsive so expect it back up some time tomorrow. Overall, I think we should be getting back to a point where the CI system is providing value - rather than something that is generally ignored. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658250 - /tomcat/taglibs/standard/trunk/CHANGES.txt
Author: jboynes Date: Sun Feb 8 19:33:32 2015 New Revision: 1658250 URL: http://svn.apache.org/r1658250 Log: Update status of 1.2.2 release candidate Modified: tomcat/taglibs/standard/trunk/CHANGES.txt Modified: tomcat/taglibs/standard/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/CHANGES.txt?rev=1658250&r1=1658249&r2=1658250&view=diff == --- tomcat/taglibs/standard/trunk/CHANGES.txt (original) +++ tomcat/taglibs/standard/trunk/CHANGES.txt Sun Feb 8 19:33:32 2015 @@ -1,4 +1,4 @@ -Changes in 1.2.2 release +Changes in 1.2.2 release [WITHDRAWN due to regressions in older JREs] 57433 Double-check locking in ExpressionEvaluatorManager 57427 1.0 TLDs are missing from -compat jar - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT] [VOTE] Release Apache Taglibs 1.2.2
On Feb 5, 2015, at 10:01 AM, Konstantin Kolinko wrote: > > 2015-02-02 14:05 GMT+03:00 Konstantin Kolinko : >> 2015-01-27 19:08 GMT+03:00 Jeremy Boynes : >>> On Jan 27, 2015, at 7:59 AM, Konstantin Kolinko wrote: >> >> Here comes my vote: >> >>> The proposed 1.2.2 release is: >>> [ ] Broken - do not release >> [x] Stable - go ahead and release as 1.2.2 Stable >> >> >> Tested (taglibs-standard-spec-1.2.2.jar + >> taglibs-standard-impl-1.2.2.jar) on my web applications. >> > > Unfortunately I have to change the above to > [x] Broken - do not release > > > My tests were on Java 7 and later. > > The library breaks when running on Java 5. > E.g. Tomcat 6 + JDK 5u20 + Tomcat examples webapp. > > I am looking for a fix. > For starters, the project has a compilation failure under Java 5 in a > test class. > > XPathFactory.newInstance(String, String, ClassLoader) method used in > ForEachTagTest is @since Java 1.6. I’m canceling this vote due to regressions seen on older JREs. Cheers Jeremy signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r7963 - /dev/tomcat/taglibs/taglibs-standard-1.2.2/
Author: jboynes Date: Sun Feb 8 19:31:43 2015 New Revision: 7963 Log: Candidate withdrawn due to regressions on older JREs Removed: dev/tomcat/taglibs/taglibs-standard-1.2.2/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658216 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sun Feb 8 17:01:22 2015 New Revision: 1658216 URL: http://svn.apache.org/r1658216 Log: Proposal 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=1658216&r1=1658215&r2=1658216&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Feb 8 17:01:22 2015 @@ -45,7 +45,13 @@ PATCHES PROPOSED TO BACKPORT: +1: markt -1: - +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57544 + Avoid potential infinite loop. Chances are this is only triggered by code + (WebSocket, non-blocking, async) that isn't in 6.0.x but better to clean it up + anyway. + http://people.apache.org/~markt/patches/2015-02-08-bug57544-tc6-v1.patch + + PATCHES/ISSUES THAT ARE STALLED: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44312 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1657910 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractInputBuffer.java webapps/docs/changelog.xml
On 07/02/2015 12:48, Mark Thomas wrote:
> On 07/02/2015 11:06, Rémy Maucherat wrote:
>> 2015-02-07 1:34 GMT+01:00 Konstantin Kolinko :
>>
>>> The new code does not reset lastValid and pos in case when pos ==
>>> lastValid and both are > 0.
>>>
>>> It shall be
>>>
>>> if (lastValid - pos > 0 && pos > 0) {
>>> System.arraycopy(buf, pos, buf, 0, lastValid - pos);
>>> }
>>> lastValid = lastValid - pos;
>>> pos = 0;
>>>
>>
>> I agree it should be that, it looks less risky if the recycling does always
>> reset a clean state.
>
> Agreed. I'll fix that over the weekend when I get 5 minutes in front of
> the right machine (unless someone beats me to it).
Done.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658209 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractInputBuffer.java
Author: markt Date: Sun Feb 8 16:53:26 2015 New Revision: 1658209 URL: http://svn.apache.org/r1658209 Log: Follow-up to r1657910 Always reset pos to zero before next request. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Feb 8 16:53:26 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 -/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-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1 352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,137047
svn commit: r1658208 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractInputBuffer.java
Author: markt Date: Sun Feb 8 16:52:39 2015 New Revision: 1658208 URL: http://svn.apache.org/r1658208 Log: Follow-up to r1657908 Always reset pos to zero before next request. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Feb 8 16:52:39 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 +/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 Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=1658208&r1=1658207&r2=1658208&view=diff == --- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Abst
svn commit: r1658207 - /tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
Author: markt
Date: Sun Feb 8 16:50:06 2015
New Revision: 1658207
URL: http://svn.apache.org/r1658207
Log:
Follow-up to r1657907
Always reset pos to zero before next request.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1658207&r1=1658206&r2=1658207&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Sun Feb
8 16:50:06 2015
@@ -350,9 +350,10 @@ public class Http11InputBuffer implement
// Copy leftover bytes to the beginning of the buffer
if (lastValid - pos > 0 && pos > 0) {
System.arraycopy(buf, pos, buf, 0, lastValid - pos);
-lastValid = lastValid - pos;
-pos = 0;
}
+// Always reset pos to zero
+lastValid = lastValid - pos;
+pos = 0;
// Recycle filters
for (int i = 0; i <= lastActiveFilter; i++) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57536] configurable source ip
https://issues.apache.org/bugzilla/show_bug.cgi?id=57536 Rainer Jung changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #5 from Rainer Jung --- I have committed the feature in r1658173. It is marked experimental in docs and changelog, because it needs more testing on various platforms. It should behave transparently if not configured. I did not set SO_REUSEADDR deliberately. Otherwise we ould have to handle EADDRINUSE during connect(). We'll see whether not setting SO_REUSEADDR is OK for most users (enough free ephemeral ports). It will be part of version 1.2.41. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658173 - in /tomcat/jk/trunk: native/common/ xdocs/miscellaneous/ xdocs/reference/
Author: rjung
Date: Sun Feb 8 14:28:10 2015
New Revision: 1658173
URL: http://svn.apache.org/r1658173
Log:
BZ 57536: AJP: Allow to configure connection
source address. This should only be used on
multi-homed hosts.
The feature is experimental.
Modified:
tomcat/jk/trunk/native/common/jk_ajp12_worker.c
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_ajp_common.h
tomcat/jk/trunk/native/common/jk_connect.c
tomcat/jk/trunk/native/common/jk_connect.h
tomcat/jk/trunk/native/common/jk_status.c
tomcat/jk/trunk/native/common/jk_util.c
tomcat/jk/trunk/native/common/jk_util.h
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
tomcat/jk/trunk/xdocs/reference/workers.xml
Modified: tomcat/jk/trunk/native/common/jk_ajp12_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp12_worker.c?rev=1658173&r1=1658172&r2=1658173&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp12_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp12_worker.c Sun Feb 8 14:28:10 2015
@@ -41,6 +41,7 @@
struct ajp12_worker
{
jk_sockaddr_t worker_inet_addr;
+jk_sockaddr_t worker_source_inet_addr;
unsigned connect_retry_attempts;
char *name;
jk_worker_t worker;
@@ -127,6 +128,9 @@ static int JK_METHOD service(jk_endpoint
attempt++) {
p->sd =
jk_open_socket(&p->worker->worker_inet_addr,
+ p->worker->worker_source_inet_addr.ipaddr_ptr !=
NULL ?
+ &p->worker->worker_source_inet_addr :
+ NULL,
JK_FALSE, 0, 0, 0, l);
jk_log(l, JK_LOG_DEBUG, "In jk_endpoint_t::service, sd = %d",
@@ -187,19 +191,34 @@ static int JK_METHOD validate(jk_worker_
p->name,
AJP_DEF_HOST);
+const char *source = jk_get_worker_host(props,
+p->name,
+"");
+
jk_log(l, JK_LOG_DEBUG,
- "In jk_worker_t::validate for worker %s contact is %s:%d",
+ "In jk_worker_t::validate for worker %s target is %s:%d",
p->name, host, port);
if (host) {
-if (jk_resolve(host, port, &p->worker_inet_addr, we->pool,
JK_FALSE, l)) {
-return JK_TRUE;
+if (!jk_resolve(host, port, &p->worker_inet_addr, we->pool,
JK_FALSE, l)) {
+jk_log(l, JK_LOG_ERROR,
+ "In jk_worker_t::validate, host '%s:%d' resolve failed",
+ host, port);
+return JK_FALSE;
}
+} else {
jk_log(l, JK_LOG_ERROR,
- "In jk_worker_t::validate, resolve failed");
+ "In jk_worker_t::validate, Error no host name given");
+return JK_FALSE;
+}
+if (source && *source) {
+if (!jk_resolve(source, 0, &p->worker_source_inet_addr, we->pool,
JK_FALSE, l)) {
+p->worker_source_inet_addr.ipaddr_ptr = NULL;
+jk_log(l, JK_LOG_WARNING,
+ "In jk_worker_t::validate, source addr '%s' resolve
failed - ignored",
+ source);
+}
}
-jk_log(l, JK_LOG_ERROR, "In jk_worker_t::validate, Error %s %d",
- host, port);
}
else {
jk_log(l, JK_LOG_ERROR,
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1658173&r1=1658172&r2=1658173&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Sun Feb 8 14:28:10 2015
@@ -1040,6 +1040,9 @@ int ajp_connect_to_endpoint(ajp_endpoint
ae->last_errno = 0;
ae->sd = jk_open_socket(&ae->worker->worker_inet_addr,
+ae->worker->worker_source_inet_addr.ipaddr_ptr !=
NULL ?
+&ae->worker->worker_source_inet_addr :
+NULL,
ae->worker->keepalive,
ae->worker->socket_timeout,
ae->worker->socket_connect_timeout,
@@ -2830,12 +2833,18 @@ int ajp_validate(jk_worker_t *pThis,
}
strncpy(p->host, tmp, JK_SHM_STR_SIZ);
p->prefer_ipv6 = jk_get_worker_prefer_ipv6(props, p->name, JK_FALSE);
+tmp = jk_get_worker_source(props, p->name, "");
+if (jk_check_attribute_length("source address", tmp, l) == JK_FALSE) {
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
+strncpy(p->source, tmp, JK_SHM_STR_SIZ);
if
