Commit 77a89635 authored by Miguel Landaeta's avatar Miguel Landaeta

Upstream import 7.0.16

parent 17bab2ed
......@@ -464,3 +464,62 @@ e7sQDYEbvppSAJ9+i7TzCNvZ4PK/odiIWeZ61+KKyACfSjQXnC5UbxndwtkOzFKf
Io8ZP0E=
=xT1M
-----END PGP PUBLIC KEY BLOCK-----
pub 4096R/731FABEE 2011-05-27
Key fingerprint = 9BA4 4C26 2138 5CB9 66EB A586 F72C 284D 731F ABEE
uid Tim Whittington (CODE SIGNING KEY) <timw@apache.org>
sig 3 731FABEE 2011-05-27 Tim Whittington (CODE SIGNING KEY) <timw@apache.org>
sub 4096R/461B342D 2011-05-27
sig 731FABEE 2011-05-27 Tim Whittington (CODE SIGNING KEY) <timw@apache.org>
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.11 (Darwin)
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
/PLn/VX9dZEFVPVbPapJpkNv8A==
=Vxhw
-----END PGP PUBLIC KEY BLOCK-----
================================================================================
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.
================================================================================
$Id: PROPOSALS.txt 943746 2010-05-12 23:08:10Z markt $
=================================
Apache Tomcat Trunk Proposals
=================================
PATCHES PROPOSED FOR INCLUSION in 6.1.x:
[ The alpha/beta branch that will be the basis of the stable 6.2.x releases ]
[ No date has been set for the creation of a 6.1.x branch at this point ]
[ New proposals should be added at the end of the list ]
* Proposal
svn revision or other reference
+1:
-1:
* catalina-tribes.jar improvements
Messaging
=========
Add in support for UDP messages
- fire and forget
- ack on message
- ack on batch of messages
- periodic ack, time or message count
- support multicast fire and forget
- autoswitch TCP/UDP based on size, number of recipients, or on message flag
- add in versioning to the message structure
- Add in a delay between bind failures, to give the JVM a chance to recover
Priority Messaging
- Being able to send through high priority messages through a channel
pause existing messages
Failure Detection
=================
Improvements to the current failure detector
- NIO based
- avoid multiple member failed messages, keep a lock on a recipient basis
- different levels of failure check (accept, send/receive ack)
Networking
==========
Add in support to leverage multiple network cards in parallel (research
if any OS features are available to leverage this)
Performance/Concurrency
=======================
- Remove usage of "synchronized" (previously used for JDK 1.4 compatibility)
- make JDK 1.5 minimum version
- take advantage of java.util.concurrent
Membership
==========
- implement payloadChange(...) event on membership listener
* Make OSGi Bundles of each jar
* Include tomcat-juli and tomcat-juli-adapters as an add on package when doing a release
Session Replication
===================
- New feature - only replicate upon demand
Runtime tomcat doesn't do live session replication
but you can move the sessions upon demand before shutting down a tomcat instance
and draining sessions
\ No newline at end of file
......@@ -15,7 +15,7 @@
limitations under the License.
================================================================================
$Id: RELEASE-NOTES 1084951 2011-03-24 13:27:39Z markt $
$Id: RELEASE-NOTES 1104328 2011-05-17 15:21:38Z markt $
Apache Tomcat Version @VERSION@
......@@ -173,7 +173,7 @@ In order to grant security permissions to JARs located inside the
web application repository, use URLs of of the following format
in your policy file:
file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar
file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar
============================
......
================================================================================
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.
================================================================================
=====================================================
An outline plan for the first stable Tomcat 7 release
=====================================================
1. Update trunk with new API from Servlet Spec 3.0 Final Draft 2009-11-05
- Done
2. Provide NOOP implementations with TODO SRV3 markers so it will build
- Done
3. Implement all the new Servlet 3 features
NOTE: Status is based on a review of the specification, not the TCK tests
- Done
4. Do an initial release (from trunk)
- Create tc7.0.x\tags to hold release tags - Done
- Add to web site - Done
- Update Wiki version status page - Done
5. Fix issues as they get reported
6. Update for final release of the spec
- Done
7. Create tc7.0.x\trunk from trunk at first stable release
8. Nice to haves in first Tomcat 7 stable release
- Refactor Jasper integration as suggested in SRV.8.3
- Remove old, unused code
- Clean up internal API (eg remove unused params from methods)
- JSR 115/196 implementations - Copy from Geronimo?
\ No newline at end of file
......@@ -82,7 +82,7 @@
# Example (all one line)
# LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
#
# $Id: catalina.sh 1073891 2011-02-23 19:23:59Z markt $
# $Id: catalina.sh 1130774 2011-06-02 20:09:27Z markt $
# -----------------------------------------------------------------------------
# OS specific support. $var _must_ be set to either true or false.
......@@ -412,19 +412,19 @@ elif [ "$1" = "stop" ] ; then
fi
if [ ! -z "$CATALINA_PID" ]; then
if [ -s "$CATALINA_PID" ]; then
if [ -f "$CATALINA_PID" ]; then
if [ -f "$CATALINA_PID" ]; then
if [ -s "$CATALINA_PID" ]; then
kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1
if [ $? -gt 0 ]; then
echo "PID file found but no matching process was found. Stop aborted."
exit 1
fi
else
echo "\$CATALINA_PID was set but the specified file does not exist. Is Tomcat running? Stop aborted."
exit 1
echo "PID file is empty and has been ignored."
fi
else
echo "PID file is empty and has been ignored."
echo "\$CATALINA_PID was set but the specified file does not exist. Is Tomcat running? Stop aborted."
exit 1
fi
fi
......
......@@ -21,13 +21,13 @@
# modules that Tomcat depends on. Copy this file to "build.properties"
# in the top-level source directory, and customize it as needed.
#
# $Id: build.properties.default 1101230 2011-05-09 21:32:39Z markt $
# $Id: build.properties.default 1134562 2011-06-11 10:30:54Z markt $
# -----------------------------------------------------------------------------
# ----- Version Control Flags -----
version.major=7
version.minor=0
version.build=14
version.build=16
version.patch=0
version.suffix=
......
......@@ -92,12 +92,14 @@ catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-tribes.jar,\
jasper.jar,jasper-el.jar,ecj-*.jar,\
tomcat-api.jar,tomcat-util.jar,tomcat-coyote.jar,tomcat-dbcp.jar,\
tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
commons-beanutils*.jar,commons-collections*.jar,commons-dbcp*.jar,\
commons-digester*.jar,commons-fileupload*.jar,commons-io*.jar,\
commons-logging*.jar,commons-math*.jar,commons-pool*.jar,\
commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,\
commons-dbcp*.jar,commons-digester*.jar,commons-fileupload*.jar,\
commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,commons-logging*.jar,\
commons-math*.jar,commons-pool*.jar,\
jstl.jar,\
geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\
ant.jar,jmx.jar,hibernate*.jar,jmx-tools.jar,jta*.jar,log4j*.jar,slf4j*.jar\
ant.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\
jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar,\
xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\
dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar,sunpkcs11.jar,tools.jar,\
apple_provider.jar,AppleScriptEngine.jar,CoreAudio.jar,dns_sd.jar,\
......
......@@ -30,6 +30,10 @@ import javax.el.PropertyNotWritableException;
import javax.servlet.jsp.JspContext;
import javax.servlet.jsp.PageContext;
/**
*
* @since 2.1
*/
public class ScopedAttributeELResolver extends ELResolver {
public ScopedAttributeELResolver() {
......
......@@ -45,7 +45,7 @@ import javax.servlet.UnavailableException;
* <code>IllegalArgumentException</code>.
*
* @author Craig R. McClanahan
* @version $Id: Wrapper.java 1077995 2011-03-04 15:17:22Z markt $
* @version $Id: Wrapper.java 1130618 2011-06-02 15:54:26Z markt $
*/
public interface Wrapper extends Container {
......@@ -386,4 +386,14 @@ public interface Wrapper extends Container {
* Servlet associated with this wrapper.
*/
public void servletSecurityAnnotationScan() throws ServletException;
/**
* Is the Servlet overridable by a ServletContainerInitializer?
*/
public boolean isOverridable();
/**
* Sets the overridable attribute for this Servlet.
*/
public void setOverridable(boolean overridable);
}
/*
* 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.
*/
package org.apache.catalina.ant;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
public abstract class AbstractCatalinaCommandTask extends
AbstractCatalinaTask {
/**
* The context path of the web application we are managing.
*/
protected String path = null;
public String getPath() {
return (this.path);
}
public void setPath(String path) {
this.path = path;
}
/**
* The context version of the web application we are managing.
*/
protected String version = null;
public String getVersion() {
return (this.version);
}
public void setVersion(String version) {
this.version = version;
}
// --------------------------------------------------------- Public Methods
/**
* Create query string for the specified command.
*
* @param command Command to be executed
*
* @exception BuildException if an error occurs
*/
public StringBuilder createQueryString(String command) throws BuildException {
StringBuilder buffer = new StringBuilder();
try {
buffer.append(command);
if (path == null) {
throw new BuildException("Must specify 'path' attribute");
} else {
buffer.append("?path=");
buffer.append(URLEncoder.encode(this.path, getCharset()));
if (this.version != null) {
buffer.append("&version=");
buffer.append(URLEncoder.encode(this.version, getCharset()));
}
}
} catch (UnsupportedEncodingException e) {
throw new BuildException
("Invalid 'charset' attribute: " + getCharset());
}
return buffer;
}
}
\ No newline at end of file
/*
* 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.
*/
package org.apache.catalina.ant;
import org.apache.tools.ant.BuildException;
/**
* Ant task that implements the <code>/findleaks</code> command, supported by
* the Tomcat manager application.
*/
public class FindLeaksTask extends AbstractCatalinaTask {
private boolean statusLine = true;
/**
* Sets the statusLine parameter that controls if the response includes a
* status line or not.
*/
public void setStatusLine(boolean statusLine) {
this.statusLine = statusLine;
}
/**
* Returns the statusLine parameter that controls if the response includes a
* status line or not.
*/
public boolean getStatusLine() {
return statusLine;
}
/**
* Execute the requested operation.
*
* @exception BuildException if an error occurs
*/
@Override
public void execute() throws BuildException {
super.execute();
execute("/findleaks?statusLine=" + Boolean.toString(statusLine));
}
}
......@@ -19,8 +19,6 @@
package org.apache.catalina.ant;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
......@@ -30,31 +28,10 @@ import org.apache.tools.ant.BuildException;
* Tomcat manager application.
*
* @author Craig R. McClanahan
* @version $Id: ReloadTask.java 939305 2010-04-29 13:43:39Z kkolinko $
* @version $Id: ReloadTask.java 1131267 2011-06-03 22:22:35Z markt $
* @since 4.1
*/
public class ReloadTask extends AbstractCatalinaTask {
// ------------------------------------------------------------- Properties
/**
* The context path of the web application we are managing.
*/
protected String path = null;
public String getPath() {
return (this.path);
}
public void setPath(String path) {
this.path = path;
}
// --------------------------------------------------------- Public Methods
public class ReloadTask extends AbstractCatalinaCommandTask {
/**
* Execute the requested operation.
......@@ -65,17 +42,7 @@ public class ReloadTask extends AbstractCatalinaTask {
public void execute() throws BuildException {
super.execute();
if (path == null) {
throw new BuildException
("Must specify 'path' attribute");
}
try {
execute("/reload?path=" + URLEncoder.encode(this.path, getCharset()));
} catch (UnsupportedEncodingException e) {
throw new BuildException
("Invalid 'charset' attribute: " + getCharset());
}
execute(createQueryString("/reload").toString());
}
......
......@@ -19,9 +19,6 @@
package org.apache.catalina.ant;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
......@@ -30,27 +27,31 @@ import org.apache.tools.ant.BuildException;
* supported by the Tomcat manager application.
*
* @author Vivek Chopra
* @version $Revision: 832945 $
* @version $Revision: 1131267 $
*/
public class SessionsTask extends AbstractCatalinaTask {
// Properties
public class SessionsTask extends AbstractCatalinaCommandTask {
/**
* The context path of the web application we are managing.
*/
protected String path = null;
public String getPath() {
return (this.path);
protected String idle = null;
public String getIdle() {
return this.idle;
}
public void setPath(String path) {
this.path = path;
public void setIdle(String idle) {
this.idle = idle;
}
// Public Methods
@Override
public StringBuilder createQueryString(String command) {
StringBuilder buffer = super.createQueryString(command);
if (path != null && idle != null) {
buffer.append("&idle=");
buffer.append(this.idle);
}
return buffer;
}
/**
* Execute the requested operation.
*
......@@ -60,17 +61,7 @@ public class SessionsTask extends AbstractCatalinaTask {
public void execute() throws BuildException {
super.execute();
if (path == null) {
throw new BuildException
("Must specify 'path' attribute");
}
try {
execute("/sessions?path=" + URLEncoder.encode(this.path, getCharset()));
} catch (UnsupportedEncodingException e) {
throw new BuildException
("Invalid 'charset' attribute: " + getCharset());
}
execute(createQueryString("/sessions").toString());
}
......
......@@ -19,9 +19,6 @@
package org.apache.catalina.ant;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
......@@ -30,31 +27,10 @@ import org.apache.tools.ant.BuildException;
* Tomcat manager application.
*
* @author Craig R. McClanahan
* @version $Id: StartTask.java 939305 2010-04-29 13:43:39Z kkolinko $
* @version $Id: StartTask.java 1131267 2011-06-03 22:22:35Z markt $
* @since 4.1
*/
public class StartTask extends AbstractCatalinaTask {
// ------------------------------------------------------------- Properties
/**
* The context path of the web application we are managing.
*/
protected String path = null;
public String getPath() {
return (this.path);
}
public void setPath(String path) {
this.path = path;
}
// --------------------------------------------------------- Public Methods
public class StartTask extends AbstractCatalinaCommandTask {
/**
* Execute the requested operation.
......@@ -65,16 +41,7 @@ public class StartTask extends AbstractCatalinaTask {
public void execute() throws BuildException {
super.execute();
if (path == null) {
throw new BuildException
("Must specify 'path' attribute");
}
try {
execute("/start?path=" + URLEncoder.encode(this.path, getCharset()));
} catch (UnsupportedEncodingException e) {
throw new BuildException
("Invalid 'charset' attribute: " + getCharset());
}
execute(createQueryString("/start").toString());
}
......
......@@ -19,9 +19,6 @@
package org.apache.catalina.ant;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
......@@ -30,31 +27,10 @@ import org.apache.tools.ant.BuildException;
* Tomcat manager application.
*
* @author Craig R. McClanahan
* @version $Id: StopTask.java 939305 2010-04-29 13:43:39Z kkolinko $
* @version $Id: StopTask.java 1131267 2011-06-03 22:22:35Z markt $
* @since 4.1
*/
public class StopTask extends AbstractCatalinaTask {
// ------------------------------------------------------------- Properties
/**
* The context path of the web application we are managing.
*/
protected String path = null;
public String getPath() {
return (this.path);
}
public void setPath(String path) {
this.path = path;
}