Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--VERSION.txt5
-rw-r--r--jetty-jmx/src/main/config/etc/jetty-jmx.xml2
-rw-r--r--jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/AbstractConnector-mbean.properties1
-rw-r--r--jetty-jmx/src/main/resources/org/eclipse/jetty/server/nio/jmx/SelectChannelConnector-mbean.properties1
-rw-r--r--jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java3
-rw-r--r--pom.xml4
6 files changed, 8 insertions, 8 deletions
diff --git a/VERSION.txt b/VERSION.txt
index d127dd5447..54e954c28b 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -7,12 +7,12 @@ jetty-7.1.4.v20100609
+ 294212 Can not customize session cookie path
+ 301608 Deregister shutdown hooks
+ 302350 org.eclipse.jetty.server.NCSARequestLog is missing JavaDoc
- + 303661 Startup with jetty.sh-Script failes if JETTY_HOME is not writeable for JETTY_USER
+ + 303661 jetty.sh failes if JETTY_HOME is not writeable
+ 304100 Better document JMX setup in jetty-jmx.xml
+ 305300 AsyncContext.start dispatches runnable
+ 314299 Create test harness for JDBCLoginService
+ 314581 Implement the Sec-Websocket handshake
- + 315190 CrossOriginFilter adds headers not understood by Chrome 5 WebSocket implementation
+ + 315190 CrossOriginFilter avoid headers not understood by WebSocket
+ 315687 included init script fails to test for JETTY_HOME as empty
+ 315715 Improved Cookie version handling. Server.setMaxCookieVersion
+ 315744 Fixed STOP.PORT and STOP.KEY in start.jar
@@ -23,6 +23,7 @@ jetty-7.1.4.v20100609
+ 316254 Implement @DeclareRoles
+ 316334 Breaking change on org.eclipse.jetty.client.HttpExchange
+ 316399 Debug output in MultiPartFilter
+ + 316413 Restarting webapp for packed war fails
+ JETTY-547 Delay close after shutdown until request read
+ JETTY-1231 Support context request log handler
diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx.xml b/jetty-jmx/src/main/config/etc/jetty-jmx.xml
index efd073d2d4..bdce9d4298 100644
--- a/jetty-jmx/src/main/config/etc/jetty-jmx.xml
+++ b/jetty-jmx/src/main/config/etc/jetty-jmx.xml
@@ -6,8 +6,6 @@
<!-- file must appear first in the list of the configuration files. -->
<!-- The simplest way to achieve this is to add etc/jetty-jmx.xml as the -->
<!-- first file in configuration file list at the end of start.ini file. -->
-<!-- Alternately start the server with: -->
-<!-- java -Dcom.sun.management.jmxremote -jar start.jar --pre=etc/jetty-jmx.xml -->
<!-- ============================================================================ -->
<Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/AbstractConnector-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/AbstractConnector-mbean.properties
index e2d97a4860..fd7667217d 100644
--- a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/AbstractConnector-mbean.properties
+++ b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/AbstractConnector-mbean.properties
@@ -16,5 +16,4 @@ confidentialPort: Port to use for confidential redirections.
confidentialScheme: Scheme to use for confidential redirections.
integralPort: Port to use for integral redirections.
integralScheme: Scheme to use for integral redirections.
-lowResourcesConnections: The number of connections, which if exceeded represents low resources
lowResourcesMaxIdleTime: The period in ms that a connection may be idle when the connector has low resources, before it is closed.
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/nio/jmx/SelectChannelConnector-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/nio/jmx/SelectChannelConnector-mbean.properties
index 096a4b4aad..dbe718d5b0 100644
--- a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/nio/jmx/SelectChannelConnector-mbean.properties
+++ b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/nio/jmx/SelectChannelConnector-mbean.properties
@@ -1 +1,2 @@
SelectChannelConnector: HTTP connector using NIO ByteChannels and Selectors
+lowResourcesConnections: The number of connections, which if exceeded represents low resources
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
index b008ee3c72..37c663715a 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
@@ -360,6 +360,7 @@ public class WebInfConfiguration implements Configuration
public void unpack (WebAppContext context) throws IOException
{
Resource web_app = context.getBaseResource();
+ _preUnpackBaseResource = context.getBaseResource();
if (web_app == null)
{
@@ -461,7 +462,7 @@ public class WebInfConfiguration implements Configuration
Log.debug("webapp=" + web_app);
}
- _preUnpackBaseResource = context.getBaseResource();
+
// Do we need to extract WEB-INF/lib?
Resource web_inf= web_app.addPath("WEB-INF/");
diff --git a/pom.xml b/pom.xml
index 9b664fd9ee..b8dd2fc603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -355,7 +355,7 @@
<tags>
<tag>
<name>org.apache.xbean.XBean</name>
- <placement>x</placement>
+ <placement>X</placement>
<head />
</tag>
</tags>
@@ -365,4 +365,4 @@
</build>
</profile>
</profiles>
-</project> \ No newline at end of file
+</project>

Back to the top