diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml index 78d4d9fff0e..89daa3e1091 100644 --- a/aggregates/jetty-all-compact3/pom.xml +++ b/aggregates/jetty-all-compact3/pom.xml @@ -56,15 +56,15 @@ sources **/* - META-INF/** - **/Servlet3Continuation* - **/Jetty6Continuation* - **/AppContextLeakPreventer*.java - **/AWTLeakPreventer*.java - **/IntrospectorCleaner*.java - **/PostConstructAnnotationHandler*.java - **/PreDestroyAnnotationHandler*.java - **/ResourceAnnotationHandler*.java + META-INF/**, + **/Servlet3Continuation*, + **/Jetty6Continuation*, + **/AppContextLeakPreventer*.java, + **/AWTLeakPreventer*.java, + **/IntrospectorCleaner*.java, + **/PostConstructAnnotationHandler*.java, + **/PreDestroyAnnotationHandler*.java, + **/ResourceAnnotationHandler*.java, **/ResourcesAnnotationHandler*.java org.eclipse.jetty,org.eclipse.jetty.websocket @@ -78,32 +78,22 @@ - org.apache.maven.plugins - + org.apache.maven.plugins maven-jar-plugin - - - package - package - - jar - - - - - - - development - http://eclipse.org/jetty - ${user.name} - org.eclipse.jetty - https://raw.githubusercontent.com/eclipse/jetty.project/master/NOTICE.txt - Jetty - - - - - + + + + + + development + https://eclipse.org/jetty + ${user.name} + org.eclipse.jetty + https://raw.githubusercontent.com/eclipse/jetty.project/master/NOTICE.txt + Jetty + + + org.apache.maven.plugins diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index 3e0e91ef960..88636ca2122 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -21,7 +21,6 @@ org.apache.maven.plugins maven-resources-plugin - 2.7 massage-manifest @@ -44,7 +43,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 org.eclipse.jetty.toolchain @@ -99,7 +97,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.9.1 attach-artifacts diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 66ecfd4fcff..3916db1835c 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -21,7 +21,7 @@ Jetty-specific ServletContainerInitializer for Jasper - org.eclipse.jetty.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", + org.eclipse.jetty.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" @@ -30,29 +30,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - artifact-jar - - jar - - - - test-jar - - test-jar - - - - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - @@ -67,7 +44,7 @@ jetty-server ${project.version} - + org.eclipse.jetty.toolchain diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml index 3a3f023f0dd..52a426a2bca 100644 --- a/examples/async-rest/pom.xml +++ b/examples/async-rest/pom.xml @@ -3,8 +3,7 @@ org.eclipse.jetty.examples examples-parent 9.4.0-SNAPSHOT - ../pom.xml - + 4.0.0 org.eclipse.jetty example-async-rest diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 4d4c8af3a29..aef61743119 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -3,7 +3,6 @@ org.eclipse.jetty.examples examples-parent 9.4.0-SNAPSHOT - ../pom.xml 4.0.0 org.eclipse.jetty diff --git a/examples/pom.xml b/examples/pom.xml index 230e23de74c..68b7ae52fd0 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,6 @@ org.eclipse.jetty jetty-project 9.4.0-SNAPSHOT - ../pom.xml org.eclipse.jetty.examples examples-parent @@ -25,7 +24,7 @@ async-rest diff --git a/header-template.txt b/header-template.txt index 07cd15e8ee9..7756b0e88da 100644 --- a/header-template.txt +++ b/header-template.txt @@ -12,4 +12,4 @@ http://www.opensource.org/licenses/apache2.0.php You may elect to redistribute this code under either of these licenses. - ======================================================================== \ No newline at end of file + ======================================================================== diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index a6fc725bb46..80a0f425eb4 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -28,7 +28,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.7 parse-version diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationConfiguration.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationConfiguration.java index 713f2a4a7a9..f6392771418 100644 --- a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationConfiguration.java +++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationConfiguration.java @@ -25,6 +25,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; +import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.FragmentDescriptor; import org.eclipse.jetty.webapp.WebAppContext; @@ -40,7 +41,7 @@ public class TestAnnotationConfiguration @Test public void testGetFragmentFromJar() throws Exception { - String dir = System.getProperty("basedir", "."); + String dir = MavenTestingUtils.getTargetTestingDir("getFragmentFromJar").getAbsolutePath(); File file = new File(dir); file=new File(file.getCanonicalPath()); URL url=file.toURL(); diff --git a/jetty-cdi/cdi-servlet/src/test/resources/jetty-logging.properties b/jetty-cdi/cdi-servlet/src/test/resources/jetty-logging.properties index f69b351e507..aaf03af93a2 100644 --- a/jetty-cdi/cdi-servlet/src/test/resources/jetty-logging.properties +++ b/jetty-cdi/cdi-servlet/src/test/resources/jetty-logging.properties @@ -1,9 +1,9 @@ org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog -org.jboss.LEVEL=DEBUG +# org.jboss.LEVEL=DEBUG org.eclipse.jetty.LEVEL=INFO -org.eclipse.jetty.util.DecoratedObjectFactory.LEVEL=DEBUG -org.eclipse.jetty.cdi.LEVEL=DEBUG +# org.eclipse.jetty.util.DecoratedObjectFactory.LEVEL=DEBUG +# org.eclipse.jetty.cdi.LEVEL=DEBUG # org.eclipse.jetty.LEVEL=DEBUG # org.eclipse.jetty.websocket.LEVEL=DEBUG diff --git a/jetty-cdi/test-cdi-it/pom.xml b/jetty-cdi/test-cdi-it/pom.xml index 5329541c38e..fb6b0ea619d 100644 --- a/jetty-cdi/test-cdi-it/pom.xml +++ b/jetty-cdi/test-cdi-it/pom.xml @@ -91,7 +91,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.17 @@ -104,7 +103,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 start-jetty diff --git a/jetty-cdi/test-cdi-webapp/pom.xml b/jetty-cdi/test-cdi-webapp/pom.xml index 8044dc39123..5fa23abfb82 100644 --- a/jetty-cdi/test-cdi-webapp/pom.xml +++ b/jetty-cdi/test-cdi-webapp/pom.xml @@ -52,7 +52,6 @@ org.apache.maven.plugins maven-assembly-plugin - 2.5.3 with-weld diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 9450cdcc994..b7e52465020 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -51,7 +51,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.2 package diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java index ddb42150772..6b89c31a6a6 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java @@ -491,6 +491,12 @@ public class HttpClient extends ContainerLifeCycle protected HttpDestination destinationFor(String scheme, String host, int port) { + if (!HttpScheme.HTTP.is(scheme) && !HttpScheme.HTTPS.is(scheme) && + !HttpScheme.WS.is(scheme) && !HttpScheme.WSS.is(scheme)) + throw new IllegalArgumentException("Invalid protocol " + scheme); + + scheme = scheme.toLowerCase(Locale.ENGLISH); + host = host.toLowerCase(Locale.ENGLISH); port = normalizePort(scheme, port); Origin origin = new Origin(scheme, host, port); @@ -530,9 +536,7 @@ public class HttpClient extends ContainerLifeCycle protected void send(final HttpRequest request, List listeners) { - String scheme = request.getScheme().toLowerCase(Locale.ENGLISH); - String host = request.getHost().toLowerCase(Locale.ENGLISH); - HttpDestination destination = destinationFor(scheme, host, request.getPort()); + HttpDestination destination = destinationFor(request.getScheme(), request.getHost(), request.getPort()); destination.send(request, listeners); } diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java index 667e291cb9b..6e697f5d6d7 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java @@ -271,7 +271,7 @@ public class HttpClientRedirectTest extends AbstractHttpClientServerTest { baseRequest.setHandled(true); response.setStatus(303); - response.setHeader("Location", "ssh://localhost/path"); + response.setHeader("Location", "ssh://localhost:" + connector.getLocalPort() + "/path"); } }); diff --git a/jetty-documentation/pom.xml b/jetty-documentation/pom.xml index ea21beb1a71..2518c076397 100644 --- a/jetty-documentation/pom.xml +++ b/jetty-documentation/pom.xml @@ -10,24 +10,12 @@ Jetty :: Documentation pom - UTF-8 - 1.5.3 ${project.build.directory}/current - - - - org.apache.felix - maven-bundle-plugin - 3.0.1 - - - maven-resources-plugin - 2.6 copy-assets @@ -52,7 +40,6 @@ org.asciidoctor asciidoctor-maven-plugin - ${asciidoctor.version} output-html @@ -83,7 +70,6 @@ com.agilejava.docbkx docbkx-maven-plugin - 2.0.14 html @@ -132,7 +118,6 @@ net.sf.docbook docbook-xml - 5.1b4-all resources zip @@ -154,7 +139,6 @@ maven-assembly-plugin - 2.6 src/main/assembly/html.xml @@ -210,7 +194,6 @@ org.asciidoctor asciidoctor-maven-plugin - ${asciidoctor.version} org.asciidoctor diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-gcloud-datastore.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-gcloud-datastore.adoc index a6175fd5cdb..ab37fe2ed54 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-gcloud-datastore.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-gcloud-datastore.adoc @@ -17,144 +17,97 @@ [[session-clustering-gcloud-datastore]] === Session Clustering with Google Cloud Datastore -Jetty can support session clustering by persisting sessions to -https://cloud.google.com/datastore/docs/concepts/overview[Google Cloud -Datastore]. Each Jetty instance locally caches sessions for which it has -received requests, writing any changes to the session through to the -Datastore as the request exits the server. Sessions must obey the -Serialization contract, and servlets must call the -Session.setAttribute() method to ensure that changes are persisted. +Jetty can support session clustering by persisting sessions to https://cloud.google.com/datastore/docs/concepts/overview[Google Cloud Datastore]. +Each Jetty instance locally caches sessions for which it has received requests, writing any changes to the session through to the Datastore as the request exits the server. +Sessions must obey the Serialization contract, and servlets must call the `Session.setAttribute()` method to ensure that changes are persisted. -The persistent session mechanism works in conjunction with a load -balancer that supports stickiness. Stickiness can be based on various -data items, such as source IP address or characteristics of the session -ID or a load-balancer specific mechanism. For those load balancers that -examine the session ID, the Jetty persistent session mechanism appends a -node ID to the session ID, which can be used for routing. +The persistent session mechanism works in conjunction with a load balancer that supports stickiness. +Stickiness can be based on various data items, such as source IP address or characteristics of the session ID or a load-balancer specific mechanism. +For those load balancers that examine the session ID, the Jetty persistent session mechanism appends a node ID to the session ID, which can be used for routing. ==== Configuration -There are two components to session management in Jetty: a session ID -manager and a session manager. +There are two components to session management in Jetty: a session ID manager and a session manager. -* The session ID manager ensures that session IDs are unique across all -webapps hosted on a Jetty instance, and thus there can only be one -session ID manager per Jetty instance. -* The session manager handles the session lifecycle -(create/update/invalidate/expire) on behalf of a web application, so -there is one session manager per web application instance. +* The session ID manager ensures that session IDs are unique across all webapps hosted on a Jetty instance, and thus there can only be one session ID manager per Jetty instance. +* The session manager handles the session lifecycle (create/update/invalidate/expire) on behalf of a web application, so there is one session manager per web application instance. -These managers also cooperate and collaborate with the -`org.eclipse.jetty.server.session.SessionHandler` to enable -cross-context dispatch. +These managers also cooperate and collaborate with the `org.eclipse.jetty.server.session.SessionHandler` to enable cross-context dispatch. ==== The gcloud-sessions Module -When using the jetty distribution, to enable Cloud Datastore session -persistence, you will first need to enable the `gcloud-sessions` -link:#startup-modules[module] for your link:#creating-jetty-base[base] -using the --add-to-start or --add-to-startd argument to the -link:#startup-overview[start.jar]. +When using the jetty distribution, to enable Cloud Datastore session persistence, you will first need to enable the `gcloud-sessions` link:#startup-modules[module] for your link:#creating-jetty-base[base] using the `--add-to-start` or `--add-to-startd` argument to the link:#startup-overview[start.jar]. -As part of the module installation, the necessary jars will be -dynamically downloaded and installed to your `${jetty.base}/lib/gcloud` -directory. If you need to up or downgrade the version of the jars, then -you can delete the jars that were automatically installed and replace -them. Once you've done that, you will need to prevent jetty's startup -checks from detecting the missing jars. To do that, you can use -`--skip-file-validation=glcoud-sessions` argument to start.jar on the -command line, or place that line inside `${jetty.base}/start.ini` to -ensure it is used for every start. +As part of the module installation, the necessary jars will be dynamically downloaded and installed to your `${jetty.base}/lib/gcloud` directory. +If you need to up or downgrade the version of the jars, then you can delete the jars that were automatically installed and replace them. +Once you've done that, you will need to prevent jetty's startup checks from detecting the missing jars. +To do that, you can use `--skip-file-validation=glcoud-sessions` argument to start.jar on the command line, or place that line inside `${jetty.base}/start.ini` to ensure it is used for every start. ===== Configuring the GCloudSessionIdManager -The gcloud-sessions module will have installed file called -`${jetty.home}/etc/jetty-gcloud-sessions.xml`. This file configures an -instance of the GCloudSessionIdManager that will be shared across all -webapps deployed on that server. It looks like this: +The gcloud-sessions module will have installed file called `${jetty.home}/etc/jetty-gcloud-sessions.xml`. +This file configures an instance of the `GCloudSessionIdManager` that will be shared across all webapps deployed on that server. It looks like this: [source,xml] ---- -include::{SRCDIR}/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-session-store.xml[] +include::{SRCDIR}/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-sessions.xml[] ---- -You configure it by setting values for properties. The properties will -either be inserted as commented out in your `start.ini`, or your -`start.d/gcloud-sessions.ini` file, depending on how you enabled the -module. +You configure it by setting values for properties. +The properties will either be inserted as commented out in your `start.ini`, or your `start.d/gcloud-sessions.ini` file, depending on how you enabled the module. -The only property you always need to set is the name of the node in the -cluster: +The only property you always need to set is the name of the node in the cluster: jetty.gcloudSession.workerName:: - The name that uniquely identifies this node in the cluster. This value - will also be used by the sticky load balancer to identify the node. - Don't forget to change the value of this property on *each* node on - which you enable gcloud datastore session clustering. + The name that uniquely identifies this node in the cluster. + This value will also be used by the sticky load balancer to identify the node. + Don't forget to change the value of this property on *each* node on which you enable gcloud datastore session clustering. -Which other properties you need to set depends on the execution -environment: +Which other properties you need to set depends on the execution environment: ====== Running Within Google Infrastructure -When you upload your webapp to run in Compute Engine, you do not need to -set any other properties for jetty. If you follow the instructions in -the https://cloud.google.com/datastore/docs/activate[Cloud Datastore -documentation], all authorizations etc will be provided by the runtime -environment. +When you upload your webapp to run in Compute Engine, you do not need to set any other properties for Jetty. +If you follow the instructions in the https://cloud.google.com/datastore/docs/activate[Cloud Datastore documentation], all authorizations...etc. will be provided by the runtime environment. ====== Running Externally to Google Infrastructure -When your app is executing outside of Google, you can either contact a -remote Cloud Datastore instance, or a -https://cloud.google.com/datastore/docs/tools/devserver[local test dev -server] provided by the sdk. The choice determines which properties you -need to set: +When your app is executing outside of Google, you can either contact a remote Cloud Datastore instance, or a https://cloud.google.com/datastore/docs/tools/devserver[local test dev server] provided by the sdk. +The choice determines which properties you need to set: Contacting an sdk dev server for testing::: - In this case, you need to set up either some _System_ properties or - _environment variables_ - NOT jetty properties! - + + In this case, you need to set up either some _System_ properties or _environment variables_ - *NOT* Jetty properties! + DATASTORE_DATASET;; This must be the name of your (test) project. DATASTORE_HOST;; - This is the url of the dev server as described at - https://cloud.google.com/datastore/docs/tools/devserver#setting_environment_variables. - An example may be "http://localhost:9999" + This is the url of the dev server as described https://cloud.google.com/datastore/docs/tools/devserver#setting_environment_variables[in Google's documentation]. + An example may be "http://localhost:9999". + Contacting a remote Cloud Datastore::: - In this case, you need to provide all of the authentication and - authorization information explicitly via jetty properties in the ini - file: - + + In this case, you need to provide all of the authentication and authorization information explicitly via jetty properties in the ini file: + jetty.gcloudSession.projectId;; This is the name of your project. jetty.gcloudSession.p12File;; - This is the location of the p12 key file that is associated with - your project. + This is the location of the p12 key file that is associated with your project. jetty.gcloudSession.serviceAccount;; - This is the email address that defines your service account for the - Cloud Datastore. + This is the email address that defines your service account for the Cloud Datastore. jetty.gcloudSession.password;; This is the password associated with the p12 key file. ===== Configuring the GCloudSessionManager -As mentioned elsewhere, there should be one GCloudSessionManager per -context (ie webapp). It will need to reference the single -GCloudSessionIdManager from which it derives the Cloud Datastore -configuration information. +As mentioned elsewhere, there should be one `GCloudSessionManager` per context (e.g. webapp). +It will need to reference the single `GCloudSessionIdManager` from which it derives the Cloud Datastore configuration information. -The way you configure a GCloudSessionManager depends on whether you're -configuring from a context xml file or a `jetty-web.xml` file or code. -The basic difference is how you get a reference to the Jetty -`org.eclipse.jetty.server.Server` instance. +The way you configure a `GCloudSessionManager` depends on whether you're configuring from a context xml file, a `jetty-web.xml` file or code. +The basic difference is how you get a reference to the Jetty `org.eclipse.jetty.server.Server` instance. From a context xml file, you reference the Server instance as a Ref: [source,xml] ----- - - +---- @@ -175,12 +128,10 @@ From a context xml file, you reference the Server instance as a Ref: ---- -From a `WEB-INF/jetty-web.xml` file, you can reference the Server -instance directly: +From a `WEB-INF/jetty-web.xml` file, you can reference the Server instance directly: [source,xml] ---- - @@ -201,19 +152,17 @@ instance directly: ---- -The GCloudSessionManager supports the following configuration setters: +The `GCloudSessionManager` supports the following configuration setters: scavengeIntervalSec:: - Time in seconds between runs of a scavenger task that looks for - expired old sessions to delete. The default is 10 minutes. If set to - 0, no scavenging is done. + Time in seconds between runs of a scavenger task that looks for expired old sessions to delete. + The default is 10 minutes. + If set to 0, no scavenging is done. staleIntervalSec:: - The length of time a session can be in memory without being checked - against the cluster. A value of 0 indicates that the session is never - checked against the cluster - the current node is considered to be the - master for the session. + The length of time a session can be in memory without being checked against the cluster. + A value of 0 indicates that the session is never checked against the cluster - the current node is considered to be the master for the session. maxQueryResults:: - The maximum number of results to return for a query to find expired - sessions. For efficiency it is important to limit the size of the - result. The default is 100. If 0 or negative numbers are set, the - default is used instead. + The maximum number of results to return for a query to find expired sessions. + For efficiency it is important to limit the size of the result. + The default is 100. + If 0 or negative numbers are set, the default is used instead. diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-infinispan.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-infinispan.adoc index 1e7524e3b21..5ada3f1b7fb 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-infinispan.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-infinispan.adoc @@ -17,58 +17,33 @@ [[session-clustering-infinispan]] === Session Clustering with Infinispan -Jetty can support session clustering by persisting sessions to -http://www.infinispan.org[Infinispan]. Each Jetty instance locally -caches sessions for which it has received requests, writing any changes -to the session through to Infinispan as the request exits the server. -Sessions must obey the Serialization contract, and servlets must call -the Session.setAttribute() method to ensure that changes are persisted. +Jetty can support session clustering by persisting sessions to http://www.infinispan.org[Infinispan]. +Each Jetty instance locally caches sessions for which it has received requests, writing any changes to the session through to Infinispan as the request exits the server. +Sessions must obey the Serialization contract, and servlets must call the `Session.setAttribute()` method to ensure that changes are persisted. -The persistent session mechanism works in conjunction with a load -balancer that supports stickiness. Stickiness can be based on various -data items, such as source IP address or characteristics of the session -ID or a load-balancer specific mechanism. For those load balancers that -examine the session ID, the Jetty persistent session mechanism appends a -node ID to the session ID, which can be used for routing. +The persistent session mechanism works in conjunction with a load balancer that supports stickiness. +Stickiness can be based on various data items, such as source IP address or characteristics of the session ID or a load-balancer specific mechanism. +For those load balancers that examine the session ID, the Jetty persistent session mechanism appends a node ID to the session ID, which can be used for routing. ==== Configuration -There are two components to session management in Jetty: a session ID -manager and a session manager. +There are two components to session management in Jetty: a session ID manager and a session manager. -* The session ID manager ensures that session IDs are unique across all -webapps hosted on a Jetty instance, and thus there can only be one -session ID manager per Jetty instance. -* The session manager handles the session lifecycle -(create/update/invalidate/expire) on behalf of a web application, so -there is one session manager per web application instance. +* The session ID manager ensures that session IDs are unique across all webapps hosted on a Jetty instance, and thus there can only be one session ID manager per Jetty instance. +* The session manager handles the session lifecycle (create/update/invalidate/expire) on behalf of a web application, so there is one session manager per web application instance. -These managers also cooperate and collaborate with the -`org.eclipse.jetty.server.session.SessionHandler` to enable -cross-context dispatch. +These managers also cooperate and collaborate with the `org.eclipse.jetty.server.session.SessionHandler` to enable cross-context dispatch. -==== The infinispan Module +==== The Infinispan Module -When using the jetty distribution, to enable Infinispan session -persistence, you will first need to enable the `infinispan` -link:#startup-modules[module] for your link:#creating-jetty-base[base] -using the --add-to-start or --add-to-startd argument to the -link:#startup-overview[start.jar]. +When using the jetty distribution, to enable Infinispan session persistence, you will first need to enable the Infinispan link:#startup-modules[module] for your link:#creating-jetty-base[base] using the `--add-to-start` or `--add-to-startd` argument to the link:#startup-overview[start.jar]. -As part of the module installation, the necessary infinispan jars will -be dynamically downloaded and installed to your -`${jetty.base}/lib/infinispan` directory. If you need to up or downgrade -the version of the infinispan jars, then you can delete the jars that -were automatically installed and replace them. Once you've done that, -you will need to prevent jetty's startup checks from detecting the -missing jars. To do that, you can use -`--skip-file-validation=infinispan` argument to start.jar on the command -line, or place that line inside `${jetty.base}/start.ini` to ensure it -is used for every start. +As part of the module installation, the necessary Infinispan jars will be dynamically downloaded and installed to your `${jetty.base}/lib/infinispan` directory. +If you need to up or downgrade the version of the Infinispan jars, then you can delete the jars that were automatically installed and replace them. +Once you've done that, you will need to prevent Jetty's startup checks from detecting the missing jars. +To do that, you can use `--skip-file-validation=infinispan` argument to start.jar on the command line, or place that line inside `${jetty.base}/start.ini` to ensure it is used for every start. -You will also find the following properties, either in your base's -`start.d/infinispan.ini` file or appended to your `start.ini`, depending -on how you enabled the module: +You will also find the following properties, either in your base's `start.d/infinispan.ini` file or appended to your `start.ini`, depending on how you enabled the module: .... ## Unique identifier for this node in the cluster @@ -76,61 +51,41 @@ jetty.infinispanSession.workerName=node1 .... jetty.infinispanSession.workerName:: - The name that uniquely identifies this node in the cluster. This value - will also be used by the sticky load balancer to identify the node. - Don't forget to change the value of this property on *each* node on - which you enable infinispan session clustering. + The name that uniquely identifies this node in the cluster. + This value will also be used by the sticky load balancer to identify the node. + Don't forget to change the value of this property on *each* node on which you enable Infinispan session clustering. -These properties are applied to the InfinispanSessionIdManager described -below. +These properties are applied to the `InfinispanSessionIdManager` described below. ===== Configuring the InfinispanSessionIdManager -The infinispan module will have installed file called -$\{jetty.home}/etc/jetty-infinispan.xml. This file configures an -instance of the InfinispanSessionIdManager that will be shared across -all webapps deployed on that server. It looks like this: +The Infinispan module will have installed file called `$\{jetty.home}/etc/jetty-infinispan.xml`. +This file configures an instance of the `InfinispanSessionIdManager` that will be shared across all webapps deployed on that server. +It looks like this: [source,xml] ---- -include::{SRCDIR}/jetty-infinispan/src/main/config/etc/jetty-default-infinispan-store.xml[] +include::{SRCDIR}/jetty-infinispan/src/main/config/etc/jetty-infinispan.xml[] ---- -As you can see, you configure the Infinispan -http://infinispan.org/docs/7.1.x/user_guide/user_guide.html#_the_cache_apis[Cache] -instance that the InfinispanSessionIdManager should use in this file. By -default, the infinispan -http://infinispan.org/docs/7.1.x/getting_started/getting_started.html#_running_infinispan_on_a_single_node[Default -cache] instance is used (ie on the local node). You can instead use a -custom Cache setup - the jetty-infinispan.xml file shows you how to -configure a remote Cache (using the -http://infinispan.org/docs/7.1.x/user_guide/user_guide.html#_using_hot_rod_server[hotrod -java client]). +As you can see, you configure the Infinispan http://infinispan.org/docs/7.1.x/user_guide/user_guide.html#_the_cache_apis[Cache] instance that the `InfinispanSessionIdManager` should use in this file. +By default, the Infinispan http://infinispan.org/docs/7.1.x/getting_started/getting_started.html#_running_infinispan_on_a_single_node[Default cache] instance is used (e.g. on the local node). +You can instead use a custom Cache setup - the `jetty-infinispan.xml` file shows you how to configure a remote Cache (using the http://infinispan.org/docs/7.1.x/user_guide/user_guide.html#_using_hot_rod_server[hotrod java client]). -The InfinispanSessionIdManager can be configured by calling setters: +The `InfinispanSessionIdManager` can be configured by calling setters: idleExpiryMultiple:: - Sessions that are not immortal, ie they have an expiry time, have - their ids stored into Infinispan with an - http://infinispan.org/docs/7.1.x/user_guide/user_guide.html#_expiration[idle - expiry timeout] equivalent to double the session's timeout. This - should be sufficient to ensure that a session id that is in-use by a - session is never accidentally removed. However, should you wish to, - you can configure this to any integral value to effectively increase - the - http://infinispan.org/docs/7.1.x/user_guide/user_guide.html#_expiration[idle - expiry] timeout. + Sessions that are not immortal, e.g. they have an expiry time, have their ids stored into Infinispan with an http://infinispan.org/docs/7.1.x/user_guide/user_guide.html#_expiration[idle expiry timeout] equivalent to double the session's timeout. + This should be sufficient to ensure that a session id that is in-use by a session is never accidentally removed. + However, should you wish to, you can configure this to any integral value to effectively increase the http://infinispan.org/docs/7.1.x/user_guide/user_guide.html#_expiration[idle expiry] timeout. ===== Configuring the InfinispanSessionManager -As mentioned elsewhere, there should be one InfinispanSessionManager per -context (ie webapp). It will need to reference the single -InfinispanSessionIdManager configured previously for the Server. +As mentioned elsewhere, there should be one `InfinispanSessionManager` per context (e.g. webapp). +It will need to reference the single `InfinispanSessionIdManager` configured previously for the Server. -The way you configure a InfinispanSessionManager depends on whether -you're configuring from a context xml file or a `jetty-web.xml` file or -code. The basic difference is how you get a reference to the Jetty -`org.eclipse.jetty.server.Server` instance. +The way you configure a `InfinispanSessionManager` depends on whether you're configuring from a context xml file, a `jetty-web.xml` file or code. +The basic difference is how you get a reference to the Jetty `org.eclipse.jetty.server.Server` instance. From a context xml file, you reference the Server instance as a Ref: @@ -171,8 +126,7 @@ From a context xml file, you reference the Server instance as a Ref: ---- -From a `WEB-INF/jetty-web.xml` file, you can reference the Server -instance directly: +From a `WEB-INF/jetty-web.xml` file, you can reference the Server instance directly: [source,xml] ---- @@ -213,25 +167,19 @@ instance directly: The InfinispanSessionManager can be provided by calling setters: scavengeInterval:: - Time in seconds between runs of a scavenger task that looks for - expired old sessions to delete. The default is 10 minutes. + Time in seconds between runs of a scavenger task that looks for expired old sessions to delete. + The default is 10 minutes. staleIntervalSec:: - The length of time a session can be in memory without being checked - against the cluster. A value of 0 indicates that the session is never - checked against the cluster - the current node is considered to be the - master for the session. + The length of time a session can be in memory without being checked against the cluster. + A value of 0 indicates that the session is never checked against the cluster - the current node is considered to be the master for the session. ===== Using HotRod -If you're using the hotrod client - where serialization will be required -- you will need to ensure that the hotrod marshalling software works -with jetty classloading. To do this, firstly ensure that you have -included the lines containing the `prependServerClass` to your context -xml file as shown above. +If you're using the hotrod client - where serialization will be required - you will need to ensure that the hotrod marshalling software works with Jetty classloading. +To do this, firstly ensure that you have included the lines containing the `prependServerClass` to your context xml file as shown above. -Then, create the file -`${jetty.base}/resources/hotrod-client.properties`. Add the following -line to this file: +Then, create the file `${jetty.base}/resources/hotrod-client.properties`. +Add the following line to this file: .... infinispan.client.hotrod.marshaller=org.eclipse.jetty.session.infinispan.WebAppMarshaller diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-jdbc.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-jdbc.adoc index 6eb6ae7b96d..2280f980eb0 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-jdbc.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-jdbc.adoc @@ -17,57 +17,35 @@ [[session-clustering-jdbc]] === Session Clustering with a Database -Jetty can support session clustering by persisting sessions to a shared -database. Each Jetty instance locally caches sessions for which it has -received requests, writing any changes to the session through to the -database as the request exits the server. Sessions must obey the -Serialization contract, and servlets must call the -Session.setAttribute() method to ensure that changes are persisted. +Jetty can support session clustering by persisting sessions to a shared database. +Each Jetty instance locally caches sessions for which it has received requests, writing any changes to the session through to the database as the request exits the server. +Sessions must obey the Serialization contract, and servlets must call the `Session.setAttribute()` method to ensure that changes are persisted. -The persistent session mechanism works in conjunction with a load -balancer that supports stickiness. Stickiness can be based on various -data items, such as source IP address or characteristics of the session -ID or a load-balancer specific mechanism. For those load balancers that -examine the session ID, the Jetty persistent session mechanism appends a -node ID to the session ID, which can be used for routing. +The persistent session mechanism works in conjunction with a load balancer that supports stickiness. +Stickiness can be based on various data items, such as source IP address or characteristics of the session ID or a load-balancer specific mechanism. +For those load balancers that examine the session ID, the Jetty persistent session mechanism appends a node ID to the session ID, which can be used for routing. -In this type of solution, the database can become both a bottleneck and -a single point of failure. Jetty takes steps to reduce the load on the -database (discussed below), but in a heavily loaded environment you -might need to investigate other optimization strategies such as local -caching and database replication. You should also consult your database -vendor's documentation for information on how to ensure high -availability and failover of your database. +In this type of solution, the database can become both a bottleneck and a single point of failure. +Jetty takes steps to reduce the load on the database (discussed below), but in a heavily loaded environment you might need to investigate other optimization strategies such as local caching and database replication. +You should also consult your database vendor's documentation for information on how to ensure high availability and failover of your database. ==== Configuration -There are two components to session management in Jetty: a session ID -manager and a session manager. +There are two components to session management in Jetty: a session ID manager and a session manager. -* The session ID manager ensures that session IDs are unique across all -webapps hosted on a Jetty instance, and thus there can only be one -session ID manager per Jetty instance. -* The session manager handles the session lifecycle -(create/update/invalidate/expire) on behalf of a web application, so -there is one session manager per web application instance. +* The session ID manager ensures that session IDs are unique across all webapps hosted on a Jetty instance, and thus there can only be one session ID manager per Jetty instance. +* The session manager handles the session lifecycle (create/update/invalidate/expire) on behalf of a web application, so there is one session manager per web application instance. -These managers also cooperate and collaborate with the -`org.eclipse.jetty.server.session.SessionHandler` to enable -cross-context dispatch. +These managers also cooperate and collaborate with the `org.eclipse.jetty.server.session.SessionHandler` to enable cross-context dispatch. ==== The jdbc-session Module -When using the jetty distribution, to enable jdbc session persistence, -you will first need to enable the jdbc-session -link:#startup-modules[module] for your link:#creating-jetty-base[base] -using the --add-to-start or --add-to-startd argument to the -link:#startup-overview[start.jar]. +When using the jetty distribution, to enable jdbc session persistence, you will first need to enable the jdbc-session link:#startup-modules[module] for your link:#creating-jetty-base[base] using the `--add-to-start` or `--add-to-startd` argument to the link:#startup-overview[start.jar]. -You will also find the following properties, either in your base's -start.d/jdbc-session.ini file or appended to your start.ini, depending -on how you enabled the module: +You will also find the following properties, either in your base's start.d/jdbc-session.ini file or appended to your start.ini, depending on how you enabled the module: -.... +[source,java] +---- ## Unique identifier for this node in the cluster jetty.jdbcSession.workerName=node1 @@ -75,53 +53,42 @@ jetty.jdbcSession.workerName=node1 #jetty.jdbcSession.datasource=sessions jetty.jdbcSession.driverClass=org.apache.derby.jdbc.EmbeddedDriver jetty.jdbcSession.connectionURL=jdbc:derby:sessions;create=true -.... +---- jetty.jdbcSession.workerName:: - The name that uniquely identifies this node in the cluster. This value - will also be used by the sticky load balancer to identify the node. - Don't forget to change the value of this property on *each* node on - which you enable jdbc session clustering. + The name that uniquely identifies this node in the cluster. + This value will also be used by the sticky load balancer to identify the node. + Don't forget to change the value of this property on *each* node on which you enable jdbc session clustering. jetty.jdbcSession.scavenge:: - The time in seconds between sweeps of a task which scavenges old - expired sessions. The default is 10 mins. We don't recommend you - increase the frequency bcause doing so increases the load on the - database with very little gain. + The time in seconds between sweeps of a task which scavenges old expired sessions. + The default is 10 minutess. + Increasing the frequency is not recommended as doing so increases the load on the database with very little gain. jetty.jdbcSession.datasource:: - The name of a javax.sql.DataSource that gives access to the database - that holds the session information. You should configure *either* this - or the jdbc driver information described next. + The name of a `javax.sql.DataSource` that gives access to the database that holds the session information. + You should configure *either* this or the jdbc driver information described next. jetty.jdbcSession.datasource and jetty.jdbcSession.connectionURL:: - This is the name of the jdbc driver class, and a jdbc connection url - suitable for that driver. You should configure *either* this or the - jdbc datasource name described above. + This is the name of the jdbc driver class, and a jdbc connection url suitable for that driver. + You should configure *either* this or the jdbc datasource name described above. -These properties are applied to the JDBCSessionIdManager described -below. +These properties are applied to the `JDBCSessionIdManager` described below. ===== Configuring the JDBCSessionIdManager -The jdbc-session module will have installed file called -$\{jetty.home}/etc/jetty-jdbc-sessions.xml. This file configures an -instance of the JDBCSessionIdManager that will be shared across all -webapps deployed on that server. It looks like this: +The jdbc-session module will have installed file called `$\{jetty.home}/etc/jetty-jdbc-sessions.xml`. +This file configures an instance of the `JDBCSessionIdManager` that will be shared across all webapps deployed on that server. +It looks like this: [source,xml] ---- -include::{SRCDIR}/jetty-server/src/main/config/etc/jetty-jdbc-session-store.xml[] +include::{SRCDIR}/jetty-server/src/main/config/etc/jetty-jdbc-sessions.xml[] ---- -As well as uncommenting and setting up appropriate values for the -properties we discussed above, you will also need to edit this file and -uncomment *either* the datasource or the driver info elements. +As well as uncommenting and setting up appropriate values for the properties discussed above, you will also need to edit this file and uncomment *either* the data source or the driver info elements. -As Jetty configuration files are direct mappings of XML to Java, it is -straightforward to see how to do this in code, but here's an example -anyway: +As Jetty configuration files are direct mappings of XML to Java, it is straight forward to do this in code: [source,java] ----- - +---- Server server = new Server(); ... JDBCSessionIdManager idMgr = new JDBCSessionIdManager(server); @@ -134,19 +101,18 @@ server.setSessionIdManager(idMgr); ====== Configuring the Database Schema -You may find it necessary to change the names of the tables and columns -that the JDBC Session management uses to store the session information. +You may find it necessary to change the names of the tables and columns that the JDBC Session management uses to store the session information. The defaults used are: .Default Values for Session Id Table -[cols=",",] +[options="header"] |=========================== |table name |JettySessionIds -|columns |id +|columns |id |=========================== .Default Values for Session Table -[cols=",",] +[options="header"] |======================================================================= |table name |JettySessions @@ -155,16 +121,11 @@ accessTime, lastAccessTime, createTime, cookieTime, lastSavedTime, expiryTime, maxInterval, map |======================================================================= -To change these values, use the -link:{JDURL}/org/eclipse/jetty/server/session/SessionIdTableSchema.html[org.eclipse.jetty.server.session.SessionIdTableSchema] -and -link:{JDURL}/org/eclipse/jetty/server/session/SessionTableSchema.html[org.eclipse.jetty.server.session.SessionTableSchema] -classes. These classes have getter/setter methods for the table name and -all columns. +To change these values, use the link:{JDURL}/org/eclipse/jetty/server/session/SessionIdTableSchema.html[org.eclipse.jetty.server.session.SessionIdTableSchema] and link:{JDURL}/org/eclipse/jetty/server/session/SessionTableSchema.html[org.eclipse.jetty.server.session.SessionTableSchema] classes. +These classes have getter/setter methods for the table name and all columns. -Here's an example of changing the name of JettySessionsId table and its -single column. This example will use java code, but as explained above, -you may also do this via a jetty xml configuration file: +Here's an example of changing the name of `JettySessionsId` table and its single column. +This example will use java code, but as explained above, you may also do this via a Jetty xml configuration file: [source,java] ---- @@ -176,10 +137,8 @@ idTableSchema.setIdColumn("theid"); idManager.setSessionIdTableSchema(idTableSchema); ---- -In a similar fashion, you can change the names of the table and columns -for the JettySessions table. *Note* that both the SessionIdTableSchema -and the SessionTableSchema instances are set on the JDBCSessionIdManager -class. +In a similar fashion, you can change the names of the table and columns for the `JettySessions` table. +*Note* that both the `SessionIdTableSchema` and the `SessionTableSchema` instances are set on the `JDBCSessionIdManager` class. [source,java] ---- @@ -203,14 +162,11 @@ idManager.setSessionTableSchema(sessionTableSchema); ===== Configuring the JDBCSessionManager -As mentioned elsewhere, there should be one JDBCSessionManager per -context (ie webapp). It will need to reference the single -JDBCSessionIdManager configured previously for the Server. +As mentioned elsewhere, there should be one `JDBCSessionManager` per context (e.g. webapp). +It will need to reference the single `JDBCSessionIdManager` configured previously for the Server. -The way you configure a JDBCSessionManager depends on whether you're -configuring from a context xml file or a `jetty-web.xml` file or code. -The basic difference is how you get a reference to the Jetty -`org.eclipse.jetty.server.Server` instance. +The way you configure a `JDBCSessionManager` depends on whether you're configuring from a context xml file, a `jetty-web.xml` file or code. +The basic difference is how you get a reference to the Jetty `org.eclipse.jetty.server.Server` instance. From a context xml file, you reference the Server instance as a Ref: @@ -232,8 +188,7 @@ From a context xml file, you reference the Server instance as a Ref: ---- -From a `WEB-INF/jetty-web.xml` file, you can reference the Server -instance directly: +From a `WEB-INF/jetty-web.xml` file, you can reference the Server instance directly: [source,xml] ---- diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-mongodb.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-mongodb.adoc index 27b4355379b..47cc1659436 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-mongodb.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-clustering-mongodb.adoc @@ -17,108 +17,72 @@ [[session-clustering-mongodb]] === Session Clustering with MongoDB -Jetty can support session clustering by persisting sessions into -http://www.mogodb.org[MongoDB]. Each Jetty instance locally caches -sessions for which it has received requests, writing any changes to the -session through to the cluster as the request exits the server. Sessions -must obey the Serialization contract, and servlets must call the -Session.setAttribute() method to ensure that changes are persisted. +Jetty can support session clustering by persisting sessions into http://www.mogodb.org[MongoDB]. +Each Jetty instance locally caches sessions for which it has received requests, writing any changes to the session through to the cluster as the request exits the server. +Sessions must obey the Serialization contract, and servlets must call the `Session.setAttribute()` method to ensure that changes are persisted. -The session persistence mechanism works in conjunction with a load -balancer that supports stickiness. Stickiness can be based on various -data items, such as source IP address or characteristics of the session -ID or a load-balancer specific mechanism. For those load balancers that -examine the session ID, the Jetty persistent session mechanism appends a -node ID to the session ID, which can be used for routing. +The session persistence mechanism works in conjunction with a load balancer that supports stickiness. +Stickiness can be based on various data items, such as source IP address or characteristics of the session ID or a load-balancer specific mechanism. +For those load balancers that examine the session ID, the Jetty persistent session mechanism appends a node ID to the session ID, which can be used for routing. -In this type of solution, the traffic on the network needs to be -carefully watched and tends to be the bottleneck. You are probably -investigating this solution in order to scale to large amount of users -and sessions, so careful attention should be paid to your usage -scenario. Applications with a heavy write profile to their sessions will -consume more network bandwidth than profiles that are predominately read -oriented. We recommend using this session manager with largely read -based session scenarios. +In this type of solution, the traffic on the network needs to be carefully watched and tends to be the bottleneck. +You are probably investigating this solution in order to scale to large amount of users and sessions, so careful attention should be paid to your usage scenario. +Applications with a heavy write profile to their sessions will consume more network bandwidth than profiles that are predominately read oriented. +We recommend using this session manager with largely read based session scenarios. ==== Configuration -There are two components to session management in Jetty: a session ID -manager and a session manager. +There are two components to session management in Jetty: a session ID manager and a session manager. -* The session ID manager ensures that session IDs are unique across all -webapps hosted on a Jetty instance, and thus there should only be one -session ID manager per Jetty instance. -* The session manager handles the session lifecycle -(create/update/invalidate/expire) on behalf of a web application, so -there is one session manager per web application instance. +* The session ID manager ensures that session IDs are unique across all webapps hosted on a Jetty instance, and thus there can only be one session ID manager per Jetty instance. +* The session manager handles the session lifecycle (create/update/invalidate/expire) on behalf of a web application, so there is one session manager per web application instance. -These managers also cooperate and collaborate with the -`org.eclipse.jetty.server.session.SessionHandler` to enable -cross-context dispatch. +These managers also cooperate and collaborate with the `org.eclipse.jetty.server.session.SessionHandler` to enable cross-context dispatch. ==== The nosql Module -When using the jetty distribution, to enable the mongodb session -persistence mechanism, you will first need to enable the nosql -link:#startup-modules[module] for your link:#creating-jetty-base[base] -using the --add-to-start or --add-to-startd argument to the -link:#startup-overview[start.jar]. This module will automatically -download the mongodb-java-driver and install it to your base's lib/nosql -directory. +When using the jetty distribution, to enable the MongoDB session persistence mechanism, you will first need to enable the nosql link:#startup-modules[module] for your link:#creating-jetty-base[base] using the `--add-to-start` or `--add-to-startd` argument to the link:#startup-overview[start.jar]. +This module will automatically download the `mongodb-java-driver` and install it to your base's `lib/nosql` directory. -As part of the module installation, the necessary mongo java driver jars -will be dynamically downloaded and installed to your -`${jetty.base}/lib/nosql` directory. If you need to up or downgrade the -version of these jars, then you can delete the jars that were -automatically installed and replace them. Once you've done that, you -will need to prevent jetty's startup checks from detecting the missing -jars. To do that, you can use `--skip-file-validation=nosql` argument to -start.jar on the command line, or place that line inside -`${jetty.base}/start.ini` to ensure it is used for every start. +As part of the module installation, the necessary mongo java driver jars will be dynamically downloaded and installed to your `${jetty.base}/lib/nosql` directory. +If you need to up or downgrade the version of these jars, then you can delete the jars that were automatically installed and replace them. +Once you've done that, you will need to prevent Jetty's startup checks from detecting the missing jars. +To do that, you can use `--skip-file-validation=nosql` argument to start.jar on the command line, or place that line inside `${jetty.base}/start.ini` to ensure it is used for every start. -You will also find the following properties, either in your base's -start.d/nosql.ini file or appended to your start.ini, depending on how -you enabled the module: +You will also find the following properties, either in your base's `start.d/nosql.ini` file or appended to your `start.ini`, depending on how you enabled the module: -.... +[source,xml] +---- ## Unique identifier for this node in the cluster jetty.nosqlSession.workerName=node1 ## Interval in seconds between scavenging expired sessions jetty.nosqlSession.scavenge=1800 -.... +---- -The `jetty.nosqlSession.workerName` is the unique name for this jetty -Server instance. It will be used by the sticky load balancer to uniquely -identify the node. You should change this value on *each* node to which -you install mongodb session management. +The `jetty.nosqlSession.workerName` is the unique name for this Jetty Server instance. +It will be used by the sticky load balancer to uniquely identify the node. +You should change this value on *each* node to which you install MongoDB session management. -The `jetty.nosqlSession.scavenge` property defines the time in seconds -between runs of the scavengeer: the scavenger is a task which runs -periodically to clean out sessions that have expired but become stranded -in the database for whatever reason. +The `jetty.nosqlSession.scavenge` property defines the time in seconds between runs of the scavenger: the scavenger is a task which runs periodically to clean out sessions that have expired but become stranded in the database for whatever reason. -These properties are substituted into the configuration of the -MongoDBSessionIdManager and MongoSessionManager. +These properties are substituted into the configuration of the `MongoDBSessionIdManager` and `MongoSessionManager`. ===== Configuring the MongoSessionIdManager -The nosql module will have installed file called -$\{jetty.home}/etc/jetty-nosql.xml. This file configures an instance of -the MongoSessionIdManager that will be shared across all webapps -deployed on that server. It looks like this: +The nosql module will have installed file called `$\{jetty.home}/etc/jetty-nosql.xml`. +This file configures an instance of the `MongoSessionIdManager` that will be shared across all webapps deployed on that server. +It looks like this: [source,xml] ---- -include::{SRCDIR}/jetty-nosql/src/main/config/etc/jetty-mongo-session-store.xml[] +include::{SRCDIR}/jetty-nosql/src/main/config/etc/jetty-nosql.xml[] ---- -The MongoSessionIdManager needs access to a mongodb cluster, and the -jetty-nosql.xml file assumes the defaults of localhost and default -mongodb port. If you need to configure something else, you will need to -edit this file. Here's an example of a more complex setup to use a -remote mongodb instance: +The `MongoSessionIdManager` needs access to a MongoDB cluster, and the `jetty-nosql.xml` file assumes the defaults of localhost and default MongoDB port. +If you need to configure something else, you will need to edit this file. +Here's an example of a more complex setup to use a remote MongoDB instance: [source,xml] ---- @@ -162,9 +126,7 @@ remote mongodb instance: ---- -As Jetty configuration files are direct mappings of XML to Java, it is -straightforward to see how to do this in code, but here's an example -anyway: +As Jetty configuration files are direct mappings of XML to Java, it is straight forward to do this in code: [source,java] ---- @@ -178,71 +140,52 @@ anyway: ---- -The MongoSessionIdManager has slightly different options than some of -our more traditional session options. The MongoDBSessionIdManager has -the same scavenge timers which govern the setting of a valid session to -invalid after a certain period of inactivity. New to this session id -manager is the extra purge setting which governs removal from the -mongodb cluster. This can be configured through the 'purge' option. -Purge is by default set to true and by default runs daily for each node -on the cluster. Also able to be configured is the age in which an -invalid session will be retained which is set to 1 day by default. This -means that invalid sessions will be removed after lingering in the -mongodb instance for a day. There is also an option for purging valid -sessions that have not been used recently. The default time for this is -1 week. You can disable these behaviors by setting purge to false. +The MongoSessionIdManager has slightly different options than some of our more traditional session options. +The `MongoDBSessionIdManager` has the same scavenge timers which govern the setting of a valid session to invalid after a certain period of inactivity. +New to this session id manager is the extra purge setting which governs removal from the MongoDB cluster. +This can be configured through the 'purge' option. Purge is by default set to true and by default runs daily for each node on the cluster. +Also able to be configured is the age in which an invalid session will be retained which is set to 1 day by default. +This means that invalid sessions will be removed after lingering in the MongoDB instance for a day. +There is also an option for purging valid sessions that have not been used recently. +The default time for this is 1 week. You can disable these behaviors by setting purge to false. scavengeDelay:: - How long to delay before periodically looking for sessions to - scavenge? + How long to delay before periodically looking for sessions to scavenge? scavengePeriod:: - How much time after a scavenge has completed should you wait before - doing it again? + How much time after a scavenge has completed should you wait before doing it again? scavengeBlockSize:: - Number of session ids to which to limit each scavenge query. If you - have a very large number of sessions in memory then setting this to a - non 0 value may help speed up scavenging by breaking the scavenge into - multiple, queries. The default is 0, which means that all session ids - are considered in a single query. + Number of session ids to which to limit each scavenge query. + If you have a very large number of sessions in memory then setting this to a non 0 value may help speed up scavenging by breaking the scavenge into multiple, queries. + The default is 0, which means that all session ids are considered in a single query. purge (Boolean):: - Do you want to purge (delete) sessions that are invalid from the - session store completely? + Do you want to purge (delete) sessions that are invalid from the session store completely? purgeDelay:: How often do you want to perform this purge operation? purgeInvalidAge:: - How old should an invalid session be before it is eligible to be - purged? + How old should an invalid session be before it is eligible to be purged? purgeValidAge:: - How old should a valid session be before it is eligible to be marked - invalid and purged? Should this occur at all? + How old should a valid session be before it is eligible to be marked invalid and purged? + Should this occur at all? purgeLimit:: - Integer value that represents how many items to return from a purge - query. The default is 0, which is unlimited. If you have a lot of old - expired orphaned sessions then setting this value may speed up the - purge process. + Integer value that represents how many items to return from a purge query. + The default is 0, which is unlimited. + If you have a lot of old expired orphaned sessions then setting this value may speed up the purge process. preserveOnStop:: Whether or not to retain all sessions when the session manager stops. Default is `true`. ===== Configuring a MongoSessionManager -As mentioned elsewhere, there should be one MongoSessionManager per -context (ie webapp). It will need to reference the single -MongoSessionIdManager configured previously for the Server. +As mentioned elsewhere, there should be one `MongoSessionManager` per context (e.g. webapp). +It will need to reference the single `MongoSessionIdManager` configured previously for the Server. -The way you configure a -link:{JDURL}/org/eclipse/jetty/nosql/MongoSessionManager.html[org.eclipse.jetty.nosql.mongodb.MongoSessionManager] -depends on whether you're configuring from a -link:#deployable-descriptor-file[context xml] file or a -link:#jetty-web-xml-config[jetty-web.xml] file or code. The basic -difference is how you get a reference to the Jetty -`org.eclipse.jetty.server.Server` instance. +The way you configure a link:{JDURL}/org/eclipse/jetty/nosql/MongoSessionManager.html[org.eclipse.jetty.nosql.mongodb.MongoSessionManager] depends on whether you're configuring from a link:#deployable-descriptor-file[context xml] file or a link:#jetty-web-xml-config[jetty-web.xml] file or code. +The basic difference is how you get a reference to the Jetty `org.eclipse.jetty.server.Server` instance. From a context xml file, you reference the Server instance as a Ref: [source,xml] ----- - +---- @@ -258,15 +201,12 @@ From a context xml file, you reference the Server instance as a Ref: - ---- -From a `WEB-INF/jetty-web.xml` file, you can reference the Server -instance directly: +From a `WEB-INF/jetty-web.xml` file, you can reference the Server instance directly: [source,xml] ---- - @@ -287,7 +227,6 @@ If you're embedding this in code: [source,java] ---- - //assuming you have already set up the MongoSessionIdManager as shown earlier //and have a reference to the Server instance: @@ -296,5 +235,4 @@ If you're embedding this in code: MongoSessionManager mongoMgr = new MongoSessionManager(); mongoMgr.setSessionIdManager(server.getSessionIdManager()); wac.setSessionHandler(new SessionHandler(mongoMgr)); - ---- diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/setting-session-characteristics.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/setting-session-characteristics.adoc index c8f57ef325d..eaaf3c7bd2a 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/setting-session-characteristics.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/setting-session-characteristics.adoc @@ -17,9 +17,13 @@ [[setting-session-characteristics]] === Setting Session Characteristics -To modify the session characteristics of a web application, you can use -the following parameters, applying them as in one of the example -configurations: +Sessions are a concept within the Servlet api which allow requests to store and retrieve information across the time a user spends in an application. +Choosing the correct session manager implementation is an important consideration for every application as each can fit and perform optimally in different situations. +If you need a simple in-memory session manager that can persist to disk then the `HashSessionManager` can be a good place to start. +If you need a session manager that can work in a clustered scenario with multiple instances of Jetty, then the JDBC session manager can be an excellent option. +Jetty also offers more niche session managers that leverage backends such as MongoDB, Inifinispan, or even Google's Cloud Data Store. + +To modify the session characteristics of a web application, you can use the following parameters, applying them as in one of the example configurations: [[using-init-parameters]] ==== Using Init Parameters @@ -61,14 +65,12 @@ urls with calls to encodeURL(). False by default. [[applying-init-parameters]] ===== Applying Init Parameters -The following sections provide examples of how to apply the init -parameters. +The following sections provide examples of how to apply the init parameters. [[context-parameter-example]] ====== Context Parameter Example -You can set these parameters as context parameters in a web -application's ` WEB-INF/web.xml` file: +You can set these parameters as context parameters in a web application's `WEB-INF/web.xml` file: [source,xml] ---- @@ -97,8 +99,7 @@ application's ` WEB-INF/web.xml` file: [[web-application-examples]] ====== Web Application Examples -You can configure init parameters on a web application, either in code, -or in a Jetty context xml file equivalent: +You can configure init parameters on a web application, either in code, or in a Jetty context xml file equivalent: [source,xml] ---- @@ -125,8 +126,7 @@ or in a Jetty context xml file equivalent: [[init-parameter-examples]] ====== SessionManager Examples -You can configure init parameters directly on a `SessionManager` -instance, either in code or the equivalent in xml: +You can configure init parameters directly on a `SessionManager` instance, either in code or the equivalent in xml: [source,xml] ---- @@ -152,24 +152,16 @@ instance, either in code or the equivalent in xml: ==== Using Servlet 3.0 Session Configuration -With the advent of http://jcp.org/en/jsr/detail?id=315[Servlet -Specification 3.0] there are new APIs for configuring session handling -characteristics. What was achievable before only via jetty-specific -link:#session-init-params[init-parameters] can now be achieved in a -container-agostic manner either in code, or via web.xml. +With the advent of http://jcp.org/en/jsr/detail?id=315[Servlet Specification 3.0] there are new APIs for configuring session handling characteristics. +What was achievable before only via Jetty-specific link:#session-init-params[init-parameters] can now be achieved in a container-agnostic manner either in code, or via `web.xml`. [[session-cookie-configuration]] ===== SessionCookieConfiguration -The -http://docs.oracle.com/javaee/6/api/javax/servlet/SessionCookieConfig.html[javax.servlet.SessionCookieConfig] -class can be used to set up session handling characteristics. For full -details, consult the -http://docs.oracle.com/javaee/6/api/javax/servlet/SessionCookieConfig.html[javadoc]. +The http://docs.oracle.com/javaee/6/api/javax/servlet/SessionCookieConfig.html[javax.servlet.SessionCookieConfig] class can be used to set up session handling characteristics. +For full details, consult the http://docs.oracle.com/javaee/6/api/javax/servlet/SessionCookieConfig.html[javadoc]. -Here's an example of how you use it: this is a ServletContextListener -that retrieves the SessionCookieConfig and sets up some new values for -it when the context is being initialized: +Below is an example of this implementation: a `ServletContextListener` retrieves the `SessionCookieConfig` and sets up some new values when the context is being initialized: [source,java] ---- @@ -209,9 +201,7 @@ public class TestListener implements ServletContextListener } ---- -You can also use web.xml to configure the session handling -characteristics instead: here's an example, doing exactly the same as we -did above in code: +You can also use `web.xml` to configure the session handling characteristics instead: here's an example doing exactly the same as above instead of using code: [source,xml] ---- @@ -240,14 +230,9 @@ did above in code: [[session-tracking-modes]] ===== SessionTrackingModes -In addition to the configuration of -link:#session-cookie-configuration[session cookies], since Servlet 3.0 -you can also use the -http://docs.oracle.com/javaee/6/api/javax/servlet/SessionTrackingMode.html[javax.servlet.SessionTrackingMode] -to configure session tracking. +In addition to the configuration of link:#session-cookie-configuration[session cookies], since Servlet 3.0 you can also use the http://docs.oracle.com/javaee/6/api/javax/servlet/SessionTrackingMode.html[javax.servlet.SessionTrackingMode] to configure session tracking. -To determine what are the _default_ session tracking characteristics -used by the container, call: +To determine what are the _default_ session tracking characteristics used by the container, call: [source,java] ---- @@ -260,13 +245,12 @@ _default_ session tracking modes for Jetty are: * http://docs.oracle.com/javaee/6/api/javax/servlet/SessionTrackingMode.html#COOKIE[SessionTrackingMode.COOKIE] * http://docs.oracle.com/javaee/6/api/javax/servlet/SessionTrackingMode.html#URL[SessionTrackingMode.URL] -To see which session tracking modes are actually in effect for this -Context, the following call returns a java.util.Set of -javax.servlet.SessionTrackingMode: +To see which session tracking modes are actually in effect for this Context, the following call returns a `java.util.Set` of `javax.servlet.SessionTrackingMode`: -.... +[source,java] +---- javax.servlet.SessionContext.getEffectiveSessionTrackingModes(); -.... +---- To change the session tracking modes, call: @@ -275,7 +259,7 @@ To change the session tracking modes, call: javax.servlet.SessionContext.setSessionTrackingModes(Set); ---- -You may also set the tracking mode in web.xml, eg: +You may also set the tracking mode in `web.xml`, e.g.: [source,xml] ---- diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/using-persistent-sessions.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/using-persistent-sessions.adoc index 9b90d77bb8b..8ca2f8ca382 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/using-persistent-sessions.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/using-persistent-sessions.adoc @@ -17,21 +17,17 @@ [[using-persistent-sessions]] === Using Persistent Sessions -It is sometimes useful to preserve existing Sessions across restarts of -Jetty. The -link:{JDURL}/org/eclipse/jetty/server/session/HashSessionManager.html[`HashSessionManager`] -supports this feature. If you enable persistence, the -`HashSessionManager` saves all existing, valid Sessions to disk before -shutdown completes. On restart, Jetty restores the saved Sessions. +It is sometimes useful to preserve existing Sessions across restarts of Jetty. +The link:{JDURL}/org/eclipse/jetty/server/session/HashSessionManager.html[`HashSessionManager`] supports this feature. +If you enable persistence, the `HashSessionManager` saves all existing, valid Sessions to disk before shutdown completes. +On restart, Jetty restores the saved Sessions. [[enabling-persistence]] ==== Enabling Persistence -A SessionManager does just what its name suggests–it manages the -lifecycle and state of sessions on behalf of a webapp. Each webapp must -have its own unique SessionManager instance. Enabling persistence is as -simple as configuring the `HashSessionManager` as the SessionManager for -a webapp and telling it where on disk to store the sessions: +A `SessionManager` does just what its name suggests – it manages the lifecycle and state of sessions on behalf of a webapp. +Each webapp must have its own unique `SessionManager` instance. +Enabling persistence is as simple as configuring the `HashSessionManager` as the `SessionManager` for a webapp and telling it where on disk to store the sessions: [source,xml] ---- @@ -57,30 +53,25 @@ a webapp and telling it where on disk to store the sessions: ---- -____ -[TIP] -If you want to persist the sessions from multiple webapps: -1. Configure a separate HashSessionManager for each. -2. Assign to each a different value for 'storeDirectory'. -____ +The above uses an example of a xref:intro-jetty-configuration-contexts[context configuration file]. -The above example uses a configuration file suitable for the -link:{JDURL}/org/eclipse/jetty/deploy/providers/ContextProvider.html[ContextProvider], -thus you might want to check out xref:using-context-provider[]. +[TIP] +==== +If you want to persist the sessions from multiple webapps: + +1. Configure a separate `HashSessionManager` for each. + +2. Assign to each a different value for `storeDirectory`. +==== [[delaying-session-load]] ==== Delaying Session Load -You might need to ensure that the sessions are loaded AFTER the servlet -environment starts up (by default, Jetty eagerly loads sessions as part -of the container startup, but before it initializes the servlet -environment). For example, the Wicket web framework requires the servlet -environment to be available when sessions are activated. +You might need to ensure that the sessions are loaded AFTER the servlet environment starts up (by default, Jetty eagerly loads sessions as part of the container startup, but before it initializes the servlet environment). +For example, the Wicket web framework requires the servlet environment to be available when sessions are activated. -Using `SessionManager.setLazyLoad(true)`, Jetty loads sessions lazily -either when it receives the first request for a session, or the session -scavenger runs for the first time, whichever happens first. Here's how -the configuration looks in XML: +Using `SessionManager.setLazyLoad(true)`, Jetty loads sessions lazily either when it receives the first request for a session, or the session scavenger runs for the first time, whichever happens first. +Here's how the configuration looks in XML: [source,xml] ---- @@ -98,8 +89,7 @@ the configuration looks in XML: [[enabling-persistence-for-jetty-maven-plugin]] ==== Enabling Persistence for the Jetty Maven Plugin -To enable session persistence for the Jetty Maven plugin, set up the -HashSessionManager in the configuration section like so: +To enable session persistence for the Jetty Maven plugin, set up the `HashSessionManager` in the configuration section like so: [source,xml] ---- diff --git a/jetty-documentation/src/main/asciidoc/quick-start/configuring/what-to-configure.adoc b/jetty-documentation/src/main/asciidoc/quick-start/configuring/what-to-configure.adoc index 87e430bcfcb..2c12a63c57d 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/configuring/what-to-configure.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/configuring/what-to-configure.adoc @@ -55,7 +55,7 @@ Services:: ==== Configuring Connectors A Jetty Server Connector is a network end point that accepts connections for one or more protocols which produce requests and/or messages for the Jetty server. -In the standard Jetty server distribution, several provided configuration files add connectors to the server for various protocols and combinations of protocols: `http.ini`, `https.ini` and `jetty-spdy.xml`. +In the standard Jetty server distribution, several provided configuration files add connectors to the server for various protocols and combinations of protocols: `http.ini`, `https.ini` and `jetty-http2.xml`. The configuration needed for connectors is typically: Port:: @@ -67,10 +67,10 @@ Host:: Idle Timeout:: The time in milliseconds that a connection can be idle before the connector takes action to close the connection. HTTP Configuration:: - Connector types that accept HTTP semantics (including HTTP, HTTPS and SPDY) are configured with a HttpConfiguration instance that contains common HTTP configuration that is independent of the specific wire protocol used. - Because these values are often common to multiple connector types, the standard Jetty Server distribution creates a single HttpConfiguration in the `jetty.xml` file which is used via the XML Ref element in the specific connector files. + Connector types that accept HTTP semantics (including HTTP, HTTPS and HTTP2) are configured with a `HttpConfiguration` instance that contains common HTTP configuration that is independent of the specific wire protocol used. + Because these values are often common to multiple connector types, the standard Jetty Server distribution creates a single `HttpConfiguration` in the `jetty.xml` file which is used via the XML Ref element in the specific connector files. SSL Context Factory:: - The TLS connector types (HTTPS and SPDY) configure an SSL Context Factory with the location of the server keystore and truststore for obtaining server certificates. + The TLS connector types (HTTPS and HTTP2) configure an SSL Context Factory with the location of the server keystore and truststore for obtaining server certificates. ____ diff --git a/jetty-http2/http2-alpn-tests/pom.xml b/jetty-http2/http2-alpn-tests/pom.xml index 8a1521e4b40..ac3f7fc780c 100644 --- a/jetty-http2/http2-alpn-tests/pom.xml +++ b/jetty-http2/http2-alpn-tests/pom.xml @@ -14,40 +14,49 @@ ${project.groupId}.alpn.tests - - - - maven-dependency-plugin - - - copy - generate-resources - - copy - + + + jdk8 + + [1.8,1.9) + + + + + maven-dependency-plugin + + + copy + generate-resources + + copy + + + + + org.mortbay.jetty.alpn + alpn-boot + ${alpn.version} + jar + false + ${project.build.directory}/alpn + + + + + + + + maven-surefire-plugin - - - org.mortbay.jetty.alpn - alpn-boot - ${alpn.version} - jar - false - ${project.build.directory}/alpn - - + -Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar + - - - - - maven-surefire-plugin - - -Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar - - - - + + + + + @@ -85,5 +94,5 @@ test - + diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index e5aab8ad053..7197df72668 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -14,40 +14,49 @@ ${project.groupId}.client.http - - - - maven-dependency-plugin - - - copy - generate-resources - - copy - + + + jdk8 + + [1.8,1.9) + + + + + maven-dependency-plugin + + + copy + generate-resources + + copy + + + + + org.mortbay.jetty.alpn + alpn-boot + ${alpn.version} + jar + false + ${project.build.directory}/alpn + + + + + + + + maven-surefire-plugin - - - org.mortbay.jetty.alpn - alpn-boot - ${alpn.version} - jar - false - ${project.build.directory}/alpn - - + -Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar + - - - - - maven-surefire-plugin - - -Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar - - - - + + + + + diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index 37c7f33cac6..2a5cb160a3a 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -32,23 +32,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - artifact-jar - - jar - - - - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java index 64179a6c8b8..5082821a585 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java @@ -29,6 +29,8 @@ import java.nio.channels.ClosedChannelException; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Queue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; import org.eclipse.jetty.util.ArrayQueue; import org.eclipse.jetty.util.BufferUtil; @@ -37,7 +39,6 @@ import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Locker; import org.eclipse.jetty.util.thread.Scheduler; - /* ------------------------------------------------------------ */ /** ByteArrayEndPoint. * @@ -79,6 +80,7 @@ public class ByteArrayEndPoint extends AbstractEndPoint }; private final Locker _locker = new Locker(); + private final Condition _hasOutput = _locker.newCondition(); private final Queue _inQ = new ArrayQueue<>(); private ByteBuffer _out; private boolean _growOutput; @@ -218,6 +220,7 @@ public class ByteArrayEndPoint extends AbstractEndPoint _runFillable.run(); } + /* ------------------------------------------------------------ */ public void addInputAndExecute(ByteBuffer in) { boolean fillable=false; @@ -259,7 +262,10 @@ public class ByteArrayEndPoint extends AbstractEndPoint */ public ByteBuffer getOutput() { - return _out; + try(Locker.Lock lock = _locker.lock()) + { + return _out; + } } /* ------------------------------------------------------------ */ @@ -287,8 +293,36 @@ public class ByteArrayEndPoint extends AbstractEndPoint */ public ByteBuffer takeOutput() { - ByteBuffer b=_out; - _out=BufferUtil.allocate(b.capacity()); + ByteBuffer b; + + try(Locker.Lock lock = _locker.lock()) + { + b=_out; + _out=BufferUtil.allocate(b.capacity()); + } + getWriteFlusher().completeWrite(); + return b; + } + + /* ------------------------------------------------------------ */ + /** Wait for some output + * @param time Time to wait + * @param unit Units for time to wait + * @return The buffer of output + * @throws InterruptedException + */ + public ByteBuffer waitForOutput(long time,TimeUnit unit) throws InterruptedException + { + ByteBuffer b; + + try(Locker.Lock lock = _locker.lock()) + { + if (BufferUtil.isEmpty(_out)) + _hasOutput.await(time,unit); + + b=_out; + _out=BufferUtil.allocate(b.capacity()); + } getWriteFlusher().completeWrite(); return b; } @@ -319,7 +353,10 @@ public class ByteArrayEndPoint extends AbstractEndPoint */ public void setOutput(ByteBuffer out) { - _out = out; + try(Locker.Lock lock = _locker.lock()) + { + _out = out; + } getWriteFlusher().completeWrite(); } @@ -385,41 +422,47 @@ public class ByteArrayEndPoint extends AbstractEndPoint @Override public boolean flush(ByteBuffer... buffers) throws IOException { - if (!isOpen()) - throw new IOException("CLOSED"); - if (isOutputShutdown()) - throw new IOException("OSHUT"); - boolean flushed=true; - boolean idle=true; - - for (ByteBuffer b : buffers) + try(Locker.Lock lock = _locker.lock()) { - if (BufferUtil.hasContent(b)) + if (!isOpen()) + throw new IOException("CLOSED"); + if (isOutputShutdown()) + throw new IOException("OSHUT"); + + boolean idle=true; + + for (ByteBuffer b : buffers) { - if (_growOutput && b.remaining()>BufferUtil.space(_out)) - { - BufferUtil.compact(_out); - if (b.remaining()>BufferUtil.space(_out)) - { - ByteBuffer n = BufferUtil.allocate(_out.capacity()+b.remaining()*2); - BufferUtil.append(n,_out); - _out=n; - } - } - - if (BufferUtil.append(_out,b)>0) - idle=false; - if (BufferUtil.hasContent(b)) { - flushed=false; - break; + if (_growOutput && b.remaining()>BufferUtil.space(_out)) + { + BufferUtil.compact(_out); + if (b.remaining()>BufferUtil.space(_out)) + { + ByteBuffer n = BufferUtil.allocate(_out.capacity()+b.remaining()*2); + BufferUtil.append(n,_out); + _out=n; + } + } + + if (BufferUtil.append(_out,b)>0) + idle=false; + + if (BufferUtil.hasContent(b)) + { + flushed=false; + break; + } } } + if (!idle) + { + notIdle(); + _hasOutput.signalAll(); + } } - if (!idle) - notIdle(); return flushed; } @@ -432,8 +475,9 @@ public class ByteArrayEndPoint extends AbstractEndPoint try(Locker.Lock lock = _locker.lock()) { _inQ.clear(); + _hasOutput.signalAll(); + BufferUtil.clear(_out); } - BufferUtil.clear(_out); super.reset(); } diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/ArrayByteBufferPoolTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/ArrayByteBufferPoolTest.java index 8dff64edc2f..9b5bdc253ca 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/ArrayByteBufferPoolTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/ArrayByteBufferPoolTest.java @@ -25,11 +25,8 @@ import static org.junit.Assert.assertTrue; import java.nio.ByteBuffer; import java.util.Arrays; -import java.util.concurrent.ConcurrentMap; import org.eclipse.jetty.io.ByteBufferPool.Bucket; -import org.hamcrest.Matchers; -import org.junit.Assert; import org.junit.Test; public class ArrayByteBufferPoolTest diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointSslTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointSslTest.java index 06bdd7a5c54..9db347732f7 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointSslTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointSslTest.java @@ -226,6 +226,7 @@ public class SelectChannelEndPointSslTest extends SelectChannelEndPointTest filled=client.read(sslIn); Assert.assertEquals(-1,filled); + Thread.sleep(100); // TODO This should not be needed Assert.assertFalse(server.isOpen()); } diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 9923d8def5b..2757507f02a 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -23,7 +23,6 @@ org.apache.maven.plugins maven-plugin-plugin - 3.4 exec-plugin-doc @@ -86,21 +85,20 @@ 1.8.4 - org.eclipse.jetty - apache-jstl - ${project.version} - - + org.eclipse.jetty + apache-jstl + ${project.version} + + - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.1 - - false - - + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + false + + project-team @@ -112,7 +110,7 @@ - - + + diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 9d6d2a3ba73..93041dd2f45 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -25,7 +25,6 @@ org.apache.maven.plugins maven-plugin-plugin - ${pluginToolsVersion} exec-plugin-doc @@ -143,15 +142,14 @@ - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.1 - - false - - + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + false + + project-team @@ -163,7 +161,7 @@ - - + + diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index d6307719dc5..e58873fefd4 100644 --- a/jetty-osgi/jetty-osgi-alpn/pom.xml +++ b/jetty-osgi/jetty-osgi-alpn/pom.xml @@ -16,7 +16,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.7 parse-version diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 578c2ad42e9..fed4cedb270 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -46,29 +46,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - artifact-jar - - jar - - - - test-jar - - test-jar - - - - - - target/classes/META-INF/MANIFEST.MF - - - org.apache.felix maven-bundle-plugin diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 6c3bf6185a8..4a0019d4480 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -3,7 +3,6 @@ org.eclipse.jetty.osgi jetty-osgi-project 9.4.0-SNAPSHOT - ../pom.xml 4.0.0 jetty-osgi-boot-warurl @@ -19,36 +18,13 @@ jetty-util - org.eclipse.osgi - org.eclipse.osgi + org.eclipse.osgi + org.eclipse.osgi - - org.apache.maven.plugins - maven-jar-plugin - - - artifact-jar - - jar - - - - test-jar - - test-jar - - - - - - target/classes/META-INF/MANIFEST.MF - - - org.apache.felix maven-bundle-plugin diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index d2bb7fd340e..e3c1d125308 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -30,8 +30,8 @@ jetty-jmx - org.eclipse.osgi - org.eclipse.osgi + org.eclipse.osgi + org.eclipse.osgi org.eclipse.osgi @@ -62,29 +62,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - artifact-jar - - jar - - - - test-jar - - test-jar - - - - - - target/classes/META-INF/MANIFEST.MF - - - org.apache.felix maven-bundle-plugin diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index ad95aa1592d..41bb8e078b5 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -56,29 +56,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - artifact-jar - - jar - - - - test-jar - - test-jar - - - - - - target/classes/META-INF/MANIFEST.MF - - - org.apache.felix maven-bundle-plugin diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index e72e88d0b74..0e90d452392 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -59,7 +59,6 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.8 prevent/overwriting/by/pointing/to/nonexisting/MANIFEST.MF true diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 561adbaf7a3..2d9c2799980 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -19,78 +19,55 @@ ${project.version} - org.eclipse.osgi - org.eclipse.osgi - provided + org.eclipse.osgi + org.eclipse.osgi + provided - org.eclipse.osgi - org.eclipse.osgi.services - provided + org.eclipse.osgi + org.eclipse.osgi.services + provided - org.eclipse.jetty.toolchain - jetty-schemas + org.eclipse.jetty.toolchain + jetty-schemas - - - - src/main/resources - - - src/main/context - - + + + + src/main/resources + + + src/main/context + + - - - org.apache.maven.plugins - maven-deploy-plugin - - - true - - - - org.apache.maven.plugins - maven-jar-plugin - - - artifact-jar - - jar - - - - test-jar - - test-jar - - - - - - target/classes/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.eclipse.jetty.osgi.testcontext;singleton:=true - Jetty OSGi Test Context - com.acme.osgi.Activator - J2SE-1.5 - - <_nouses>true - + + + org.apache.maven.plugins + maven-deploy-plugin + + + true + + + + org.apache.felix + maven-bundle-plugin + true + + + org.eclipse.jetty.osgi.testcontext;singleton:=true + Jetty OSGi Test Context + com.acme.osgi.Activator + J2SE-1.5 + + <_nouses>true + javax.servlet;version="[3.1,3.2)", javax.servlet.resources;version="[3.1,3.2)", org.osgi.framework, @@ -100,17 +77,17 @@ org.osgi.service.url;version="1.0.0", org.osgi.util.tracker;version="1.3.0", org.slf4j;resolution:=optional, - org.slf4j.spi;resolution:=optional, + org.slf4j.spi;resolution:=optional, org.slf4j.helpers;resolution:=optional, org.xml.sax, org.xml.sax.helpers, * - - org.eclipse.jetty.*;version="[9.1,10.0)" - - - - - - + + org.eclipse.jetty.*;version="[9.1,10.0)" + + + + + + diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index eeacbb70a59..2af5c55fca1 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml @@ -3,7 +3,6 @@ org.eclipse.jetty.osgi jetty-osgi-project 9.4.0-SNAPSHOT - ../pom.xml 4.0.0 test-jetty-osgi-webapp @@ -19,70 +18,41 @@ jetty-webapp - org.eclipse.osgi - org.eclipse.osgi - provided + org.eclipse.osgi + org.eclipse.osgi + provided - org.eclipse.osgi - org.eclipse.osgi.services - provided + org.eclipse.osgi + org.eclipse.osgi.services + provided - - - - src/main/resources - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - - true - - - - org.apache.maven.plugins - maven-jar-plugin - - - artifact-jar - - jar - - - - test-jar - - test-jar - - - - - - target/classes/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.eclipse.jetty.osgi.testapp;singleton:=true - Jetty OSGi Test WebApp - com.acme.osgi.Activator - J2SE-1.5 - - + + + + org.apache.maven.plugins + maven-deploy-plugin + + + true + + + + org.apache.felix + maven-bundle-plugin + true + + + org.eclipse.jetty.osgi.testapp;singleton:=true + Jetty OSGi Test WebApp + com.acme.osgi.Activator + J2SE-1.5 + + org.osgi.framework, org.osgi.service.cm;version="1.2.0", org.osgi.service.packageadmin, @@ -90,17 +60,17 @@ org.osgi.service.url;version="1.0.0", org.osgi.util.tracker;version="1.3.0", org.slf4j;resolution:=optional, - org.slf4j.spi;resolution:=optional, + org.slf4j.spi;resolution:=optional, org.slf4j.helpers;resolution:=optional, org.xml.sax, org.xml.sax.helpers, * - - org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))" - - - - - - + + org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))" + + + + + + diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 4b574b01a84..2007583b5f4 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -3,7 +3,6 @@ org.eclipse.jetty.osgi jetty-osgi-project 9.4.0-SNAPSHOT - ../pom.xml 4.0.0 test-jetty-osgi @@ -20,7 +19,6 @@ - org.ops4j.pax.exam pax-exam @@ -33,7 +31,6 @@ ${exam.version} test - @@ -42,7 +39,7 @@ ${exam.version} test - + org.ops4j.pax.exam pax-exam-junit4 @@ -95,7 +92,6 @@ test - org.eclipse.jetty.osgi @@ -255,7 +251,7 @@ org.eclipse.jetty jetty-util - ${project.version} + ${project.version} runtime @@ -334,7 +330,6 @@ runtime - org.eclipse.jetty jetty-plus @@ -366,7 +361,6 @@ test - org.eclipse.jetty.tests test-mock-resources @@ -390,7 +384,14 @@ jetty-test-helper test + + org.slf4j + slf4j-log4j12 + ${slf4j-version} + test + + @@ -401,19 +402,9 @@ -Dmortbay-alpn-boot=${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.7 - 1.7 - - org.apache.servicemix.tooling depends-maven-plugin - 1.2 generate-depends-file @@ -454,4 +445,5 @@ + diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java index ee9904c5e18..5777e3bfac7 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java @@ -22,6 +22,7 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import javax.inject.Inject; import org.eclipse.jetty.client.HttpClient; @@ -49,11 +50,11 @@ import static org.ops4j.pax.exam.CoreOptions.systemProperty; /** * TestJettyOSGiBootWebAppAsService - * + * * Tests deployment of a WebAppContext as an osgi Service. - * + * * Tests the ServiceWebAppProvider. - * + * * Pax-Exam to make sure the jetty-osgi-boot can be started along with the * httpservice web-bundle. Then make sure we can deploy an OSGi service on the * top of this. @@ -76,7 +77,7 @@ public class TestJettyOSGiBootWebAppAsService options.add(CoreOptions.systemPackages("com.sun.org.apache.xalan.internal.res","com.sun.org.apache.xml.internal.utils", "com.sun.org.apache.xml.internal.utils", "com.sun.org.apache.xpath.internal", "com.sun.org.apache.xpath.internal.jaxp", "com.sun.org.apache.xpath.internal.objects")); - + options.addAll(TestJettyOSGiBootCore.coreJettyDependencies()); options.addAll(Arrays.asList(options(systemProperty("pax.exam.logging").value("none")))); options.addAll(Arrays.asList(options(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL)))); @@ -85,14 +86,13 @@ public class TestJettyOSGiBootWebAppAsService options.addAll(jspDependencies()); return options.toArray(new Option[options.size()]); } - public static List