DO NOT REPLY [Bug 50263] New: README_src.txt out of date
https://issues.apache.org/bugzilla/show_bug.cgi?id=50263 Summary: README_src.txt out of date Product: Taglibs Version: unspecified Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Standard Taglib AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org The file says that taglibs requires a minimum of Java 1.4.2 to build, however the POM requires 1.5. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 50264] New: Missing @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=50264 Summary: Missing @Override annotations Product: Taglibs Version: unspecified Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Standard Taglib AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org Created an attachment (id=26293) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26293) Add missing annotations It's best to add any missing @Override annotations before trying to resolve other generics issues. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 50265] New: FormatDateSupport.dateFormatCache lazy init is not safe
https://issues.apache.org/bugzilla/show_bug.cgi?id=50265 Summary: FormatDateSupport.dateFormatCache lazy init is not safe Product: Taglibs Version: unspecified Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Standard Taglib AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org FormatDateSupport.dateFormatCache is private and static. It is initialised in the createFormatter method, however access is not synchronised, so the field might not be published correctly. This can result in different threads getting different instances. If this is acceptable, then this should be documented in the code. Otherwise consider using IODH idiom. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1034748 - /tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Author: markt
Date: Sat Nov 13 12:46:30 2010
New Revision: 1034748
URL: http://svn.apache.org/viewvc?rev=1034748&view=rev
Log:
Revert r1031709
Parallel deployment implementation is changing as a result of discussion on the
dev list and this re-ordering was specific to the previous implementation.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1034748&r1=1034747&r2=1034748&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Sat Nov
13 12:46:30 2010
@@ -575,6 +575,33 @@ public class CoyoteAdapter implements Ad
request.setContext((Context) request.getMappingData().context);
request.setWrapper((Wrapper) request.getMappingData().wrapper);
+// Filter trace method
+if (!connector.getAllowTrace()
+&& req.method().equalsIgnoreCase("TRACE")) {
+Wrapper wrapper = request.getWrapper();
+String header = null;
+if (wrapper != null) {
+String[] methods = wrapper.getServletMethods();
+if (methods != null) {
+for (int i=0; i
DO NOT REPLY [Bug 50197] Provide *.sh scripts with jsvc
https://issues.apache.org/bugzilla/show_bug.cgi?id=50197 Michael Osipov <1983-01...@gmx.net> changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #2 from Michael Osipov <1983-01...@gmx.net> 2010-11-13 08:39:54 EST --- The purpose of my ticket is simply this: By now you provide a plain shell script to start tomcat. Additionally, you bundle the sources of commons daemon with tomcat to compile and run it. There are no startup scripts which resemble those bundled with tomcat but configured to use JSVC. Those provided in the tarball are outdated. Since you bundle commons daemon with Tomcat you should provide startup scripts on par with those provide with "plain" Java. A simple approach for this script would be pass startup arguments to jsvc with PID and TOMCAT_USER and let it boot. The guys at ubuntu took such an approach. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 50197] Provide *.sh scripts with jsvc
https://issues.apache.org/bugzilla/show_bug.cgi?id=50197 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #3 from Mark Thomas 2010-11-13 08:45:36 EST --- The scripts in commons-daemon 1.0.4 have been updated. The next release of Tomcat should use daemon 1.0.4. If there are still changes you would like to see then the commons daemon project is the place to make them. The Tomcat project tracks commons daemon and pulls in new releases as they are made available. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: 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);
}
DO NOT REPLY [Bug 50264] Missing @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=50264 Jeremy Boynes changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Jeremy Boynes 2010-11-13 09:13:00 EST --- Patch applied as r1034762 Thanks -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 50266] New: Javadoc and import corrections
https://issues.apache.org/bugzilla/show_bug.cgi?id=50266 Summary: Javadoc and import corrections Product: Taglibs Version: unspecified Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Standard Taglib AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org Created an attachment (id=26294) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26294) Javadoc and import corrections -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: 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 Services -Developer Pack (JWSDP) available at -http://java.sun.com/products/jwsdp. -
DO NOT REPLY [Bug 50263] README_src.txt out of date
https://issues.apache.org/bugzilla/show_bug.cgi?id=50263 --- Comment #1 from Jeremy Boynes 2010-11-13 09:52:13 EST --- Updated text in r1034773 to describe use of Maven and newer JDK requirements -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: 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 == --- tomcat/taglibs/standard/trunk/imp
DO NOT REPLY [Bug 50266] Javadoc and import corrections
https://issues.apache.org/bugzilla/show_bug.cgi?id=50266 Jeremy Boynes changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Jeremy Boynes 2010-11-13 11:53:50 EST --- Patch applied as r1034805 Thanks -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 50250] Split package issue in impl and jstlel bundles
https://issues.apache.org/bugzilla/show_bug.cgi?id=50250 --- Comment #3 from Jeremy Boynes 2010-11-13 12:09:49 EST --- (In reply to comment #2) > Thanks Rex. > > I've performed the svn mv, though I'm not sure what the deployment process is > so will wait on Jeremy for that. Guidelines are at http://www.apache.org/dev/publishing-maven-artifacts.html Once you've set up your local credentials (in ~/.m2/settings.xml) it's just $ mvn deploy to update the SNAPSHOT. Rex, I deployed r1034805. Please can you resolve this when you've had a chance to check the updated snapshot -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 50064] bundle-ify the taglibs jars
https://issues.apache.org/bugzilla/show_bug.cgi?id=50064 --- Comment #8 from Jeremy Boynes 2010-11-13 12:12:24 EST --- I'm seeing the following warning for the compat and jstlel modules: [WARNING] Warning building bundle org.apache.taglibs:taglibs-standard-compat:bundle:1.2-SNAPSHOT : Did not find matching referal for org.apache.x* Do we need to add something to their configuration? -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1034911 - in /tomcat/trunk: res/config.ini res/jvm.ini res/tomcat.nsi webapps/docs/changelog.xml
Author: kkolinko
Date: Sat Nov 13 23:39:57 2010
New Revision: 1034911
URL: http://svn.apache.org/viewvc?rev=1034911&view=rev
Log:
Reimplemented the Windows installer GUI using nsDialogs and MUI2 libraries,
instead of deprecated InstallOptions.
The *.ini files are no more used. All is specified in the nsi script.
Migration was straightforward, except for a DirRequest field
(the field on the JVM selection page that displays path to JRE):
I had to create the Browse button explicitly and implement an OnClick handler.
It is not spelled in the docs, but is discussed a lot on forums.
Other improvements:
- Added a textfield to display/edit the roles for the user that we add to
tomcat-user.xml
- The roles are calculated depending on what webapps are installed (manager,
host-manager, or both).
- I do not display "username", "password", "roles" fields when neither manager
nor host-manager are selected. In the previous version we showed them as
disabled. Now I do not show them on screen.
- Implemented creating Windows Shortcuts for the Manager, Host Manager apps and
Documentation. There was implementation for that already (Manager and Docs
shortcut only), but it was not working: it used IfFileExist check that always
evaluated to false, because shortcuts were created before those files were
installed.
- Added support for the '/?' command line option. It displays a message box
with some short text about the /S and /D options. See .onInit function in
tomcat.nsi for details.
- Using LogicLib.nsh for logic. I hope that the script became more easily
readable.
Removed:
tomcat/trunk/res/config.ini
tomcat/trunk/res/jvm.ini
Modified:
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1034911&r1=1034910&r2=1034911&view=diff
==
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Sat Nov 13 23:39:57 2010
@@ -33,15 +33,30 @@
VIAddVersionKey InternalName "apache-tomc...@version@.exe"
VIProductVersion @VERSION_NUMBER@
-!include "MUI.nsh"
+!include "MUI2.nsh"
+!include "nsDialogs.nsh"
!include "StrFunc.nsh"
+!include "LogicLib.nsh"
+!include "FileFunc.nsh"
${StrRep}
- Var "JavaHome"
- Var "JavaExe"
- Var "JvmDll"
- Var "Arch"
- Var "ResetInstDir"
+Var JavaHome
+Var JavaExe
+Var JvmDll
+Var Arch
+Var ResetInstDir
+Var TomcatPort
+Var TomcatAdminEnable
+Var TomcatAdminUsername
+Var TomcatAdminPassword
+Var TomcatAdminRoles
+
+; Variables that store handles of dialog controls
+Var CtlJavaHome
+Var CtlTomcatPort
+Var CtlTomcatAdminUsername
+Var CtlTomcatAdminPassword
+Var CtlTomcatAdminRoles
;
;Configuration
@@ -57,9 +72,6 @@ ${StrRep}
!define MUI_ABORTWARNING
- !define TEMP1 $R0
- !define TEMP2 $R1
-
!define MUI_ICON tomcat.ico
!define MUI_UNICON tomcat.ico
@@ -75,12 +87,21 @@ ${StrRep}
LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
+ LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java
SE 6.0 or later JRE installed on your system."
+ LangString TEXT_CONF_LABEL_PORT ${LANG_ENGLISH} "HTTP/1.1 Connector Port"
+ LangString TEXT_CONF_LABEL_ADMIN ${LANG_ENGLISH} "Tomcat Administrator Login
(optional)"
+ LangString TEXT_CONF_LABEL_ADMINUSERNAME ${LANG_ENGLISH} "User Name"
+ LangString TEXT_CONF_LABEL_ADMINPASSWORD ${LANG_ENGLISH} "Password"
+ LangString TEXT_CONF_LABEL_ADMINROLES ${LANG_ENGLISH} "Roles"
+
;Install Page order
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE INSTALLLICENSE
+ ; Use custom onLeave function with COMPONENTS page
+ !define MUI_PAGE_CUSTOMFUNCTION_LEAVE pageComponentsLeave
!insertmacro MUI_PAGE_COMPONENTS
- Page custom SetConfiguration Void "$(TEXT_CONF_PAGETITLE)"
- Page custom SetChooseJVM checkJava "$(TEXT_JVM_PAGETITLE)"
+ Page custom pageConfiguration pageConfigurationLeave "$(TEXT_CONF_PAGETITLE)"
+ Page custom pageChooseJVM pageChooseJVMLeave "$(TEXT_JVM_PAGETITLE)"
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
Page custom CheckUserType
@@ -116,9 +137,8 @@ ${StrRep}
; Main registry key
InstallDirRegKey HKLM "SOFTWARE\Apache Software
foundation\tomc...@version_major_minor@" ""
- !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
- ReserveFile "jvm.ini"
- ReserveFile "config.ini"
+ ReserveFile "${NSISDIR}\Plugins\System.dll"
+ ReserveFile "${NSISDIR}\Plugins\nsDialogs.dll"
;
;Installer Sections
@@ -220,50 +240,6 @@ SectionEnd
SubSectionEnd
-Section "Start Menu Items" SecMenu
-
- SectionIn 1 2 3
-
- SetOutPath "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@"
-
- CreateShortCut "$SMPROGRAMS\Apache Tomcat @version_major_mi...@\tomcat Home
Page.lnk" \
svn commit: r1034924 - in /tomcat/trunk: res/tomcat.nsi webapps/docs/changelog.xml
Author: kkolinko Date: Sun Nov 14 02:05:56 2010 New Revision: 1034924 URL: http://svn.apache.org/viewvc?rev=1034924&view=rev Log: When installing on Windows, do not leave undeleted stale files in $TEMP/src/res/confinstall/ The cause is that there are two confinstall folders in $dist: '/confinstall' and '/src/res/confinstall' The 'File /r confinstall' directive was selecting both paths (like issues fixed in r611660), but subsequent 'RMDir /r "$TEMP\confinstall"' removed only one of them. New implementaion selects only one copy of the files, and places them into $PLUGINSDIR. Also, added DetailPrint statements for operations that take noticeable time (file copying and spawning external programs). Modified: tomcat/trunk/res/tomcat.nsi tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1034924&r1=1034923&r2=1034924&view=diff == --- tomcat/trunk/res/tomcat.nsi (original) +++ tomcat/trunk/res/tomcat.nsi Sun Nov 14 02:05:56 2010 @@ -193,6 +193,7 @@ Section "Core" SecTomcatCore FileWrite $R7 "$\r$\n" ClearErrors + DetailPrint "Installing tom...@version_major@ service" nsExec::ExecToStack '"$instdir\bin\tom...@version_major@.exe" //IS//tom...@version_major@ --DisplayName "Apache Tomcat @VERSION_MAJOR@" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install "$instdir\bin\tom...@version_major@.exe" --Jvm "$JvmDll" --StartPath "$INSTDIR" --StopPath "$INSTDIR"' Pop $0 Pop $1 @@ -213,6 +214,7 @@ Section "Service" SecTomcatService FileWrite $R7 '"$instdir\bin\tom...@version_major@.exe" //US//tom...@version_major@ --Startup auto' FileWrite $R7 "$\r$\n" + DetailPrint "Configuring tom...@version_major@ service" nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe" //US//tom...@version_major@ --Startup auto' ; Behave like Apache Httpd (put the icon in tray on login) WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "apachetomcatmoni...@version_major_minor@" '"$instdir\bin\tom...@version_major@w.exe" //MS//tom...@version_major@' @@ -338,6 +340,7 @@ Section -post FileWrite $R7 "$\r$\n" FileClose $R7 + DetailPrint "Configuring tom...@version_major@ service" nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe" //US//tom...@version_major@ --Classpath "$INSTDIR\bin\bootstrap.jar;$INSTDIR\bin\tomcat-juli.jar" --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop --StartMode jvm --StopMode jvm' nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe" //US//tom...@version_major@ --JvmOptions "-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"' nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe" //US//tom...@version_major@ --StdOutput auto --StdError auto --PidFile tom...@version_major@.pid' @@ -766,17 +769,24 @@ Function configure DetailPrint 'HTTP/1.1 Connector configured on port "$TomcatPort"' - SetOutPath $TEMP - File /r confinstall + ; Extract these fragments to $PLUGINSDIR. That is a temporary directory, + ; that is automatically deleted when the installer exits. + InitPluginsDir + SetOutPath $PLUGINSDIR + File confinstall\server_1.xml + File confinstall\server_2.xml + File confinstall\tomcat-users_1.xml + File confinstall\tomcat-users_2.xml ; Build final server.xml Delete "$INSTDIR\conf\server.xml" + DetailPrint "Writing server.xml" FileOpen $R9 "$INSTDIR\conf\server.xml" w - Push "$TEMP\confinstall\server_1.xml" + Push "$PLUGINSDIR\server_1.xml" Call copyFile FileWrite $R9 $R4 - Push "$TEMP\confinstall\server_2.xml" + Push "$PLUGINSDIR\server_2.xml" Call copyFile FileClose $R9 @@ -784,6 +794,7 @@ Function configure ; Build final tomcat-users.xml Delete "$INSTDIR\conf\tomcat-users.xml" + DetailPrint "Writing tomcat-users.xml" FileOpen $R9 "$INSTDIR\conf\tomcat-users.xml" w ; File will be written using current windows codepage System::Call 'Kernel32::GetACP() i .r18' @@ -792,17 +803,19 @@ Function configure FileWrite $R9 "$\r$\n" Goto +2 FileWrite $R9 "$\r$\n" - Push "$TEMP\confinstall\tomcat-users_1.xml" + Push "$PLUGINSDIR\tomcat-users_1.xml" Call copyFile FileWrite $R9 $R5 - Push "$TEMP\confinstall\tomcat-users_2.xml" + Push "$PLUGINSDIR\tomcat-users_2.xml" Call copyFile FileClose $R9 DetailPrint "tomcat-users.xml written" - RMDir /r "$TEMP\confinstall" - + Delete "$PLUGINSDIR\server_1.xml" + Delete "$PLUGINSDIR\server_2.xml" + Delete "$PLUGINSDIR\tomcat-users_1.xml" + Delete "$PLUGINSDIR
svn commit: r1034926 - /tomcat/trunk/res/tomcat.nsi
Author: kkolinko
Date: Sun Nov 14 02:25:36 2010
New Revision: 1034926
URL: http://svn.apache.org/viewvc?rev=1034926&view=rev
Log:
Move server.xml and tomcat-users.xml to the top of the installer archive (aka
reserving them).
Those were installed among the first files ('configure' was called from Core
section), but this code is near the end of the script and thus the files were
packed near the end of the archive. The delay while extracting server.xml was
noticeable. With this fix that step completes nearly instantly.
Modified:
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1034926&r1=1034925&r2=1034926&view=diff
==
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Sun Nov 14 02:25:36 2010
@@ -773,10 +773,10 @@ Function configure
; that is automatically deleted when the installer exits.
InitPluginsDir
SetOutPath $PLUGINSDIR
- File confinstall\server_1.xml
- File confinstall\server_2.xml
- File confinstall\tomcat-users_1.xml
- File confinstall\tomcat-users_2.xml
+ ReserveFile confinstall\server_1.xml
+ ReserveFile confinstall\server_2.xml
+ ReserveFile confinstall\tomcat-users_1.xml
+ ReserveFile confinstall\tomcat-users_2.xml
; Build final server.xml
Delete "$INSTDIR\conf\server.xml"
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1034934 - /tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java
Author: bayard
Date: Sun Nov 14 05:35:13 2010
New Revision: 1034934
URL: http://svn.apache.org/viewvc?rev=1034934&view=rev
Log:
Switching the Logger to use the constructor parameter PrintStream instead of a
hardcoded System.out. Also protected the only use of mOut in Logger from a null
mOut. It would be a better API to throw an NPE if one is passed in, but that
would affect backwards compat.
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java?rev=1034934&r1=1034933&r2=1034934&view=diff
==
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java
Sun Nov 14 05:35:13 2010
@@ -76,14 +76,16 @@ public class Logger
throws ELException
{
if (isLoggingWarning ()) {
- if (pMessage == null) {
- System.out.println (pRootCause);
- }
- else if (pRootCause == null) {
- System.out.println (pMessage);
- }
- else {
- System.out.println (pMessage + ": " + pRootCause);
+ if(mOut != null) {
+if (pMessage == null) {
+ mOut.println (pRootCause);
+}
+else if (pRootCause == null) {
+ mOut.println (pMessage);
+}
+else {
+ mOut.println (pMessage + ": " + pRootCause);
+}
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49297] Whitespace absence is allowed before attribute name in a custom tag
https://issues.apache.org/bugzilla/show_bug.cgi?id=49297 Shawn Jiang changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Comment #10 from Shawn Jiang 2010-11-14 02:18:15 EST --- Thank Mark, The fix works like a charm with pageDirective, but we should include the same logic for tag Directive according to the spec. Per JSP.8.5.1 The tag Directive "The tag directive is similar to the page directive, but applies to tag files instead of JSPs. Like the page directive, a translation unit can contain more than one instance of the tag directive, all the attributes will apply to the complete translation unit (i.e. tag directives are position independent). There shall be only one occurrence of any attribute/value defined by this directive in a given translation unit,unless the values for the duplicate attributes are identical for all occurrences. The import and pageEncoding attributes are exempt from this rule and can appear multiple times. Multiple uses of the import attribute are cumulative (with ordered set union semantics). Other such multiple attribute/value (re)deļ¬nitions result in a fatal translation error if the values do not match." -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
