JBossWeb SVN: r253 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-08-31 13:44:44 -0400 (Fri, 31 Aug 2007)
New Revision: 253
Added:
tags/JBOSSWEB_2_1_0_CR1/
Log:
- JBoss Web 2.1.0.CR1.
- Mostly for JBoss 5 integration purposes.
Copied: tags/JBOSSWEB_2_1_0_CR1 (from rev 252, trunk)
16 years, 7 months
JBossWeb SVN: r252 - trunk/bin.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-08-31 13:18:17 -0400 (Fri, 31 Aug 2007)
New Revision: 252
Modified:
trunk/bin/catalina.sh
trunk/bin/service.bat
Log:
- Port script changes.
Modified: trunk/bin/catalina.sh
===================================================================
--- trunk/bin/catalina.sh 2007-08-31 17:16:43 UTC (rev 251)
+++ trunk/bin/catalina.sh 2007-08-31 17:18:17 UTC (rev 252)
@@ -1,4 +1,20 @@
#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# -----------------------------------------------------------------------------
# Start/Stop Script for the CATALINA Server
#
@@ -11,7 +27,7 @@
# the same directory that CATALINA_HOME points to.
#
# CATALINA_OPTS (Optional) Java runtime options used when the "start",
-# "stop", or "run" command is executed.
+# or "run" command is executed.
#
# CATALINA_TMPDIR (Optional) Directory path location of temporary directory
# the JVM should use (java.io.tmpdir). Defaults to
@@ -51,7 +67,7 @@
# CATALINA_PID (Optional) Path of the file which should contains the pid
# of catalina startup java process, when start (fork) is used
#
-# $Id: catalina.sh 522797 2007-03-27 07:10:29Z fhanik $
+# $Id: catalina.sh 568359 2007-08-22 01:26:43Z funkman $
# -----------------------------------------------------------------------------
# OS specific support. $var _must_ be set to either true or false.
@@ -132,7 +148,7 @@
if [ -n "$JSSE_HOME" ]; then
CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
fi
-CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
+CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar
if [ -z "$CATALINA_BASE" ] ; then
CATALINA_BASE="$CATALINA_HOME"
@@ -292,7 +308,7 @@
FORCE=1
fi
- "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+ "$_RUNJAVA" $JAVA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
Modified: trunk/bin/service.bat
===================================================================
--- trunk/bin/service.bat 2007-08-31 17:16:43 UTC (rev 251)
+++ trunk/bin/service.bat 2007-08-31 17:18:17 UTC (rev 252)
@@ -1,60 +1,60 @@
@echo off
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem NT Service Install/Uninstall script
rem
rem Options
-rem install Install the service using Tomcat5 as service name.
+rem install Install the service using Tomcat6 as service name.
rem Service is installed using default settings.
rem remove Remove the service from the System.
rem
rem name (optional) If the second argument is present it is considered
rem to be new service name
rem
-rem $Id: service.bat 541206 2007-05-24 06:56:59Z mturk $
+rem $Id: service.bat 571526 2007-08-31 17:17:29Z remm $
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
-
-rem Make sure prerequisite environment variables are set
-if not "%JAVA_HOME%" == "" goto okJavaHome
-echo The JAVA_HOME environment variable is not defined
-echo This environment variable is needed to run this program
-goto end
-
-:okJavaHome
-
-rem Detect Java Version and CPU
-set JVM_PLATFORM=%PROCESSOR_ARCHITEW6432%
-if "%JVM_PLATFORM%" == "" set JVM_PLATFORM=%PROCESSOR_ARCHITECTURE%
-
-set EXECUTABLE_CPU=
-java -version 2>&1 | findstr /I 64-bit > NUL
-if not ERRORLEVEL == 1 set EXECUTABLE_CPU=%JVM_PLATFORM%\
-
set CURRENT_DIR=%cd%
if not "%CATALINA_HOME%" == "" goto gotHome
-set CURRENT_DIR=.\
-if "%OS%" == "Windows_NT" set CURRENT_DIR=%~dp0%
-
-pushd %CURRENT_DIR%..
-set CATALINA_HOME=%CD%
-popd
-
+set CATALINA_HOME=%cd%
+if exist "%CATALINA_HOME%\bin\tomcat6.exe" goto okHome
+rem CD to the upper dir
+cd ..
+set CATALINA_HOME=%cd%
:gotHome
-if exist "%CATALINA_HOME%\bin\%EXECUTABLE_CPU%tomcat6.exe" goto okHome
-echo Tomcat6.exe for %JVM_PLATFORM% was not found...
+if exist "%CATALINA_HOME%\bin\tomcat6.exe" goto okHome
+echo The tomcat.exe was not found...
echo The CATALINA_HOME environment variable is not defined correctly.
echo This environment variable is needed to run this program
goto end
-
+rem Make sure prerequisite environment variables are set
+if not "%JAVA_HOME%" == "" goto okHome
+echo The JAVA_HOME environment variable is not defined
+echo This environment variable is needed to run this program
+goto end
:okHome
if not "%CATALINA_BASE%" == "" goto gotBase
set CATALINA_BASE=%CATALINA_HOME%
:gotBase
+
+set EXECUTABLE=%CATALINA_HOME%\bin\tomcat6.exe
-set EXECUTABLE=%CATALINA_HOME%\bin\%EXECUTABLE_CPU%tomcat6.exe
-
rem Set default Service name
set SERVICE_NAME=Tomcat6
set PR_DISPLAYNAME=Apache Tomcat
@@ -76,20 +76,20 @@
:doRemove
rem Remove the service
"%EXECUTABLE%" //DS//%SERVICE_NAME%
-echo Service '%SERVICE_NAME%' has been removed
+echo The service '%SERVICE_NAME%' has been removed
goto end
:doInstall
rem Install the service
-echo Installing service '%SERVICE_NAME%' ...
-echo Using CATALINA_HOME: %CATALINA_HOME%
-echo Using CATALINA_BASE: %CATALINA_BASE%
-echo Using JAVA_HOME : %JAVA_HOME%
+echo Installing the service '%SERVICE_NAME%' ...
+echo Using CATALINA_HOME: %CATALINA_HOME%
+echo Using CATALINA_BASE: %CATALINA_BASE%
+echo Using JAVA_HOME: %JAVA_HOME%
rem Use the environment variables as an example
rem Each command line option is prefixed with PR_
-set PR_DESCRIPTION=Apache Tomcat Server - http://jakarta.apache.org/tomcat
+set PR_DESCRIPTION=Apache Tomcat Server - http://tomcat.apache.org/
set PR_INSTALL=%EXECUTABLE%
set PR_LOGPATH=%CATALINA_BASE%\logs
set PR_CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar
@@ -101,8 +101,7 @@
if exist "%PR_JVM%" goto foundJvm
set PR_JVM=auto
:foundJvm
-echo Using JVM : %PR_JVM%
-echo Using JVM_PLATFORM : %JVM_PLATFORM%
+echo Using JVM: %PR_JVM%
"%EXECUTABLE%" //IS//%SERVICE_NAME% --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
if not errorlevel 1 goto installed
echo Failed installing '%SERVICE_NAME%' service
@@ -122,7 +121,7 @@
set PR_STDOUTPUT=auto
set PR_STDERROR=auto
"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions "-Djava.io.tmpdir=%CATALINA_BASE%\temp" --JvmMs 128 --JvmMx 256
-echo Service '%SERVICE_NAME%' has been installed.
+echo The service '%SERVICE_NAME%' has been installed.
:end
cd %CURRENT_DIR%
16 years, 7 months
JBossWeb SVN: r251 - trunk/webapps/docs.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-08-31 13:16:43 -0400 (Fri, 31 Aug 2007)
New Revision: 251
Modified:
trunk/webapps/docs/changelog.xml
Log:
- Changelog update.
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2007-08-31 17:09:53 UTC (rev 250)
+++ trunk/webapps/docs/changelog.xml 2007-08-31 17:16:43 UTC (rev 251)
@@ -16,6 +16,13 @@
<body>
<section name="JBoss Web 2.1.0 (remm)">
+ <subsection name="General">
+ <changelog>
+ <update>
+ Swicth to JBoss logging. (remm)
+ </update>
+ </changelog>
+ </subsection>
<subsection name="Catalina">
<changelog>
<update>
@@ -42,6 +49,9 @@
<fix>
Use the system property for the session cookie name. (jfclere)
</fix>
+ <update>
+ Validation for elements and attributes of server.xml. (remm)
+ </update>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -56,10 +66,78 @@
</subsection>
</section>
+<section name="Tomcat 6.0.15 (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>42944</bug>: Correctly handle servlet mappings that use a '+'
+ character as part of the url pattern. (markt)
+ </fix>
+ <fix>
+ <bug>42951</bug>: Don't use CATALINA_OPTS when stopping Tomcat. This
+ allows options for starting and stopping to be set on JAVA_OPTS and
+ options for starting only to be set on CATALINA_OPTS. Without this
+ fix, some startup options (eg the port for remote JMX) would cause
+ stop to fail. Based on a fix suggested by Michael Vorburger.
+ Port of r454193 (<bug>36976</bug>) from Tomcat 5.5.x. (markt,rjung)
+ </fix>
+ <add>
+ Validation of attributes and elements used in server.xml. (remm)
+ </add>
+ <fix>
+ <bug>43175</bug>: Fix typos in servlet XSD files. Patch provided by
+ Takayuki Kaneko. (markt)
+ </fix>
+ <fix>
+ <bug>43216</bug>: Set correct StandardSession#accessCount as StandardSession.ACTIVITY_CHECK is true.
+ Patch provided by Takayuki Kaneko (pero)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ In the APR connector, start accepting connections after fully starting
+ the connector, to prevent possible exceptions due to non initialized fields. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>37326</bug>: No error reported when an included page does not
+ exist. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Webapps">
+ <changelog>
+ <fix>
+ Fix WebDAV Servlet so it works correctly with MS clients. (markt)
+ </fix>
+ <fix>
+ <bug>42979</bug>: Update sample.war to include recent security fixes
+ in the source code. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 6.0.14 (remm)">
+ <subsection name="General">
+ <changelog>
+ <docs>
+ Correct j.u.l log levels in JULI docs. (rjung)
+ </docs>
+ </changelog>
+ </subsection>
<subsection name="Catalina">
<changelog>
<fix>
+ Handle special case of ROOT when re-loading webapp after ROOT.xml has
+ been modified. In some circumstances the reloaded ROOT webapp had no
+ associated resources. (markt)
+ </fix>
+ <fix>
Remove invalid attribute "encoding" of MBean MemoryUserDatabase,
which lead to errors in the manager webapp JMXProxy output. (rjung)
</fix>
@@ -118,17 +196,6 @@
<fix>
Fix Comet when running Tomcat with the security manager (remm)
</fix>
- <fix>
- Fix filter chain creation when Comet is used (remm)
- </fix>
- <docs>
- Correct j.u.l log levels in JULI docs. (rjung)
- </docs>
- <fix>
- Handle special case of ROOT when re-loading webapp after ROOT.xml has
- been modified. In some circumstances the reloaded ROOT webapp had no
- associated resources. (markt)
- </fix>
</changelog>
</subsection>
<subsection name="Jasper">
16 years, 7 months
JBossWeb SVN: r250 - trunk.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-08-31 13:09:53 -0400 (Fri, 31 Aug 2007)
New Revision: 250
Added:
trunk/.svnignore
Modified:
trunk/.project
Log:
- Tweaks.
Modified: trunk/.project
===================================================================
--- trunk/.project 2007-08-31 16:57:27 UTC (rev 249)
+++ trunk/.project 2007-08-31 17:09:53 UTC (rev 250)
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>tomcat6</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbossweb-2.1.x</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/.svnignore
===================================================================
--- trunk/.svnignore (rev 0)
+++ trunk/.svnignore 2007-08-31 17:09:53 UTC (rev 250)
@@ -0,0 +1 @@
+output
16 years, 7 months
JBossWeb SVN: r249 - trunk/java/org/apache/catalina/servlets.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-08-31 12:57:27 -0400 (Fri, 31 Aug 2007)
New Revision: 249
Modified:
trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Log:
- Webdav servlet cleanup.
- Add some relative path tweaks.
Modified: trunk/java/org/apache/catalina/servlets/WebdavServlet.java
===================================================================
--- trunk/java/org/apache/catalina/servlets/WebdavServlet.java 2007-08-31 14:18:01 UTC (rev 248)
+++ trunk/java/org/apache/catalina/servlets/WebdavServlet.java 2007-08-31 16:57:27 UTC (rev 249)
@@ -44,6 +44,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.catalina.Globals;
import org.apache.catalina.util.DOMWriter;
import org.apache.catalina.util.MD5Encoder;
import org.apache.catalina.util.RequestUtil;
@@ -66,7 +67,7 @@
* are handled by the DefaultServlet.
*
* @author Remy Maucherat
- * @version $Revision: 467222 $ $Date: 2006-10-24 05:17:11 +0200 (mar., 24 oct. 2006) $
+ * @version $Revision: 561186 $ $Date: 2007-07-31 01:37:47 +0200 (mar., 31 juil. 2007) $
*/
public class WebdavServlet
@@ -174,7 +175,8 @@
* Key : path <br>
* Value : LockInfo
*/
- private Hashtable resourceLocks = new Hashtable();
+ private Hashtable<String,LockInfo> resourceLocks =
+ new Hashtable<String,LockInfo>();
/**
@@ -185,7 +187,8 @@
* collection. Each element of the Vector is the path associated with
* the lock-null resource.
*/
- private Hashtable lockNullResources = new Hashtable();
+ private Hashtable<String,Vector<String>> lockNullResources =
+ new Hashtable<String,Vector<String>>();
/**
@@ -194,7 +197,7 @@
* Key : path <br>
* Value : LockInfo
*/
- private Vector collectionLocks = new Vector();
+ private Vector<LockInfo> collectionLocks = new Vector<LockInfo>();
/**
@@ -310,6 +313,35 @@
/**
+ * Override the DefaultServlet implementation and only use the PathInfo. If
+ * the ServletPath is non-null, it will be because the WebDAV servlet has
+ * been mapped to a url other than /* to configure editing at different url
+ * than normal viewing.
+ *
+ * @param request The servlet request we are processing
+ */
+ protected String getRelativePath(HttpServletRequest request) {
+
+ // Are we being processed by a RequestDispatcher.include()?
+ if (request.getAttribute(Globals.INCLUDE_REQUEST_URI_ATTR) != null) {
+ String result = (String) request.getAttribute(
+ Globals.INCLUDE_PATH_INFO_ATTR);
+ if ((result == null) || (result.equals("")))
+ result = "/";
+ return (result);
+ }
+
+ // No, extract the desired path directly from the request
+ String result = request.getPathInfo();
+ if ((result == null) || (result.equals(""))) {
+ result = "/";
+ }
+ return (result);
+
+ }
+
+
+ /**
* OPTIONS Method.
*
* @param req The request
@@ -358,7 +390,7 @@
}
// Properties which are to be displayed.
- Vector properties = null;
+ Vector<String> properties = null;
// Propfind depth
int depth = INFINITY;
// Propfind type
@@ -379,44 +411,46 @@
}
Node propNode = null;
-
- DocumentBuilder documentBuilder = getDocumentBuilder();
-
- try {
- Document document = documentBuilder.parse
- (new InputSource(req.getInputStream()));
-
- // Get the root element of the document
- Element rootElement = document.getDocumentElement();
- NodeList childList = rootElement.getChildNodes();
-
- for (int i=0; i < childList.getLength(); i++) {
- Node currentNode = childList.item(i);
- switch (currentNode.getNodeType()) {
- case Node.TEXT_NODE:
- break;
- case Node.ELEMENT_NODE:
- if (currentNode.getNodeName().endsWith("prop")) {
- type = FIND_BY_PROPERTY;
- propNode = currentNode;
+
+ if (req.getInputStream().available() > 0) {
+ DocumentBuilder documentBuilder = getDocumentBuilder();
+
+ try {
+ Document document = documentBuilder.parse
+ (new InputSource(req.getInputStream()));
+
+ // Get the root element of the document
+ Element rootElement = document.getDocumentElement();
+ NodeList childList = rootElement.getChildNodes();
+
+ for (int i=0; i < childList.getLength(); i++) {
+ Node currentNode = childList.item(i);
+ switch (currentNode.getNodeType()) {
+ case Node.TEXT_NODE:
+ break;
+ case Node.ELEMENT_NODE:
+ if (currentNode.getNodeName().endsWith("prop")) {
+ type = FIND_BY_PROPERTY;
+ propNode = currentNode;
+ }
+ if (currentNode.getNodeName().endsWith("propname")) {
+ type = FIND_PROPERTY_NAMES;
+ }
+ if (currentNode.getNodeName().endsWith("allprop")) {
+ type = FIND_ALL_PROP;
+ }
+ break;
}
- if (currentNode.getNodeName().endsWith("propname")) {
- type = FIND_PROPERTY_NAMES;
- }
- if (currentNode.getNodeName().endsWith("allprop")) {
- type = FIND_ALL_PROP;
- }
- break;
}
+ } catch (SAXException e) {
+ // Something went wrong - use the defaults.
+ } catch (IOException e) {
+ // Something went wrong - use the defaults.
}
- } catch (SAXException e) {
- // Most likely there was no content : we use the defaults.
- } catch (IOException e) {
- // Most likely there was no content : we use the defaults.
}
if (type == FIND_BY_PROPERTY) {
- properties = new Vector();
+ properties = new Vector<String>();
NodeList childList = propNode.getChildNodes();
for (int i=0; i < childList.getLength(); i++) {
@@ -504,11 +538,11 @@
properties);
} else {
// The stack always contains the object of the current level
- Stack stack = new Stack();
+ Stack<String> stack = new Stack<String>();
stack.push(path);
// Stack of the objects one level below
- Stack stackBelow = new Stack();
+ Stack<String> stackBelow = new Stack<String>();
while ((!stack.isEmpty()) && (depth >= 0)) {
@@ -567,7 +601,7 @@
if (stack.isEmpty()) {
depth--;
stack = stackBelow;
- stackBelow = new Stack();
+ stackBelow = new Stack<String>();
}
generatedXML.sendData();
@@ -1017,7 +1051,7 @@
// Checking if a child resource of this collection is
// already locked
- Vector lockPaths = new Vector();
+ Vector<String> lockPaths = new Vector<String>();
locksList = collectionLocks.elements();
while (locksList.hasMoreElements()) {
LockInfo currentLock = (LockInfo) locksList.nextElement();
@@ -1164,10 +1198,10 @@
int slash = lock.path.lastIndexOf('/');
String parentPath = lock.path.substring(0, slash);
- Vector lockNulls =
- (Vector) lockNullResources.get(parentPath);
+ Vector<String> lockNulls =
+ lockNullResources.get(parentPath);
if (lockNulls == null) {
- lockNulls = new Vector();
+ lockNulls = new Vector<String>();
lockNullResources.put(parentPath, lockNulls);
}
@@ -1636,7 +1670,7 @@
// Copying source to destination
- Hashtable errorList = new Hashtable();
+ Hashtable<String,Integer> errorList = new Hashtable<String,Integer>();
boolean result = copyResource(resources, errorList,
path, destinationPath);
@@ -1666,8 +1700,8 @@
* @param source Path of the resource to be copied
* @param dest Destination path
*/
- private boolean copyResource(DirContext resources, Hashtable errorList,
- String source, String dest) {
+ private boolean copyResource(DirContext resources,
+ Hashtable<String,Integer> errorList, String source, String dest) {
if (debug > 1)
log("Copy: " + source + " To: " + dest);
@@ -1807,7 +1841,8 @@
}
} else {
- Hashtable errorList = new Hashtable();
+ Hashtable<String,Integer> errorList =
+ new Hashtable<String,Integer>();
deleteCollection(req, resources, path, errorList);
try {
@@ -1842,7 +1877,8 @@
*/
private void deleteCollection(HttpServletRequest req,
DirContext resources,
- String path, Hashtable errorList) {
+ String path,
+ Hashtable<String,Integer> errorList) {
if (debug > 1)
log("Delete:" + path);
@@ -1983,7 +2019,7 @@
private void parseProperties(HttpServletRequest req,
XMLWriter generatedXML,
String path, int type,
- Vector propertiesVector) {
+ Vector<String> propertiesVector) {
// Exclude any resource in the /WEB-INF and /META-INF subdirectories
// (the "toUpperCase()" avoids problems on Windows systems)
@@ -2119,14 +2155,14 @@
case FIND_BY_PROPERTY :
- Vector propertiesNotFound = new Vector();
+ Vector<String> propertiesNotFound = new Vector<String>();
// Parse the list of properties
generatedXML.writeElement(null, "propstat", XMLWriter.OPENING);
generatedXML.writeElement(null, "prop", XMLWriter.OPENING);
- Enumeration properties = propertiesVector.elements();
+ Enumeration<String> properties = propertiesVector.elements();
while (properties.hasMoreElements()) {
@@ -2396,7 +2432,7 @@
case FIND_BY_PROPERTY :
- Vector propertiesNotFound = new Vector();
+ Vector<String> propertiesNotFound = new Vector<String>();
// Parse the list of properties
@@ -2645,7 +2681,7 @@
String scope = "exclusive";
int depth = 0;
String owner = "";
- Vector tokens = new Vector();
+ Vector<String> tokens = new Vector<String>();
long expiresAt = 0;
Date creationDate = new Date();
@@ -2742,20 +2778,6 @@
}
- // --------------------------------------------------- Property Inner Class
-
-
- private class Property {
-
- public String name;
- public String value;
- public String namespace;
- public String namespaceAbbrev;
- public int status = WebdavStatus.SC_OK;
-
- }
-
-
};
@@ -2782,7 +2804,8 @@
* status codes to descriptive text. This is a static
* variable.
*/
- private static Hashtable mapStatusCodes = new Hashtable();
+ private static Hashtable<Integer,String> mapStatusCodes =
+ new Hashtable<Integer,String>();
// ------------------------------------------------------ HTTP Status Codes
16 years, 7 months
JBossWeb SVN: r248 - trunk/java/org/apache/tomcat/util/net.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-08-31 10:18:01 -0400 (Fri, 31 Aug 2007)
New Revision: 248
Modified:
trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Log:
- Fix obvious glitch: increment keepAliveCount, otherwise the poller will never poll.
Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
===================================================================
--- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2007-08-31 00:13:23 UTC (rev 247)
+++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2007-08-31 14:18:01 UTC (rev 248)
@@ -36,7 +36,6 @@
import org.apache.tomcat.jni.Status;
import org.apache.tomcat.util.res.StringManager;
import org.jboss.logging.Logger;
-import org.jboss.logging.Logger;
/**
* APR tailored thread pool, providing the following services:
@@ -1593,6 +1592,9 @@
// FIXME: Check concurrency to see if the socket isn't being processed for an
// event (such as a read if a write is added): need to add a "processing event"
// concurrent map ...
+ if (comet) {
+
+ }
// Store timeout
timeouts.add(info.socket, System.currentTimeMillis() + info.timeout);
if (comet) {
@@ -1613,6 +1615,8 @@
} else {
Socket.destroy(info.socket);
}
+ } else {
+ keepAliveCount++;
}
} else {
if (comet) {
@@ -1655,7 +1659,7 @@
|| (comet &&
(((desc[n*2] & Poll.APR_POLLIN) == Poll.APR_POLLIN) && !processSocket(desc[n*2+1], SocketStatus.OPEN_READ))
|| (((desc[n*2] & Poll.APR_POLLOUT) == Poll.APR_POLLOUT) && !processSocket(desc[n*2+1], SocketStatus.OPEN_WRITE)))
- || (!comet && (!processSocket(desc[n*2+1])))) {
+ || (!comet && !processSocket(desc[n*2+1]))) {
// Close socket and clear pool
if (comet) {
processSocket(desc[n*2+1], SocketStatus.DISCONNECT);
16 years, 7 months
JBossWeb SVN: r247 - trunk.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-08-30 20:13:23 -0400 (Thu, 30 Aug 2007)
New Revision: 247
Modified:
trunk/build.properties.default
trunk/build.xml
Log:
- Additional JBoss packaging.
Modified: trunk/build.properties.default
===================================================================
--- trunk/build.properties.default 2007-08-30 23:11:16 UTC (rev 246)
+++ trunk/build.properties.default 2007-08-31 00:13:23 UTC (rev 247)
@@ -14,7 +14,6 @@
version.minor=1
version.build=0
version.patch=0
-version=2.1.0.dev
# ----- Default Base Path for Dependent Packages -----
# Please note this path must be absolute, not relative,
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-08-30 23:11:16 UTC (rev 246)
+++ trunk/build.xml 2007-08-31 00:13:23 UTC (rev 247)
@@ -18,7 +18,7 @@
<property name="version.minor" value="1" />
<property name="version.build" value="0" />
<property name="version.patch" value="0" />
- <property name="version" value="2.1.0-dev" />
+ <property name="version" value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
<property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
<property name="project" value="jboss-web" />
@@ -29,6 +29,7 @@
<property name="tomcat.build" value="${basedir}/output/build"/>
<property name="tomcat.classes" value="${basedir}/output/classes"/>
<property name="tomcat.dist" value="${basedir}/output/dist"/>
+ <property name="tomcat.jars" value="${basedir}/output/jars"/>
<property name="test.failonerror" value="true"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
@@ -79,6 +80,8 @@
<mkdir dir="${tomcat.build}/temp"/>
<mkdir dir="${tomcat.build}/webapps"/>
+ <mkdir dir="${tomcat.jars}"/>
+
</target>
<target name="compile">
@@ -482,6 +485,32 @@
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" />
<copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
+ <!-- JBoss Web Main JAR File -->
+ <jar jarfile="${tomcat.jars}/jbossweb.jar" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/*" />
+ <include name="org/apache/catalina/**" />
+ <include name="org/apache/naming/**" />
+ <include name="org/apache/coyote/**" />
+ <include name="org/apache/tomcat/jni/**" />
+ <include name="org/apache/tomcat/util/**" />
+ <include name="org/apache/jasper/**" />
+ <include name="org/apache/el/**" />
+ <include name="org/jboss/web/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ </fileset>
+ </jar>
+
+ <copy file="${jasper-jdt.jar}" todir="${tomcat.jars}" />
+ <copy todir="${tomcat.jars}">
+ <fileset dir="${tomcat.build}/lib">
+ <include name="el-api.jar"/>
+ <include name="jsp-api.jar"/>
+ <include name="servlet-api.jar"/>
+ </fileset>
+ </copy>
+
</target>
<target name="clean-depend"
@@ -493,6 +522,7 @@
<target name="clean">
<delete dir="${tomcat.classes}" />
<delete dir="${tomcat.build}" />
+ <delete dir="${tomcat.jars}" />
</target>
<!-- Download and dependency building -->
16 years, 7 months
JBossWeb SVN: r246 - trunk.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-08-30 19:11:16 -0400 (Thu, 30 Aug 2007)
New Revision: 246
Modified:
trunk/RELEASE-NOTES
Log:
- Branding fix.
Modified: trunk/RELEASE-NOTES
===================================================================
--- trunk/RELEASE-NOTES 2007-08-28 13:55:46 UTC (rev 245)
+++ trunk/RELEASE-NOTES 2007-08-30 23:11:16 UTC (rev 246)
@@ -1,6 +1,6 @@
- Apache Tomcat Version @VERSION@
+ JBoss Web @VERSION@
Release Notes
@@ -63,14 +63,12 @@
=============
Bundled APIs:
=============
-A standard installation of Tomcat 6.0 makes all of the following APIs available
+A standard installation of JBoss Web makes all of the following APIs available
for use by web applications (by placing them in "lib"):
* annotations-api.jar (Annotations package)
* catalina.jar (Tomcat Catalina implementation)
* catalina-ant.jar (Tomcat Catalina Ant tasks)
-* catalina-ha.jar (High availability package)
-* catalina-tribes.jar (Group communication)
-* commons-logging-api.jar (Commons Logging API 1.0.x)
+* tomcat-juli.jar (dedicated java.util.logging LogManager and specialized JBoss Logging)
* el-api.jar (EL 2.1 API)
* jasper.jar (Jasper 2 Compiler and Runtime)
* jasper-el.jar (Jasper 2 EL implementation)
@@ -103,35 +101,13 @@
"lib" folder, and classes should be put in the "classes" folder).
-================
-Tomcat on Linux:
-================
-GLIBC 2.2 / Linux 2.4 users should define an environment variable:
-export LD_ASSUME_KERNEL=2.2.5
-
-Redhat Linux 9.0 users should use the following setting to avoid
-stability problems:
-export LD_ASSUME_KERNEL=2.4.1
-
-There are some Linux bugs reported against the NIO sendfile behavior, make sure you
-have a JDK that is up to date, or disable sendfile behavior in the Connector.<br/>
-6427312: (fc) FileChannel.transferTo() throws IOException "system call interrupted"<br/>
-5103988: (fc) FileChannel.transferTo should return -1 for EAGAIN instead throws IOException<br/>
-6253145: (fc) FileChannel.transferTo on Linux fails when going beyond 2GB boundary<br/>
-6470086: (fc) FileChannel.transferTo(2147483647, 1, channel) cause "Value too large" exception<br/>
-
-
=============================
Enabling SSI and CGI Support:
=============================
-Because of the security risks associated with CGI and SSI available
-to web applications, these features are disabled by default.
+SSI, CGI will only will run in privileged web applications. See the Context
+attributes documentation for more details.
+
-To enable and configure CGI support, please see the cgi-howto.html page.
-
-To enable and configue SSI support, please see the ssi-howto.html page.
-
-
======================
Security manager URLs:
======================
@@ -165,14 +141,16 @@
http://tomcat.apache.org/faq/misc.html#invoker.
-==============================
-Viewing the Tomcat Change Log:
-==============================
+================================
+Viewing the JBoss Web Change Log:
+================================
See changelog.html in this directory.
====================
When all else fails:
====================
-See the FAQ
+See the Wiki:
+http://labs.jboss.com/wiki/Jbossweb
+Tomcat FAQ for related common questions:
http://tomcat.apache.org/faq/
16 years, 7 months
JBossWeb SVN: r245 - branches/2.0.x/src/share/classes/org/apache/catalina/session.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-08-28 09:55:46 -0400 (Tue, 28 Aug 2007)
New Revision: 245
Modified:
branches/2.0.x/src/share/classes/org/apache/catalina/session/StandardManager.java
Log:
- Remove extra endAccess.
Modified: branches/2.0.x/src/share/classes/org/apache/catalina/session/StandardManager.java
===================================================================
--- branches/2.0.x/src/share/classes/org/apache/catalina/session/StandardManager.java 2007-08-28 13:52:31 UTC (rev 244)
+++ branches/2.0.x/src/share/classes/org/apache/catalina/session/StandardManager.java 2007-08-28 13:55:46 UTC (rev 245)
@@ -395,7 +395,6 @@
session.setManager(this);
sessions.put(session.getIdInternal(), session);
session.activate();
- session.endAccess();
}
} catch (ClassNotFoundException e) {
log.error(sm.getString("standardManager.loading.cnfe", e), e);
16 years, 7 months
JBossWeb SVN: r244 - trunk/java/org/apache/catalina/session.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-08-28 09:52:31 -0400 (Tue, 28 Aug 2007)
New Revision: 244
Modified:
trunk/java/org/apache/catalina/session/StandardManager.java
Log:
- Remove endAccess (which is not useful anymore).
Modified: trunk/java/org/apache/catalina/session/StandardManager.java
===================================================================
--- trunk/java/org/apache/catalina/session/StandardManager.java 2007-08-28 10:40:52 UTC (rev 243)
+++ trunk/java/org/apache/catalina/session/StandardManager.java 2007-08-28 13:52:31 UTC (rev 244)
@@ -395,7 +395,6 @@
session.setManager(this);
sessions.put(session.getIdInternal(), session);
session.activate();
- session.endAccess();
}
} catch (ClassNotFoundException e) {
log.error(sm.getString("standardManager.loading.cnfe", e), e);
16 years, 7 months