svn commit: r829067 - in /tomcat/trunk/webapps/examples/WEB-INF/classes: chat/ChatServlet.java filters/SetCharacterEncodingFilter.java
Author: markt
Date: Fri Oct 23 14:00:36 2009
New Revision: 829067
URL: http://svn.apache.org/viewvc?rev=829067&view=rev
Log:
Clear the remaining Eclipse warnings in the examples
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
tomcat/trunk/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java?rev=829067&r1=829066&r2=829067&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java Fri Oct
23 14:00:36 2009
@@ -106,7 +106,8 @@
}
}
-protected void begin(CometEvent event, HttpServletRequest request,
HttpServletResponse response)
+protected void begin(@SuppressWarnings("unused") CometEvent event,
+HttpServletRequest request, HttpServletResponse response)
throws IOException {
log("Begin for session: " + request.getSession(true).getId());
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java?rev=829067&r1=829066&r2=829067&view=diff
==
---
tomcat/trunk/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
Fri Oct 23 14:00:36 2009
@@ -161,7 +161,8 @@
*
* @param request The servlet request we are processing
*/
-protected String selectEncoding(ServletRequest request) {
+protected String selectEncoding(
+@SuppressWarnings("unused") ServletRequest request) {
return (this.encoding);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r829083 - in /tomcat/site/trunk: docs/ docs/images/ xdocs/images/ xdocs/stylesheets/
Author: mturk Date: Fri Oct 23 14:52:42 2009 New Revision: 829083 URL: http://svn.apache.org/viewvc?rev=829083&view=rev Log: Add 10th anniversary logo Added: tomcat/site/trunk/docs/images/tomcat10.jpg (with props) tomcat/site/trunk/xdocs/images/tomcat10.jpg (with props) Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-41.html tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=829083&r1=829082&r2=829083&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Fri Oct 23 14:52:42 2009 @@ -14,7 +14,7 @@ http://tomcat.apache.org/";> - + @@ -533,7 +533,7 @@ Copyright © 1999-2009, The Apache Software Foundation -"Apache", the Apache feather, and the Apache Tomcat logo are +"Apache", the Apache feather, and the Apache Tomcat logo are trademarks of the Apache Software Foundation for our open source software. Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=829083&r1=829082&r2=829083&view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Fri Oct 23 14:52:42 2009 @@ -13,7 +13,7 @@ http://tomcat.apache.org/";> - + @@ -297,7 +297,7 @@ Copyright © 1999-2009, The Apache Software Foundation -"Apache", the Apache feather, and the Apache Tomcat logo are +"Apache", the Apache feather, and the Apache Tomcat logo are trademarks of the Apache Software Foundation for our open source software. Modified: tomcat/site/trunk/docs/download-41.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-41.html?rev=829083&r1=829082&r2=829083&view=diff == --- tomcat/site/trunk/docs/download-41.html (original) +++ tomcat/site/trunk/docs/download-41.html Fri Oct 23 14:52:42 2009 @@ -13,7 +13,7 @@ http://tomcat.apache.org/";> - + @@ -487,7 +487,7 @@ Copyright © 1999-2009, The Apache Software Foundation -"Apache", the Apache feather, and the Apache Tomcat logo are +"Apache", the Apache feather, and the Apache Tomcat logo are trademarks of the Apache Software Foundation for our open source software. Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=829083&r1=829082&r2=829083&view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Fri Oct 23 14:52:42 2009 @@ -13,7 +13,7 @@ http://tomcat.apache.org/";> - + @@ -512,7 +512,7 @@ Copyright © 1999-2009, The Apache Software Foundation -"Apache", the Apache feather, and the Apache Tomcat logo are +"Apache", the Apache feather, and the Apache Tomcat logo are trademarks of the Apache Software Foundation for our open source software. Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=829083&r1=829082&r2=829083&view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Fri Oct 23 14:52:42 2009 @@ -13,7 +13,7 @@ http://tomcat.apache.org/";> - + @@ -457,7 +457,7 @@ Copyright © 1999-2009, T
How to upload the site
Hi, I've committed the 10th anniversary logo to the site. How to put that to tomcat.apache.org svn export --force ? Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: How to upload the site
Mladen Turk wrote: > Hi, > > I've committed the 10th anniversary logo > to the site. How to put that to tomcat.apache.org > svn export --force ? umask 002 svn up Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: How to upload the site
On 23/10/09 17:04, Mark Thomas wrote: Mladen Turk wrote: Hi, I've committed the 10th anniversary logo to the site. How to put that to tomcat.apache.org svn export --force ? umask 002 svn up Thanks Mark. So now it's just a sync time, right? Cheers -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: How to upload the site
Mladen Turk wrote: > On 23/10/09 17:04, Mark Thomas wrote: >> Mladen Turk wrote: >>> Hi, >>> >>> I've committed the 10th anniversary logo >>> to the site. How to put that to tomcat.apache.org >>> svn export --force ? >> >> umask 002 >> svn up >> > > Thanks Mark. > So now it's just a sync time, right? Correct. About an hour I believe. If you configure your browser to use 140.211.11.10:80 as a proxy you can preview what the site will look like. Looks cool :) Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: How to upload the site
On 23/10/2009, Mladen Turk wrote: > On 23/10/09 17:04, Mark Thomas wrote: > > > Mladen Turk wrote: > > > > > Hi, > > > > > > I've committed the 10th anniversary logo > > > to the site. How to put that to tomcat.apache.org > > > svn export --force ? > > > > > > > umask 002 > > svn up > > > > > > Thanks Mark. > So now it's just a sync time, right? > The new logo shows up OK when using the HTTP proxy minotaur-2.apache.org:80 > Cheers > -- > ^TM > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: How to upload the site
> If you configure your browser to use 140.211.11.10:80 as a proxy you can > preview what the site will look like. Great ! - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r829121 - in /tomcat/trunk/java/org/apache/catalina/startup: ContextConfig.java LocalStrings.properties WebRuleSet.java WebXml.java
Author: markt
Date: Fri Oct 23 16:39:32 2009
New Revision: 829121
URL: http://svn.apache.org/viewvc?rev=829121&view=rev
Log:
Add support for absolute ordering of web fragments and the start of the
fragment merge code
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=829121&r1=829120&r2=829121&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Oct 23
16:39:32 2009
@@ -29,8 +29,10 @@
import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -1235,7 +1237,7 @@
if (!webXml.isMetadataComplete()) {
// Have to process JARs for fragments
-Map fragments = processJarsForWebFragments();
+Map fragments = processJarsForWebFragments();
// Merge the fragments into the main web.xml
mergeWebFragments(webXml, fragments);
@@ -1452,7 +1454,7 @@
*
* @return A map of JAR name to processed web fragment (if any)
*/
-protected Map processJarsForWebFragments() {
+protected Map processJarsForWebFragments() {
JarScanner jarScanner = context.getJarScanner();
FragmentJarScannerCallback callback = new FragmentJarScannerCallback();
@@ -1467,7 +1469,7 @@
private static final String FRAGMENT_LOCATION =
"META-INF/web-fragment.xml";
-private Map fragments = new HashMap();
+private Map fragments = new HashMap();
@Override
public void scan(JarURLConnection urlConn) throws IOException {
@@ -1505,7 +1507,15 @@
// ignore
}
}
-fragments.put(urlConn.getURL(), fragment);
+if (fragment == null) {
+fragments.put(urlConn.getURL().toString(), fragment);
+} else {
+fragment.setURL(urlConn.getURL());
+if (fragment.getName() == null) {
+fragment.setName(fragment.getURL().toString());
+}
+fragments.put(fragment.getName(), fragment);
+}
}
}
@@ -1533,11 +1543,19 @@
// ignore
}
}
-fragments.put(file.toURI().toURL(), fragment);
+if (fragment == null) {
+fragments.put(file.toURI().toURL().toString(), fragment);
+} else {
+fragment.setURL(file.toURI().toURL());
+if (fragment.getName() == null) {
+fragment.setName(fragment.getURL().toString());
+}
+fragments.put(fragment.getName(), fragment);
+}
}
}
-public Map getFragments() {
+public Map getFragments() {
return fragments;
}
}
@@ -1547,22 +1565,61 @@
* Servlet spec.
*
* @param application The application web.xml file
- * @param fragments The map of JARs to web fragments
+ * @param fragments The map of fragment names to web fragments
*/
protected void mergeWebFragments(WebXml application,
-Map fragments) {
-// TODO SERVLET3
-// Check order
+Map fragments) {
+
+Set orderedFragments = new LinkedHashSet();
+
+boolean absoluteOrdering =
+(application.getAbsoluteOrdering() != null);
+
+if (absoluteOrdering) {
+// Only those fragments listed should be processed
+Set requestedOrder = application.getAbsoluteOrdering();
+
+for (String requestedName : requestedOrder) {
+if (WebXml.ORDER_OTHERS.equals(requestedName)) {
+// Add all fragments not named explicitly at this point
+for (String name : fragments.keySet()) {
+if (!requestedOrder.contains(name)) {
+WebXml fragment = fragments.get(name);
+if (fragment != null) {
+orderedFragments.add(fragment);
+}
+
DO NOT REPLY [Bug 47712] NoSuchFieldException when trying to use Tomcat Native library
https://issues.apache.org/bugzilla/show_bug.cgi?id=47712 --- Comment #2 from Joe Dane 2009-10-23 10:42:28 UTC --- Consider this another vote for someone to take a look at this extremely irritating bug. Tomcat will simply and quietly fail to use apr as long as this remains unfixed. -- 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 47718] ManagerBase leaks fd to /dev/urandom when context stopped
https://issues.apache.org/bugzilla/show_bug.cgi?id=47718 --- Comment #1 from George Sexton 2009-10-23 11:38:12 UTC --- This issue also applies to Tomcat 6.0.20. -- 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 47712] NoSuchFieldException when trying to use Tomcat Native library
https://issues.apache.org/bugzilla/show_bug.cgi?id=47712 Rainer Jung changed: What|Removed |Added Keywords||PatchAvailable --- Comment #3 from Rainer Jung 2009-10-23 12:56:06 UTC --- Sorry this got broken in 5.5.28. I proposed the attached patch for inclusion in the next version. -- 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 47712] NoSuchFieldException when trying to use Tomcat Native library
https://issues.apache.org/bugzilla/show_bug.cgi?id=47712 --- Comment #4 from Rainer Jung 2009-10-23 12:57:45 UTC --- Created an attachment (id=24411) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24411) Get Fields before switching to different clazz. -- 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: r829196 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Fri Oct 23 20:00:07 2009 New Revision: 829196 URL: http://svn.apache.org/viewvc?rev=829196&view=rev Log: Add proposal. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=829196&r1=829195&r2=829196&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Oct 23 20:00:07 2009 @@ -148,3 +148,9 @@ http://svn.apache.org/viewvc?rev=828225&view=rev +1: markt -1: + +* Loading tcnative is broken since r795039. + https://issues.apache.org/bugzilla/show_bug.cgi?id=47712 + https://issues.apache.org/bugzilla/attachment.cgi?id=24411 + +1: rjung + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r829196 - /tomcat/tc5.5.x/trunk/STATUS.txt
On 23.10.2009 22:00, rj...@apache.org wrote: > +* Loading tcnative is broken since r795039. > + https://issues.apache.org/bugzilla/show_bug.cgi?id=47712 > + https://issues.apache.org/bugzilla/attachment.cgi?id=24411 > + +1: rjung > + -1: Just a short note: this is a regression from TC 5.5.27. Loading tcnative is broken. The patch is pretty easy to review. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Customized WebClassLoader doesn't run when the classes import in jsp file
Hi All: I write a customized class loader which extends org.apache.catalina.loader.WebappClassLoader and define it in the server.xml. Such as: I override the method of findResourceInternal to do some works. It works when I startup the tomcat server. The overrided method runs when the tomcat loads classes which imported in the class file. But when I import a class in the JSP file Such as <%...@page import="com.berheley.hcms.util.BasalInfo"%> The customized class loader does not run. The class org.apache.catalina.loader.WebappClassLoader runs instead. Any ideas? Thanks! -- Karl Yuan 2009-10-24 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
