Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.txt60
-rw-r--r--VERSION.txt2
-rw-r--r--jetty-distribution/src/main/resources/README.txt71
3 files changed, 27 insertions, 106 deletions
diff --git a/README.txt b/README.txt
index ae8caffa96..436e95e588 100644
--- a/README.txt
+++ b/README.txt
@@ -1,63 +1,11 @@
-JETTY
-=====
+This is a source checkout of the Jetty webserver.
-The Jetty project is a 100% Java HTTP Server, HTTP Client
-and Servlet Container.
-
-
-The Jetty @ eclipse project is based on the Jetty project at codehaus
-
- http://jetty.codehaus.org
-
-Ongoing development is now at the eclipse foundation
-
- http://www.eclipse.org/jetty/
-
-
-Jetty @ eclipse is open source and is dual licensed using the apache 2.0 and
-eclipse public license 1.0. You may choose either license when distributing
-jetty.
-
-
-
-BUILDING JETTY
-==============
-
-Jetty uses maven 2 as its build system. Maven will fetch
-the dependancies, build the server and assemble a runnable
-version:
+To build, use:
mvn install
+The jetty distribution will be built in
-
-RUNNING JETTY
-=============
-
-The run directory is either the top-level of a binary release
-or jetty-distribution/target/assembly-prep directory when built from
-source.
-
-To run with the default options:
-
- java -jar start.jar
-
-To see the available options and the default arguments
-provided by the start.ini file:
-
- java -jar start.jar --help
-
-To run with add configuration file(s), eg SSL
-
- java -jar start.jar etc/jetty-ssl.xml
-
-To run without the args from start.ini
-
- java -jar start.jar --ini OPTIONS=Server,websocket etc/jetty.xml etc/jetty-deploy.xml etc/jetty-ssl.xml
-
-To run with JNDI support
-
- java -jar start.jar OPTIONS=Server,jsp
-
+ jetty-distribution/target/distribution
diff --git a/VERSION.txt b/VERSION.txt
index 909c461bda..a7e4e16e7f 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,4 +1,4 @@
-jetty-7.1.2.v20100522
+jetty-7.1.2.v20100523
+ 308866 Update test suite to JUnit4 - Module jetty-util
+ 312948 Recycle SSL crypto buffers
+ 313196 randomly allocate ports for session test.
diff --git a/jetty-distribution/src/main/resources/README.txt b/jetty-distribution/src/main/resources/README.txt
index 5d41b2c813..ae8caffa96 100644
--- a/jetty-distribution/src/main/resources/README.txt
+++ b/jetty-distribution/src/main/resources/README.txt
@@ -3,88 +3,61 @@ JETTY
=====
The Jetty project is a 100% Java HTTP Server, HTTP Client
-and Servlet Container. The core project is hosted by
-the Eclipse Foundation at
+and Servlet Container.
- http://www.eclipse.org/jetty/
-The jetty integrations with 3rd party modules are hosted
-by the Codehaus at
+The Jetty @ eclipse project is based on the Jetty project at codehaus
http://jetty.codehaus.org
+Ongoing development is now at the eclipse foundation
-JETTY DISTRIBUTION
-==================
-
-This is the jetty-distribution module from Jetty @ eclipse
-project and is based on the Jetty modules from eclipse plus
-dependencies that have been through the eclipse IP
-process and conditioning.
+ http://www.eclipse.org/jetty/
-This distribution and its dependencies are provided under
-the terms and conditions of the Eclipse Foundation Software
-User Agreement unless otherwise specified.
-This distribution contains only the core functionality
-of a servlet server and the HTTP client.
+Jetty @ eclipse is open source and is dual licensed using the apache 2.0 and
+eclipse public license 1.0. You may choose either license when distributing
+jetty.
-Some modules (eg annotations) are missing dependencies
-which may be discovered by using the command
- mvn dependency:tree
-within the source module and placing them in the
-lib/ext directory. Alternately we recommend the jetty-hightide
-distribution for users that desire more third party integrations.
-JETTY HIGHTIDE
+BUILDING JETTY
==============
-The Jetty-hightide distribution is available for
-download via http://jetty.codehaus.org and contains
-the core jetty modules, plus the 3rd party dependencies
-and integrations needed to create a full featured
-application server.
+Jetty uses maven 2 as its build system. Maven will fetch
+the dependancies, build the server and assemble a runnable
+version:
+ mvn install
-MAVEN
-=====
-All Jetty artifacts are available as maven dependencies
-under the org.eclipse.jetty and org.mortbay.hightide group IDs
-
- http://repo1.maven.org/maven2/org/eclipse/jetty/
- http://repo2.maven.org/maven2/org/mortbay/jetty/
RUNNING JETTY
=============
-The run directory is either the top-level of a distribution
-or jetty-distribution/target/distribution directory when built from
+The run directory is either the top-level of a binary release
+or jetty-distribution/target/assembly-prep directory when built from
source.
To run with the default options:
java -jar start.jar
-To run with specific configuration file(s)
-
- java -jar start.jar etc/jetty.xml
-
-To see the available options
+To see the available options and the default arguments
+provided by the start.ini file:
java -jar start.jar --help
-To run with JSP support (if available)
+To run with add configuration file(s), eg SSL
- java -jar start.jar OPTIONS=Server,jsp
+ java -jar start.jar etc/jetty-ssl.xml
-To run with JMX support
+To run without the args from start.ini
- java -jar start.jar OPTIONS=Server,jmx etc/jetty-jmx.xml etc/jetty.xml
+ java -jar start.jar --ini OPTIONS=Server,websocket etc/jetty.xml etc/jetty-deploy.xml etc/jetty-ssl.xml
-To run with JSP & JMX support
+To run with JNDI support
- java -jar start.jar OPTIONS=Server,jsp,jmx etc/jetty-jmx.xml etc/jetty.xml
+ java -jar start.jar OPTIONS=Server,jsp

Back to the top