JBossWeb SVN: r689 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-06-30 13:38:13 -0400 (Mon, 30 Jun 2008)
New Revision: 689
Modified:
trunk/java/org/apache/catalina/core/ContainerBase.java
Log:
- Useful for embedded mode (a failed init() would call destroy()), do not remove a real context because there
was an attempt to deploy something bad.
- JBAS-5671.
Modified: trunk/java/org/apache/catalina/core/ContainerBase.java
===================================================================
--- trunk/java/org/apache/catalina/core/ContainerBase.java 2008-06-27 10:05:50 UTC (rev 688)
+++ trunk/java/org/apache/catalina/core/ContainerBase.java 2008-06-30 17:38:13 UTC (rev 689)
@@ -923,6 +923,8 @@
synchronized(children) {
if (children.get(child.getName()) == null)
return;
+ if (children.get(child.getName()) != child)
+ return;
children.remove(child.getName());
}
16 years, 8 months
JBossWeb SVN: r688 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-06-27 06:05:50 -0400 (Fri, 27 Jun 2008)
New Revision: 688
Modified:
trunk/java/org/apache/catalina/core/StandardContext.java
Log:
Revert previous commit...
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2008-06-27 09:53:06 UTC (rev 687)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2008-06-27 10:05:50 UTC (rev 688)
@@ -4322,7 +4322,7 @@
oldCCL = bindThread();
// Annotation processor setup
- if (ok && ! getIgnoreAnnotations() ) {
+ if (ok ) {
if (instanceManager == null) {
javax.naming.Context context = null;
if (isUseNaming() && namingContextListener != null) {
16 years, 8 months
JBossWeb SVN: r687 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-06-27 05:53:06 -0400 (Fri, 27 Jun 2008)
New Revision: 687
Modified:
trunk/java/org/apache/catalina/core/StandardContext.java
Log:
Don't start the anotation processor if the context ignores them.
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2008-06-27 08:46:12 UTC (rev 686)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2008-06-27 09:53:06 UTC (rev 687)
@@ -4322,7 +4322,7 @@
oldCCL = bindThread();
// Annotation processor setup
- if (ok ) {
+ if (ok && ! getIgnoreAnnotations() ) {
if (instanceManager == null) {
javax.naming.Context context = null;
if (isUseNaming() && namingContextListener != null) {
16 years, 8 months
JBossWeb SVN: r686 - trunk/java/org/apache/catalina/startup.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-06-27 04:46:12 -0400 (Fri, 27 Jun 2008)
New Revision: 686
Modified:
trunk/java/org/apache/catalina/startup/Embedded.java
Log:
Use better default value.
Modified: trunk/java/org/apache/catalina/startup/Embedded.java
===================================================================
--- trunk/java/org/apache/catalina/startup/Embedded.java 2008-06-24 16:28:54 UTC (rev 685)
+++ trunk/java/org/apache/catalina/startup/Embedded.java 2008-06-27 08:46:12 UTC (rev 686)
@@ -417,7 +417,7 @@
try {
if (protocol.equals("ajp")) {
- connector = new Connector("org.apache.jk.server.JkCoyoteHandler");
+ connector = new Connector("org.apache.coyote.ajp.AjpProtocol");
} else if (protocol.equals("memory")) {
connector = new Connector("org.apache.coyote.memory.MemoryProtocolHandler");
} else if (protocol.equals("http")) {
16 years, 8 months
JBossWeb SVN: r685 - trunk/java/org/apache/catalina/session.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-06-24 12:28:54 -0400 (Tue, 24 Jun 2008)
New Revision: 685
Modified:
trunk/java/org/apache/catalina/session/StandardSession.java
Log:
- Port patch: Fix NPE for compatibility.
Modified: trunk/java/org/apache/catalina/session/StandardSession.java
===================================================================
--- trunk/java/org/apache/catalina/session/StandardSession.java 2008-06-24 16:27:43 UTC (rev 684)
+++ trunk/java/org/apache/catalina/session/StandardSession.java 2008-06-24 16:28:54 UTC (rev 685)
@@ -1638,6 +1638,9 @@
*/
protected void removeAttributeInternal(String name, boolean notify) {
+ // Avoid NPE
+ if (name == null) return;
+
// Remove this attribute from our collection
Object value = attributes.remove(name);
16 years, 8 months
JBossWeb SVN: r684 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-06-24 12:27:43 -0400 (Tue, 24 Jun 2008)
New Revision: 684
Modified:
trunk/java/org/apache/catalina/core/StandardService.java
Log:
- Use DELAY_CONNECTOR_STARTUP in stop as well.
Modified: trunk/java/org/apache/catalina/core/StandardService.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardService.java 2008-06-24 11:03:55 UTC (rev 683)
+++ trunk/java/org/apache/catalina/core/StandardService.java 2008-06-24 16:27:43 UTC (rev 684)
@@ -567,9 +567,11 @@
lifecycle.fireLifecycleEvent(BEFORE_STOP_EVENT, null);
// Stop our defined Connectors first
- synchronized (connectors) {
- for (int i = 0; i < connectors.length; i++) {
- connectors[i].pause();
+ if (!DELAY_CONNECTOR_STARTUP) {
+ synchronized (connectors) {
+ for (int i = 0; i < connectors.length; i++) {
+ connectors[i].pause();
+ }
}
}
@@ -589,10 +591,12 @@
}
// Stop our defined Connectors first
- synchronized (connectors) {
- for (int i = 0; i < connectors.length; i++) {
- if (connectors[i] instanceof Lifecycle)
- ((Lifecycle) connectors[i]).stop();
+ if (!DELAY_CONNECTOR_STARTUP) {
+ synchronized (connectors) {
+ for (int i = 0; i < connectors.length; i++) {
+ if (connectors[i] instanceof Lifecycle)
+ ((Lifecycle) connectors[i]).stop();
+ }
}
}
16 years, 8 months
JBossWeb SVN: r683 - in trunk/java/org/apache/jasper: resources and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-06-24 07:03:55 -0400 (Tue, 24 Jun 2008)
New Revision: 683
Modified:
trunk/java/org/apache/jasper/compiler/Parser.java
trunk/java/org/apache/jasper/resources/LocalStrings.properties
Log:
- Raise an optional error for invalid quotes.
Modified: trunk/java/org/apache/jasper/compiler/Parser.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Parser.java 2008-06-24 05:37:06 UTC (rev 682)
+++ trunk/java/org/apache/jasper/compiler/Parser.java 2008-06-24 11:03:55 UTC (rev 683)
@@ -75,6 +75,11 @@
private static final String JAVAX_BODY_CONTENT_TEMPLATE_TEXT = "JAVAX_BODY_CONTENT_TEMPLATE_TEXT";
+ private static final boolean STRICT_QUOTE_ESCAPING = Boolean.valueOf(
+ System.getProperty(
+ "org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING",
+ "true")).booleanValue();
+
/**
* The constructor
*/
@@ -242,7 +247,8 @@
err.jspError(start, "jsp.error.attribute.unterminated", watch);
}
- String ret = parseQuoted(reader.getText(start, stop));
+ String ret = parseQuoted(start, reader.getText(start, stop),
+ watch.charAt(watch.length() - 1));
if (watch.length() == 1) // quote
return ret;
@@ -255,7 +261,8 @@
* QuotedChar ::= ''' | '"' | '\\' | '\"' | "\'" | '\>' | '\$' |
* Char
*/
- private String parseQuoted(String tx) {
+ private String parseQuoted(Mark start, String tx, char quote)
+ throws JasperException {
StringBuffer buf = new StringBuffer();
int size = tx.length();
int i = 0;
@@ -289,6 +296,10 @@
buf.append('\\');
++i;
}
+ } else if (ch == quote && STRICT_QUOTE_ESCAPING) {
+ // Unescaped quote character
+ err.jspError(start, "jsp.error.attribute.noescape", tx,
+ "" + quote);
} else {
buf.append(ch);
++i;
Modified: trunk/java/org/apache/jasper/resources/LocalStrings.properties
===================================================================
--- trunk/java/org/apache/jasper/resources/LocalStrings.properties 2008-06-24 05:37:06 UTC (rev 682)
+++ trunk/java/org/apache/jasper/resources/LocalStrings.properties 2008-06-24 11:03:55 UTC (rev 683)
@@ -327,6 +327,7 @@
jsp.error.attribute.noequal=equal symbol expected
jsp.error.attribute.noquote=quote symbol expected
jsp.error.attribute.unterminated=attribute for {0} is not properly terminated
+jsp.error.attribute.noescape=Attribute value {0} is quoted with {1} which must be escaped when used within the value
jsp.error.missing.tagInfo=TagInfo object for {0} is missing from TLD
jsp.error.deferredmethodsignaturewithoutdeferredmethod=Cannot specify a method signature if 'deferredMethod' is not 'true'
jsp.error.deferredvaluetypewithoutdeferredvalue=Cannot specify a value type if 'deferredValue' is not 'true'
16 years, 8 months
JBossWeb SVN: r682 - in branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-869: src/share/classes/org/apache/catalina/loader and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: scott.stark(a)jboss.org
Date: 2008-06-24 01:37:06 -0400 (Tue, 24 Jun 2008)
New Revision: 682
Modified:
branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-869/.classpath
branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-869/src/share/classes/org/apache/catalina/loader/WebappClassLoader.java
Log:
JBPAPP-869, add a org.apache.catalina.loader.WebappClassLoader.SYSTEM_CL_DELEGATION system property that when set to false, skips the delegation to the system class loader. The default is true.
Modified: branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-869/.classpath
===================================================================
--- branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-869/.classpath 2008-06-24 00:47:38 UTC (rev 681)
+++ branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-869/.classpath 2008-06-24 05:37:06 UTC (rev 682)
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/share/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JBoss5"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Ant165"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
- <classpathentry kind="lib" path="lib/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/jasper-jdt.jar"/>
- <classpathentry kind="output" path="output"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/share/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JBoss5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Ant165"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
+ <classpathentry kind="lib" path="lib/commons-logging.jar"/>
+ <classpathentry kind="lib" path="lib/jasper-jdt.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
+ <classpathentry kind="output" path="output"/>
+</classpath>
Modified: branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-869/src/share/classes/org/apache/catalina/loader/WebappClassLoader.java
===================================================================
--- branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-869/src/share/classes/org/apache/catalina/loader/WebappClassLoader.java 2008-06-24 00:47:38 UTC (rev 681)
+++ branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-869/src/share/classes/org/apache/catalina/loader/WebappClassLoader.java 2008-06-24 05:37:06 UTC (rev 682)
@@ -111,7 +111,14 @@
public static final boolean ENABLE_CLEAR_REFERENCES =
Boolean.valueOf(System.getProperty("org.apache.catalina.loader.WebappClassLoader.ENABLE_CLEAR_REFERENCES", "true")).booleanValue();
-
+
+ public static final boolean SYSTEM_CL_DELEGATION =
+ Boolean.valueOf(System.getProperty("org.apache.catalina.loader.WebappClassLoader.SYSTEM_CL_DELEGATION", "true")).booleanValue();
+
+ /** A list of packages that define system classes */
+ public static final String SYSTEM_CLASS_PATTERNS =
+ System.getProperty("org.apache.catalina.loader.SYSTEM_CLASS_PATTERNS", "java.,javax.,org.ietf.jgss,org.w3c.dom,org.xml.sax");
+
protected class PrivilegedFindResource
implements PrivilegedAction {
@@ -1269,15 +1276,17 @@
// (0.2) Try loading the class with the system class loader, to prevent
// the webapp from overriding J2SE classes
- try {
- clazz = system.loadClass(name);
- if (clazz != null) {
- if (resolve)
- resolveClass(clazz);
- return (clazz);
- }
- } catch (ClassNotFoundException e) {
- // Ignore
+ if (SYSTEM_CL_DELEGATION) {
+ try {
+ clazz = system.loadClass(name);
+ if (clazz != null) {
+ if (resolve)
+ resolveClass(clazz);
+ return (clazz);
+ }
+ } catch (ClassNotFoundException e) {
+ // Ignore
+ }
}
// (0.5) Permission to access this class when using a SecurityManager
16 years, 8 months
JBossWeb SVN: r681 - branches.
by jbossweb-commits＠lists.jboss.org
Author: scott.stark(a)jboss.org
Date: 2008-06-23 20:47:38 -0400 (Mon, 23 Jun 2008)
New Revision: 681
Added:
branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-869/
Log:
Copy JBOSSWEB_2_0_0_GA_CP into JBOSSWEB_2_0_0_GA_CP01_JBPAPP-869 for testing of JBPAPP-869
Copied: branches/JBOSSWEB_2_0_0_GA_CP01_JBPAPP-869 (from rev 680, branches/JBOSSWEB_2_0_0_GA_CP)
16 years, 8 months
JBossWeb SVN: r680 - tags.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-06-20 12:53:45 -0400 (Fri, 20 Jun 2008)
New Revision: 680
Added:
tags/JBOSSWEB_2_0_0_GA_CP06/
Log:
Release CP06
Copied: tags/JBOSSWEB_2_0_0_GA_CP06 (from rev 679, branches/JBOSSWEB_2_0_0_GA_CP)
16 years, 8 months