JBossWeb SVN: r405 - trunk.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-01-22 09:49:24 -0500 (Tue, 22 Jan 2008)
New Revision: 405
Modified:
trunk/build.properties.default
Log:
- Fix JDT 3.3.1 location.
Modified: trunk/build.properties.default
===================================================================
--- trunk/build.properties.default 2008-01-21 15:28:26 UTC (rev 404)
+++ trunk/build.properties.default 2008-01-22 14:49:24 UTC (rev 405)
@@ -38,7 +38,7 @@
jdt.home=${base.path}/eclipse/plugins
jdt.lib=${jdt.home}
jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
-jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
+jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
# ----- Tomcat native library -----
tomcat-native.home=${base.path}/tomcat-native-1.1.12
16 years, 3 months
JBossWeb SVN: r404 - trunk/java/org/jboss/web/php.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-01-21 10:28:26 -0500 (Mon, 21 Jan 2008)
New Revision: 404
Modified:
trunk/java/org/jboss/web/php/ScriptEnvironment.java
Log:
Arrange PHP_SELF and SCRIPT_NAME.
Modified: trunk/java/org/jboss/web/php/ScriptEnvironment.java
===================================================================
--- trunk/java/org/jboss/web/php/ScriptEnvironment.java 2008-01-18 23:47:09 UTC (rev 403)
+++ trunk/java/org/jboss/web/php/ScriptEnvironment.java 2008-01-21 15:28:26 UTC (rev 404)
@@ -213,13 +213,9 @@
+ File.separator + name;
// NOTE: Original CGI messes the Win path.
fullName = fullName.replace(File.separatorChar, '/');
- if (!fullName.equals(servletPath)) {
- if (".".equals(contextPath)) {
- scriptName = servletPath + fullName;
- }
- else {
- scriptName = contextPath + servletPath + fullName;
- }
+
+ if (contextPath != null && ! "".equals(contextPath) && ! "/".equals(contextPath)) {
+ scriptName = contextPath + fullName;
}
else {
// NOTE: set scriptName to fullName
@@ -493,8 +489,19 @@
scriptFullPath.lastIndexOf(File.separator)));
envp.put("SCRIPT_FILENAME", scriptFullPath);
- envp.put("PHP_SELF", nullsToBlanks(sFullName));
+ envp.put("CONTEXT_PATH", nullsToBlanks(contextPath));
+
+ String self = "";
+ if (contextPath != null && ! "".equals(contextPath) && ! "/".equals(contextPath)) {
+ self = contextPath;
+ }
+ if (servletPath != null && ! "".equals(servletPath) && ! "/".equals(servletPath)) {
+ self = self.concat(servletPath);
+ }
+
+ envp.put("PHP_SELF", nullsToBlanks(self));
+
if (req.isSecure()) {
envp.put("HTTPS", "ON");
envp.put("SSL_CIPHER", req.getAttribute(CIPHER_SUITE));
16 years, 3 months
JBossWeb SVN: r403 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-01-18 18:47:09 -0500 (Fri, 18 Jan 2008)
New Revision: 403
Modified:
trunk/build.properties.default
trunk/webapps/docs/changelog.xml
Log:
- Update commons-pool to 1.4.
Modified: trunk/build.properties.default
===================================================================
--- trunk/build.properties.default 2008-01-18 16:19:56 UTC (rev 402)
+++ trunk/build.properties.default 2008-01-18 23:47:09 UTC (rev 403)
@@ -27,12 +27,9 @@
compile.target=1.5
compile.debug=true
-base-jakarta.loc=http://archive.apache.org/dist/jakarta
+base-commons.loc=http://archive.apache.org/dist/commons
base-tomcat.loc=http://archive.apache.org/dist/tomcat
-# ----- Commons Logging, version 1.1 or later -----
-commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-1.1.1-src.tar.gz
-
# ----- Webservices -----
jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-...
wsdl4j-src.loc=http://repo1.maven.org/maven2/wsdl4j/wsdl4j/1.6.1/wsdl4j-1...
@@ -44,25 +41,25 @@
jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
# ----- Tomcat native library -----
-tomcat-native.home=${base.path}/tomcat-native-1.1.10
+tomcat-native.home=${base.path}/tomcat-native-1.1.12
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.10-src.tar.gz
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.12-src.tar.gz
# ----- Commons DBCP, version 1.1 or later -----
commons-dbcp.version=1.2.2
commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src
-commons-dbcp-src.loc=${base-jakarta.loc}/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
+commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
# ----- Commons Pool, version 1.1 or later -----
-commons-pool.home=${base.path}/commons-pool-1.3-src
-commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/commons-pool-1.3-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.4-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.4-src.tar.gz
# ----- Commons Collections, version 2.0 or later -----
commons-collections.home=${base.path}/commons-collections-3.2-src
commons-collections.lib=${commons-collections.home}
commons-collections.jar=${commons-collections.lib}/commons-collections-3.2.jar
commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.2.tar.gz
-commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.2-src.tar.gz
+commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz
# ----- NSIS, version 2.0 or later -----
nsis.home=${base.path}/nsis-2.34
@@ -76,5 +73,5 @@
commons-daemon.home=${base.path}/commons-daemon-1.0.1
commons-daemon.lib=${commons-daemon.home}
commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-commons-daemon.loc=${base-jakarta.loc}/commons/daemon/binaries/commons-daemon-1.0.1.tar.gz
+commons-daemon.loc=${base-commons.loc}/daemon/binaries/commons-daemon-1.0.1.tar.gz
commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-01-18 16:19:56 UTC (rev 402)
+++ trunk/webapps/docs/changelog.xml 2008-01-18 23:47:09 UTC (rev 403)
@@ -29,6 +29,10 @@
Update commons-logging to version 1.1.1 and the NSIS installer to 2.34.
(markt)
</update>
+ <update>
+ Update to commons-pool version 1.4, native version 1.1.12 and update
+ the download location for the commons libraries. (markt)
+ </update>
</changelog>
</subsection>
<subsection name="Catalina">
16 years, 3 months
JBossWeb SVN: r402 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-01-18 11:19:56 -0500 (Fri, 18 Jan 2008)
New Revision: 402
Modified:
trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
trunk/webapps/docs/changelog.xml
Log:
- Finish removing of URL CL hardcoding.
Modified: trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 2008-01-18 07:56:24 UTC (rev 401)
+++ trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 2008-01-18 16:19:56 UTC (rev 402)
@@ -154,7 +154,7 @@
*/
private ServletContext context;
private Options options;
- private URLClassLoader parentClassLoader;
+ private ClassLoader parentClassLoader;
private PermissionCollection permissionCollection;
private CodeSource codeSource;
private String classpath;
@@ -222,7 +222,7 @@
*
* @return URLClassLoader parent
*/
- public URLClassLoader getParentClassLoader() {
+ public ClassLoader getParentClassLoader() {
return parentClassLoader;
}
@@ -325,7 +325,11 @@
*/
private void initClassPath() {
- URL [] urls = parentClassLoader.getURLs();
+ if (!(parentClassLoader instanceof URLClassLoader)) {
+ return;
+ }
+
+ URL [] urls = ((URLClassLoader) parentClassLoader).getURLs();
StringBuffer cpath = new StringBuffer();
String sep = System.getProperty("path.separator");
@@ -409,7 +413,7 @@
"accessClassInPackage.org.apache.jasper.runtime") );
if (parentClassLoader instanceof URLClassLoader) {
- URL [] urls = parentClassLoader.getURLs();
+ URL [] urls = ((URLClassLoader) parentClassLoader).getURLs();
String jarUrl = null;
String jndiUrl = null;
for (int i=0; i<urls.length; i++) {
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-01-18 07:56:24 UTC (rev 401)
+++ trunk/webapps/docs/changelog.xml 2008-01-18 16:19:56 UTC (rev 402)
@@ -195,6 +195,10 @@
<fix>
<bug>43743</bug>: Correctly handle nest tag files packaged in a jar. (markt)
</fix>
+ <fix>
+ Finish removing of some URL CL hardcoding. If parent CL is not a URL CL, the Ant classpath cannot
+ be generated, and security setup might be incomplete. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
16 years, 3 months
JBossWeb SVN: r401 - trunk/java/org/jboss/web/php.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-01-18 02:56:24 -0500 (Fri, 18 Jan 2008)
New Revision: 401
Modified:
trunk/java/org/jboss/web/php/ScriptEnvironment.java
Log:
Improve previous patch for Portal support.
Submittted by Thomas Heute.
Modified: trunk/java/org/jboss/web/php/ScriptEnvironment.java
===================================================================
--- trunk/java/org/jboss/web/php/ScriptEnvironment.java 2008-01-17 23:57:39 UTC (rev 400)
+++ trunk/java/org/jboss/web/php/ScriptEnvironment.java 2008-01-18 07:56:24 UTC (rev 401)
@@ -565,18 +565,20 @@
this.webAppRootDir = context.getRealPath("/");
this.tempDir = (File)context.getAttribute(Globals.WORK_DIR_ATTR);
- this.contextPath = req.getParameter("context");
- if (this.contextPath == null) {
- this.contextPath = req.getContextPath();
- }
- this.servletPath = req.getParameter("servlet");
- if (this.servletPath == null) {
- this.servletPath = req.getServletPath();
+ if (req.getAttribute(Globals.INCLUDE_CONTEXT_PATH_ATTR) != null) {
+ // Include
+ this.contextPath = (String) req.getAttribute(Globals.INCLUDE_CONTEXT_PATH_ATTR);
+ this.servletPath = (String) req.getAttribute(Globals.INCLUDE_SERVLET_PATH_ATTR);
+ this.pathInfo = (String) req.getAttribute(Globals.INCLUDE_PATH_INFO_ATTR);
}
+ else {
+ // Direct call
+ this.contextPath = req.getContextPath();
+ this.servletPath = req.getServletPath();
+ this.pathInfo = req.getPathInfo();
+ }
- this.pathInfo = req.getPathInfo();
-
// If getPathInfo() returns null, must be using extension mapping
// In this case, pathInfo should be same as servletPath
if (this.pathInfo == null) {
16 years, 3 months
JBossWeb SVN: r400 - in trunk: java/org/apache/catalina/manager and 4 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-01-17 18:57:39 -0500 (Thu, 17 Jan 2008)
New Revision: 400
Modified:
trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
trunk/java/org/apache/catalina/manager/LocalStrings.properties
trunk/java/org/apache/catalina/session/StandardManager.java
trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
trunk/res/tomcat.nsi
trunk/webapps/docs/changelog.xml
Log:
- HTML manager fix.
- Manager session count fix.
- Installer file selection fix (will need some more work).
Modified: trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
===================================================================
--- trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java 2008-01-17 21:53:54 UTC (rev 399)
+++ trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java 2008-01-17 23:57:39 UTC (rev 400)
@@ -32,9 +32,8 @@
* <b>Definition</b>:
* <pre>
* <path id="catalina_ant">
- * <fileset dir="${catalina.home}/server/lib">
+ * <fileset dir="${catalina.home}/lib">
* <include name="catalina-ant.jar"/>
- * <include name="catalina-ant-jmx.jar"/>
* </fileset>
* </path>
*
Modified: trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
===================================================================
--- trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java 2008-01-17 21:53:54 UTC (rev 399)
+++ trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java 2008-01-17 23:57:39 UTC (rev 400)
@@ -32,9 +32,8 @@
* Definition
* <pre>
* <path id="catalina_ant">
- * <fileset dir="${catalina.home}/server/lib">
+ * <fileset dir="${catalina.home}/lib">
* <include name="catalina-ant.jar"/>
- * <include name="catalina-ant-jmx.jar"/>
* </fileset>
* </path>
*
Modified: trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
===================================================================
--- trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 2008-01-17 21:53:54 UTC (rev 399)
+++ trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 2008-01-17 23:57:39 UTC (rev 400)
@@ -382,7 +382,7 @@
Map.Entry entry = (Map.Entry) iterator.next();
String displayPath = (String) entry.getKey();
- String contextPath = (String) entry.getKey();
+ String contextPath = (String) entry.getValue();
Context context = (Context) host.findChild(contextPath);
if (displayPath.equals("")) {
displayPath = "/";
@@ -441,7 +441,12 @@
"/html/expire?path=" + displayPath);
args[9] = appsExpire;
args[10] = sm.getString("htmlManagerServlet.expire.explain");
- args[11] = new Integer(context.getManager().getMaxInactiveInterval()/60);
+ if (context.getManager() == null) {
+ args[11] = sm.getString("htmlManagerServlet.noManager");
+ } else {
+ args[11] = new Integer(
+ context.getManager().getMaxInactiveInterval()/60);
+ }
args[12] = sm.getString("htmlManagerServlet.expire.unit");
args[13] = highlightColor;
Modified: trunk/java/org/apache/catalina/manager/LocalStrings.properties
===================================================================
--- trunk/java/org/apache/catalina/manager/LocalStrings.properties 2008-01-17 21:53:54 UTC (rev 399)
+++ trunk/java/org/apache/catalina/manager/LocalStrings.properties 2008-01-17 23:57:39 UTC (rev 400)
@@ -31,6 +31,7 @@
htmlManagerServlet.list=List Applications
htmlManagerServlet.manager=Manager
htmlManagerServlet.messageLabel=Message:
+htmlManagerServlet.noManager=-
htmlManagerServlet.serverJVMVendor=JVM Vendor
htmlManagerServlet.serverJVMVersion=JVM Version
htmlManagerServlet.serverOSArch=OS Architecture
Modified: trunk/java/org/apache/catalina/session/StandardManager.java
===================================================================
--- trunk/java/org/apache/catalina/session/StandardManager.java 2008-01-17 21:53:54 UTC (rev 399)
+++ trunk/java/org/apache/catalina/session/StandardManager.java 2008-01-17 23:57:39 UTC (rev 400)
@@ -395,9 +395,10 @@
session.setManager(this);
sessions.put(session.getIdInternal(), session);
session.activate();
+ sessionCounter++;
}
} catch (ClassNotFoundException e) {
- log.error(sm.getString("standardManager.loading.cnfe", e), e);
+ log.error(sm.getString("standardManager.loading.cnfe", e), e);
if (ois != null) {
try {
ois.close();
@@ -408,7 +409,7 @@
}
throw e;
} catch (IOException e) {
- log.error(sm.getString("standardManager.loading.ioe", e), e);
+ log.error(sm.getString("standardManager.loading.ioe", e), e);
if (ois != null) {
try {
ois.close();
Modified: trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
===================================================================
--- trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java 2008-01-17 21:53:54 UTC (rev 399)
+++ trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java 2008-01-17 23:57:39 UTC (rev 400)
@@ -125,6 +125,7 @@
if (needCRLFParse) {
needCRLFParse = false;
+ // FIXME: parse CRLF could return 0 in NB
parseCRLF();
}
@@ -141,6 +142,7 @@
int result = 0;
if (pos >= lastValid) {
+ // FIXME: parse CRLF could return 0 in NB
readBytes();
}
@@ -154,7 +156,14 @@
chunk.setBytes(buf, pos, remaining);
pos = pos + remaining;
remaining = 0;
- needCRLFParse = true;
+ //we need a CRLF
+ if ((pos+1) >= lastValid) {
+ //if we call parseCRLF we overrun the buffer here
+ //so we defer it to the next call BZ 11117
+ needCRLFParse = true;
+ } else {
+ parseCRLF(); //parse the CRLF immediately
+ }
}
return result;
@@ -310,6 +319,7 @@
throws IOException {
boolean eol = false;
+ boolean crfound = false;
while (!eol) {
@@ -319,7 +329,10 @@
}
if (buf[pos] == Constants.CR) {
+ if (crfound) throw new IOException("Invalid CRLF, two CR characters encountered.");
+ crfound = true;
} else if (buf[pos] == Constants.LF) {
+ if (!crfound) throw new IOException("Invalid CRLF, no CR character encountered.");
eol = true;
} else {
throw new IOException("Invalid CRLF");
Modified: trunk/res/tomcat.nsi
===================================================================
--- trunk/res/tomcat.nsi 2008-01-17 21:53:54 UTC (rev 399)
+++ trunk/res/tomcat.nsi 2008-01-17 23:57:39 UTC (rev 400)
@@ -122,20 +122,26 @@
SetOutPath $INSTDIR
File tomcat.ico
File LICENSE
- File /r lib
- File /nonfatal /r logs
- File /nonfatal /r work
- File /nonfatal /r temp
+ SetOutPath $INSTDIR\lib
+ File /r lib\*.*
+ SetOutPath $INSTDIR\logs
+ File /nonfatal /r logs\*.*
+ SetOutPath $INSTDIR\work
+ File /nonfatal /r work\*.*
+ SetOutPath $INSTDIR\temp
+ File /nonfatal /r temp\*.*
SetOutPath $INSTDIR\bin
File bin\bootstrap.jar
File bin\tomcat-juli.jar
File bin\*.exe
SetOutPath $INSTDIR\conf
File conf\*.*
- SetOutPath $INSTDIR\webapps
- File /r webapps\ROOT
- File /r webapps\host-manager
- File /r webapps\manager
+ SetOutPath $INSTDIR\webapps\ROOT
+ File /r webapps\ROOT\*.*
+ SetOutPath $INSTDIR\webapps\host-manager
+ File /r webapps\host-manager\*.*
+ SetOutPath $INSTDIR\webapps\manager
+ File /r webapps\manager\*.*
Call configure
Call findJavaPath
@@ -271,8 +277,8 @@
Section "Documentation" SecDocs
SectionIn 1 3
- SetOutPath $INSTDIR\webapps
- File /r webapps\docs
+ SetOutPath $INSTDIR\webapps\docs
+ File /r webapps\docs\*.*
SectionEnd
@@ -281,8 +287,8 @@
SectionIn 3
SetOverwrite on
- SetOutPath $INSTDIR\webapps
- File /r webapps\examples
+ SetOutPath $INSTDIR\webapps\examples
+ File /r webapps\examples\*.*
SectionEnd
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-01-17 21:53:54 UTC (rev 399)
+++ trunk/webapps/docs/changelog.xml 2008-01-17 23:57:39 UTC (rev 400)
@@ -25,6 +25,10 @@
<fix>
Fix licensing problems with two xsd files. (remm)
</fix>
+ <update>
+ Update commons-logging to version 1.1.1 and the NSIS installer to 2.34.
+ (markt)
+ </update>
</changelog>
</subsection>
<subsection name="Catalina">
@@ -132,6 +136,9 @@
Add org.apache.catalina.loader.WebappClassLoader.SYSTEM_CL_DELEGATION boolean system
property to avoid systematic system CL delegation if needed. (remm)
</fix>
+ <fix>
+ Set correct StandardManager.sessionCounter after reload/restart. (pero)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -200,6 +207,14 @@
<fix>
<bug>44088</bug>: Fix expire session button in manager. (markt)
</fix>
+ <fix>
+ <bug>43468</bug>: Fix possible NPE when listing contexts in the Manager
+ application. (markt)
+ </fix>
+ <fix>
+ <bug>43515</bug>: Fix bug in Manager application that may have caused
+ problems when listing contexts. Patch provided by Lucas Galfaso. (markt)
+ </fix>
</changelog>
</subsection>
</section>
16 years, 3 months
JBossWeb SVN: r399 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-01-17 16:53:54 -0500 (Thu, 17 Jan 2008)
New Revision: 399
Added:
trunk/java/org/apache/catalina/core/RestrictedListeners.properties
Log:
- Fix listener list initialization.
Added: trunk/java/org/apache/catalina/core/RestrictedListeners.properties
===================================================================
--- trunk/java/org/apache/catalina/core/RestrictedListeners.properties (rev 0)
+++ trunk/java/org/apache/catalina/core/RestrictedListeners.properties 2008-01-17 21:53:54 UTC (rev 399)
@@ -0,0 +1 @@
+
Property changes on: trunk/java/org/apache/catalina/core/RestrictedListeners.properties
___________________________________________________________________
Name: svn:executable
+ *
16 years, 3 months
JBossWeb SVN: r398 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-01-17 16:53:31 -0500 (Thu, 17 Jan 2008)
New Revision: 398
Modified:
trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Log:
- Fix listener list initialization.
Modified: trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
===================================================================
--- trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 2008-01-17 16:42:48 UTC (rev 397)
+++ trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 2008-01-17 21:53:31 UTC (rev 398)
@@ -88,7 +88,7 @@
this.getClass().getClassLoader().getResourceAsStream
("org/apache/catalina/core/RestrictedListeners.properties");
if (is != null) {
- restrictedFilters.load(is);
+ restrictedListeners.load(is);
} else {
catalinaContext.getLogger().error(sm.getString("defaultInstanceManager.restrictedListenersResources"));
}
16 years, 3 months
JBossWeb SVN: r397 - sandbox/webapps/src.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-01-17 11:42:48 -0500 (Thu, 17 Jan 2008)
New Revision: 397
Modified:
sandbox/webapps/src/TestSnoop.java
Log:
Display the attributes too.
Modified: sandbox/webapps/src/TestSnoop.java
===================================================================
--- sandbox/webapps/src/TestSnoop.java 2008-01-17 15:38:46 UTC (rev 396)
+++ sandbox/webapps/src/TestSnoop.java 2008-01-17 16:42:48 UTC (rev 397)
@@ -71,6 +71,7 @@
out.println(new Date(session.getLastAccessedTime()));
System.out.println("Created: " + new Date(session.getLastAccessedTime()));
+ out.println("Paramters:<br>");
Enumeration e = request.getParameterNames();
for ( ; e.hasMoreElements() ;) {
String name = (String) e.nextElement();
@@ -80,6 +81,18 @@
out.println("<P>");
System.out.println("name: " + name + " value: " + value);
}
+
+ out.println("<br>Attributes:<br>");
+ e = request.getAttributeNames();
+ for ( ; e.hasMoreElements() ;) {
+ String name = (String) e.nextElement();
+ String value = (String) request.getAttribute(name);
+ out.println("<P>");
+ out.println("name: " + name + " value: " + value);
+ out.println("<P>");
+ System.out.println("name: " + name + " value: " + value);
+ }
+
out.println("<br>contextPath: " + request.getContextPath());
out.println("<br>servletPath: " + request.getServletPath());
out.println("<br>pathInfo: " + request.getPathInfo());
16 years, 3 months
JBossWeb SVN: r396 - trunk/java/org/jboss/web/php.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-01-17 10:38:46 -0500 (Thu, 17 Jan 2008)
New Revision: 396
Modified:
trunk/java/org/jboss/web/php/ScriptEnvironment.java
Log:
Fix JBWEB-97. So the phpservlet can be included (for Portal).
Modified: trunk/java/org/jboss/web/php/ScriptEnvironment.java
===================================================================
--- trunk/java/org/jboss/web/php/ScriptEnvironment.java 2008-01-17 15:37:06 UTC (rev 395)
+++ trunk/java/org/jboss/web/php/ScriptEnvironment.java 2008-01-17 15:38:46 UTC (rev 396)
@@ -564,9 +564,19 @@
this.context = context;
this.webAppRootDir = context.getRealPath("/");
this.tempDir = (File)context.getAttribute(Globals.WORK_DIR_ATTR);
- this.contextPath = req.getContextPath();
- this.servletPath = req.getServletPath();
+
+ this.contextPath = req.getParameter("context");
+ if (this.contextPath == null) {
+ this.contextPath = req.getContextPath();
+ }
+
+ this.servletPath = req.getParameter("servlet");
+ if (this.servletPath == null) {
+ this.servletPath = req.getServletPath();
+ }
+
this.pathInfo = req.getPathInfo();
+
// If getPathInfo() returns null, must be using extension mapping
// In this case, pathInfo should be same as servletPath
if (this.pathInfo == null) {
16 years, 3 months