From cac070fdb134df192252e99653d99d7c3fb91b87 Mon Sep 17 00:00:00 2001 From: gregw Date: Mon, 30 Nov 2020 15:22:22 +0100 Subject: [PATCH] Fix #5739 Remove distribution from doco Mostly mechanical fixes --- README.md | 2 +- .../eclipse/jetty/demos/OneWebAppTest.java | 2 +- .../jetty/demos/OneWebAppWithJspTest.java | 2 +- .../demos/ServerWithAnnotationsTest.java | 2 +- .../jetty/demos/ServerWithJNDITest.java | 2 +- jetty-ant/src/test/config/build.xml | 2 +- .../connectors/configuring-connectors.adoc | 4 +- .../contributing/release-testing.adoc | 6 +- .../debugging/debugging-with-eclipse.adoc | 2 +- .../debugging/debugging-with-intellij.adoc | 2 +- .../debugging/enable-remote-debugging.adoc | 6 +- .../asciidoc/old_docs/frameworks/metro.adoc | 2 +- .../asciidoc/old_docs/frameworks/osgi.adoc | 2 +- .../getting-started/jetty-installing.adoc | 2 +- .../logging/configuring-logging-modules.adoc | 2 +- .../asciidoc/old_docs/logging/dump-tool.adoc | 286 +++--- .../logging/example-apache-log4j.adoc | 2 +- .../example-java-util-logging-native.adoc | 2 +- .../logging/example-java-util-logging.adoc | 2 +- .../example-logback-centralized-logging.adoc | 2 +- .../old_docs/logging/example-logback.adoc | 2 +- .../example-slf4j-multiple-loggers.adoc | 2 +- .../old_docs/platforms/cloudfoundry.adoc | 4 +- .../security/jetty-home-and-jetty-base.adoc | 12 +- .../startup/screen-empty-base-listconfig.adoc | 10 +- .../screen-http-webapp-deploy-listconfig.adoc | 10 +- .../startup/startup-base-vs-home.adoc | 40 +- .../old_docs/startup/startup-overview.adoc | 34 +- .../startup/startup-unix-service.adoc | 48 +- .../startup/startup-windows-service.adoc | 2 +- .../operations-guide/begin/install.adoc | 4 +- .../operations-guide/start/start-jar.adoc | 2 +- .../gcloud/session/GCloudSessionTester.java | 67 -- .../src/main/assembly/site-component.xml | 2 +- .../test-jetty-osgi-webapp-resources/pom.xml | 2 +- .../MavenLocalRepoFileInitializerTest.java | 6 +- .../start/util/CorrectMavenCentralRefs.java | 2 +- .../start/util/RebuildTestResources.java | 4 +- jetty-websocket/README.TXT | 40 - .../jetty/test/support/JettyDistro.java | 824 ------------------ 40 files changed, 260 insertions(+), 1191 deletions(-) delete mode 100644 jetty-gcloud/jetty-gcloud-session-manager/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTester.java delete mode 100644 jetty-websocket/README.TXT delete mode 100644 tests/test-integration/src/test/java/org/eclipse/jetty/test/support/JettyDistro.java diff --git a/README.md b/README.md index 969435deb358..e25f219ae2f9 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ To build, use: mvn clean install ``` -The Jetty distribution will be built in `jetty-distribution/target/distribution`. +Eclipse Jetty will be built in `jetty-home/target/jetty-home`. The first build may take a longer than expected as Maven downloads all the dependencies. diff --git a/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppTest.java index 174c43b3aa04..c095b996d5d3 100644 --- a/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppTest.java @@ -42,7 +42,7 @@ public class OneWebAppTest extends AbstractEmbeddedTest @BeforeEach public void startServer() throws Exception { - assumeTrue(JettyHome.JETTY_HOME != null, "jetty-distribution not found"); + assumeTrue(JettyHome.JETTY_HOME != null, "jetty-home not found"); server = OneWebApp.createServer(0); server.start(); diff --git a/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppWithJspTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppWithJspTest.java index 1e5735a0bc61..8e83fea85a27 100644 --- a/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppWithJspTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppWithJspTest.java @@ -42,7 +42,7 @@ public class OneWebAppWithJspTest extends AbstractEmbeddedTest @BeforeEach public void startServer() throws Exception { - assumeTrue(JettyHome.JETTY_HOME != null, "jetty-distribution not found"); + assumeTrue(JettyHome.JETTY_HOME != null, "jetty-home not found"); server = OneWebAppWithJsp.createServer(0); server.start(); diff --git a/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithAnnotationsTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithAnnotationsTest.java index c0b2bf39a44f..8a1364ae686f 100644 --- a/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithAnnotationsTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithAnnotationsTest.java @@ -41,7 +41,7 @@ public class ServerWithAnnotationsTest extends AbstractEmbeddedTest @BeforeEach public void startServer() throws Exception { - assumeTrue(JettyHome.JETTY_HOME != null, "jetty-distribution not found"); + assumeTrue(JettyHome.JETTY_HOME != null, "jetty-home not found"); server = ServerWithAnnotations.createServer(0); server.start(); diff --git a/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithJNDITest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithJNDITest.java index e806ad9da7b6..a2697ef5d4c0 100644 --- a/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithJNDITest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithJNDITest.java @@ -42,7 +42,7 @@ public class ServerWithJNDITest extends AbstractEmbeddedTest @BeforeEach public void startServer() throws Exception { - assumeTrue(JettyHome.JETTY_HOME != null, "jetty-distribution not found"); + assumeTrue(JettyHome.JETTY_HOME != null, "jetty-home not found"); server = ServerWithJNDI.createServer(0); server.start(); diff --git a/jetty-ant/src/test/config/build.xml b/jetty-ant/src/test/config/build.xml index 5e833b797a1f..a80ae4241933 100644 --- a/jetty-ant/src/test/config/build.xml +++ b/jetty-ant/src/test/config/build.xml @@ -1,7 +1,7 @@ - + diff --git a/jetty-documentation/src/main/asciidoc/old_docs/connectors/configuring-connectors.adoc b/jetty-documentation/src/main/asciidoc/old_docs/connectors/configuring-connectors.adoc index d408044d7f14..13c8423227ea 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/connectors/configuring-connectors.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/connectors/configuring-connectors.adoc @@ -216,8 +216,8 @@ At this point the server has been configured with connectors for both HTTP and H 2017-08-31 10:19:58.855:INFO::main: Logging initialized @372ms to org.eclipse.jetty.util.log.StdErrLog 2017-08-31 10:19:59.076:INFO:oejs.Server:main: jetty-{VERSION} 2017-08-31 10:19:59.125:INFO:oejs.AbstractConnector:main: Started ServerConnector@421e98e0{HTTP/1.1,[http/1.1]}{0.0.0.0:8080} -2017-08-31 10:19:59.150:INFO:oejus.SslContextFactory:main: x509=X509@5315b42e(jetty,h=[jetty.eclipse.org],w=[]) for SslContextFactory@2ef9b8bc(file:///Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase/etc/keystore,file:///Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase/etc/keystore) -2017-08-31 10:19:59.151:INFO:oejus.SslContextFactory:main: x509=X509@5d624da6(mykey,h=[],w=[]) for SslContextFactory@2ef9b8bc(file:///Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase/etc/keystore,file:///Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase/etc/keystore) +2017-08-31 10:19:59.150:INFO:oejus.SslContextFactory:main: x509=X509@5315b42e(jetty,h=[jetty.eclipse.org],w=[]) for SslContextFactory@2ef9b8bc(file:///var/my-jetty-base/etc/keystore,file:///var/my-jetty-base/etc/keystore) +2017-08-31 10:19:59.151:INFO:oejus.SslContextFactory:main: x509=X509@5d624da6(mykey,h=[],w=[]) for SslContextFactory@2ef9b8bc(file:///var/my-jetty-base/etc/keystore,file:///var/my-jetty-base/etc/keystore) 2017-08-31 10:19:59.273:INFO:oejs.AbstractConnector:main: Started ServerConnector@2b98378d{SSL,[ssl, http/1.1]}{0.0.0.0:8443} 2017-08-31 10:19:59.274:INFO:oejs.Server:main: Started @791ms .... diff --git a/jetty-documentation/src/main/asciidoc/old_docs/contributing/release-testing.adoc b/jetty-documentation/src/main/asciidoc/old_docs/contributing/release-testing.adoc index 2b26631ff76e..36059ecab7b3 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/contributing/release-testing.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/contributing/release-testing.adoc @@ -26,7 +26,7 @@ To test a Jetty release, complete the following steps for each release you want [source, screen, subs="{sub-order}"] .... - wget https://oss.sonatype.org/content/repositories/jetty-[reponumber]/org/eclipse/jetty/jetty-distribution/[jetty-version]/jetty-distribution-9.[jetty-minor-version].tar.gz + wget https://oss.sonatype.org/content/repositories/jetty-[reponumber]/org/eclipse/jetty/jetty-home/[jetty-version]/jetty-home-9.[jetty-minor-version].tar.gz .... @@ -200,12 +200,12 @@ Thread Pool - Concurrent Threads max = 239 | Queue Size max = 1002 | Queue Laten .... -7. Deploy `cometd.war` to the `webapps` directory of the jetty-distribution tested above. +7. Deploy `cometd.war` to the `webapps` directory of the jetty-home tested above. + [source, screen, subs="{sub-order}"] .... - cp cometd-demo/target/cometd-demo-[version].war [pathToJetty]/jetty-distribution-[jetty-version]/webapps/ + cp cometd-demo/target/cometd-demo-[version].war [pathToJetty]/jetty-home-[jetty-version]/webapps/ .... diff --git a/jetty-documentation/src/main/asciidoc/old_docs/debugging/debugging-with-eclipse.adoc b/jetty-documentation/src/main/asciidoc/old_docs/debugging/debugging-with-eclipse.adoc index 48a7621b3715..1d1f8c83b0be 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/debugging/debugging-with-eclipse.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/debugging/debugging-with-eclipse.adoc @@ -36,7 +36,7 @@ image:debug-eclipse-1.png[image,width=576] + image:debug-eclipse-2.png[image,width=576] -3. Accessing that servlet within your browser, pointed at your remote debug configurated jetty-distribution, should transition your Eclipse instance to the standard Debug view. +3. Accessing that servlet within your browser, pointed at your remote debug configurated jetty-home, should transition your Eclipse instance to the standard Debug view. + image:debug-eclipse-3.png[image,width=576] diff --git a/jetty-documentation/src/main/asciidoc/old_docs/debugging/debugging-with-intellij.adoc b/jetty-documentation/src/main/asciidoc/old_docs/debugging/debugging-with-intellij.adoc index ca5833381844..08a5c65c29b1 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/debugging/debugging-with-intellij.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/debugging/debugging-with-intellij.adoc @@ -39,7 +39,7 @@ The red dot and red background on the line mark the breakpoint. + image:intellij_set_breakpoint.png[image,width=800] -3. Accessing that servlet within your browser, pointed at your remote debug configured jetty-distribution, should transition your IntelliJ instance to the standard debugger view. +3. Accessing that servlet within your browser, pointed at your remote debug configured jetty-home, should transition your IntelliJ instance to the standard debugger view. + image:intellij_debug_view.png[image,width=800] diff --git a/jetty-documentation/src/main/asciidoc/old_docs/debugging/enable-remote-debugging.adoc b/jetty-documentation/src/main/asciidoc/old_docs/debugging/enable-remote-debugging.adoc index 85cb4ec90103..8a9a77eed243 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/debugging/enable-remote-debugging.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/debugging/enable-remote-debugging.adoc @@ -28,7 +28,7 @@ This is easily accomplished. ____ [NOTE] -This example assumes you are deploying your web application into the jetty-distribution. +This example assumes you are deploying your web application into a jetty-base. ____ ===== Starting Jetty @@ -47,7 +47,7 @@ $ java -Xdebug -agentlib:jdwp=transport=dt_socket,address=9999,server=y,suspend= .... Via `start.ini`:: - This approach is best used if you want to debug a particular jetty-distribution and not have to remember the commandline incantations. + This approach is best used if you want to debug a particular jetty-base and not have to remember the commandline incantations. + 1. Edit the `start.ini` and uncomment the --exec line, this is required if you are adding jvm options to the start.ini file as jetty-start must generate the classpath required and fork a new jvm. 2. Add the parameters mentioned above in the Command Line option so your start.ini looks like this: @@ -84,7 +84,7 @@ Via `start.ini`:: + Uncomment any other jvm environmental options you so desire for your debugging session. -3. Regardless of the option chosen, you should see the following lines at the top of your jetty-distribution startup. +3. Regardless of the option chosen, you should see the following lines at the top of your jetty startup. + [source, plain, subs="{sub-order}"] ---- diff --git a/jetty-documentation/src/main/asciidoc/old_docs/frameworks/metro.adoc b/jetty-documentation/src/main/asciidoc/old_docs/frameworks/metro.adoc index 6ddf1ae3f694..bbad020491e6 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/frameworks/metro.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/frameworks/metro.adoc @@ -48,7 +48,7 @@ Here's an example of the log output from Jetty when one of the sample Metro wars [2093] java -jar start.jar 2013-07-26 15:47:53.480:INFO:oejs.Server:main: jetty-9.0.4.v20130625 -2013-07-26 15:47:53.549:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:/home/user/jetty-distribution-{VERSION}/webapps/] at interval 1 +2013-07-26 15:47:53.549:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:/home/user/jetty-home-{VERSION}/webapps/] at interval 1 Jul 26, 2013 3:47:53 PM com.sun.xml.ws.transport.http.servlet.WSServletContextListener contextInitialized INFO: WSSERVLET12: JAX-WS context listener initializing Jul 26, 2013 3:47:56 PM com.sun.xml.ws.server.MonitorBase createRoot diff --git a/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc b/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc index 7446c0ff68ae..c5bf395ae625 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc @@ -147,7 +147,7 @@ etc/jetty.xml,etc/jetty-http.xml,etc/jetty-deployer.xml Note that the paths can either be relative or absolute, or a mixture. If the path is relative, it is resolved against either *jetty.home* or **jetty.home.bundle**, whichever was specified. You can use this ability to mix and match jetty configuration files to add functionality, such as adding in a https connector. -Here's an example of adding a HTTPS connector, using the relevant files from the jetty-distribution: +Here's an example of adding a HTTPS connector, using the relevant files from the jetty-home: + .... etc/jetty.xml, etc/jetty-http.xml, /opt/jetty/etc/jetty-ssl.xml, /opt/jetty/etc/jetty-https.xml, etc/jetty-deployer.xml diff --git a/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-installing.adoc b/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-installing.adoc index 77842e5e04be..90b47dbc585f 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-installing.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-installing.adoc @@ -28,7 +28,7 @@ https://www.eclipse.org/jetty/download.html ____ It is available in both zip and gzip formats; download the one most appropriate for your system. -When you download and unpack the binary, it is extracted into a directory called `jetty-distribution-VERSION.` +When you download and unpack the binary, it is extracted into a directory called `jetty-home-VERSION.` Put this directory in a convenient location. The rest of the instructions in this documentation refer to this location as either `$JETTY_HOME` or as `$(jetty.home).` diff --git a/jetty-documentation/src/main/asciidoc/old_docs/logging/configuring-logging-modules.adoc b/jetty-documentation/src/main/asciidoc/old_docs/logging/configuring-logging-modules.adoc index 52f39209fff8..7abd35df9161 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/logging/configuring-logging-modules.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/logging/configuring-logging-modules.adoc @@ -490,5 +490,5 @@ After enabling `console-capture`, the output is as follows, which displays the l .... [my-base]$ java -jar /path/to/jetty-home/start.jar 151 [main] INFO org.eclipse.jetty.util.log - Logging initialized @238ms to org.eclipse.jetty.util.log.Slf4jLog -196 [main] INFO org.eclipse.jetty.util.log - Console stderr/stdout captured to /installs/jetty-distribution/mybase/logs/2016_10_21.jetty.log +196 [main] INFO org.eclipse.jetty.util.log - Console stderr/stdout captured to /installs/my-jetty-base/logs/2016_10_21.jetty.log .... diff --git a/jetty-documentation/src/main/asciidoc/old_docs/logging/dump-tool.adoc b/jetty-documentation/src/main/asciidoc/old_docs/logging/dump-tool.adoc index 3af7274f28a5..c6c0a4583265 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/logging/dump-tool.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/logging/dump-tool.adoc @@ -65,10 +65,10 @@ Dumps may be obtained by calling these methods either in code or via JMX (see xr The Server MBean has a `dump()` method, which dumps everything, plus a `dumpStdErr()` operation that dumps to StdErr rather than replying to JConsole. -[[examing-jetty-distro-dump]] -==== Examining a Jetty Distribution Dump +[[examing-jetty-dump]] +==== Examining a Jetty Dump -This is a dump of the stock jetty-distribution with extra threadpool information: +This is a dump of the stock jetty-home with demo modules enabled and extra threadpool information: .... org.eclipse.jetty.server.Server@76f08fe1 - STARTING @@ -225,7 +225,7 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING | | | | | | += jsp@19c47==org.apache.jasper.servlet.JspServlet,0,true - STARTED | | | | | | | +- logVerbosityLevel=DEBUG | | | | | | | +- fork=false - | | | | | | | +- com.sun.appserv.jsp.classpath=/home/user/jetty-distribution-{VERSION}/lib/jetty-xml-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-api-4.0.2.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-http-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-continuation-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-server-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-security-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-webapp-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-deploy-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-client-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-jmx-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar:/home/user/jetty-distribution-{VERSION}/resources:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-util-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-io-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/start.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/dnsns.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/localedata.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunec.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunjce_provider.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunpkcs11.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/zipfs.jar:/opt/local/lib/libsvnjavahl-1.0.dylib:/System/Library/Java/Extensions/AppleScriptEngine.jar:/System/Library/Java/Extensions/dns_sd.jar:/System/Library/Java/Extensions/j3daudio.jar:/System/Library/Java/Extensions/j3dcore.jar:/System/Library/Java/Extensions/j3dutils.jar:/System/Library/Java/Extensions/jai_codec.jar:/System/Library/Java/Extensions/jai_core.jar:/System/Library/Java/Extensions/libAppleScriptEngine.jnilib:/System/Library/Java/Extensions/libJ3D.jnilib:/System/Library/Java/Extensions/libJ3DAudio.jnilib:/System/Library/Java/Extensions/libJ3DUtils.jnilib:/System/Library/Java/Extensions/libmlib_jai.jnilib:/System/Library/Java/Extensions/libQTJNative.jnilib:/System/Library/Java/Extensions/mlibwrapper_jai.jar:/System/Library/Java/Extensions/MRJToolkit.jar:/System/Library/Java/Extensions/QTJava.zip:/System/Library/Java/Extensions/vecmath.jar:/usr/lib/java/libjdns_sd.jnilib + | | | | | | | +- com.sun.appserv.jsp.classpath=/home/user/jetty-home-{VERSION}/lib/jetty-xml-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-api-4.0.2.jar:/home/user/jetty-home-{VERSION}/lib/jetty-http-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-continuation-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-server-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-security-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-webapp-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-deploy-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-client-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-jmx-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar:/home/user/jetty-home-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar:/home/user/jetty-home-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar:/home/user/jetty-home-{VERSION}/resources:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/jetty-util-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-io-{VERSION}.jar:/home/user/jetty-home-{VERSION}/start.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/dnsns.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/localedata.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunec.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunjce_provider.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunpkcs11.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/zipfs.jar:/opt/local/lib/libsvnjavahl-1.0.dylib:/System/Library/Java/Extensions/AppleScriptEngine.jar:/System/Library/Java/Extensions/dns_sd.jar:/System/Library/Java/Extensions/j3daudio.jar:/System/Library/Java/Extensions/j3dcore.jar:/System/Library/Java/Extensions/j3dutils.jar:/System/Library/Java/Extensions/jai_codec.jar:/System/Library/Java/Extensions/jai_core.jar:/System/Library/Java/Extensions/libAppleScriptEngine.jnilib:/System/Library/Java/Extensions/libJ3D.jnilib:/System/Library/Java/Extensions/libJ3DAudio.jnilib:/System/Library/Java/Extensions/libJ3DUtils.jnilib:/System/Library/Java/Extensions/libmlib_jai.jnilib:/System/Library/Java/Extensions/libQTJNative.jnilib:/System/Library/Java/Extensions/mlibwrapper_jai.jar:/System/Library/Java/Extensions/MRJToolkit.jar:/System/Library/Java/Extensions/QTJava.zip:/System/Library/Java/Extensions/vecmath.jar:/usr/lib/java/libjdns_sd.jnilib | | | | | | | +- scratchdir=/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/jsp | | | | | | | +- xpoweredBy=false | | | | | | +- [*.jsp, *.jspf, *.jspx, *.xsp, *.JSP, *.JSPF, *.JSPX, *.XSP]=>jsp @@ -258,33 +258,33 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING | | | | +- file:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/webapp/WEB-INF/lib/jetty-util-{VERSION}.jar | | | | +- file:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/webapp/WEB-INF/lib/jetty-util-ajax-{VERSION}.jar | | | | +- startJarLoader@7194b34a - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-xml-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-api-4.0.2.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-http-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-continuation-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-server-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-security-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-webapp-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-deploy-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-client-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-jmx-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/resources/ - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-util-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-io-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-xml-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-api-4.0.2.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-http-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-continuation-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-server-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-security-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-webapp-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-deploy-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-client-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-jmx-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/resources/ + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-util-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-io-{VERSION}.jar | | | | +- sun.misc.Launcher$AppClassLoader@19d1b44b - | | | | +- file:/home/user/jetty-distribution-{VERSION}/start.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/start.jar | | | | +- sun.misc.Launcher$ExtClassLoader@1693b52b | | | +> javax.servlet.context.tempdir=/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any- | | | +> org.apache.catalina.jsp_classpath=/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/webapp/WEB-INF/classes:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/webapp/WEB-INF/lib/example-async-rest-jar-9.0.2.v20130417.jar:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/webapp/WEB-INF/lib/jetty-client-{VERSION}.jar:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/webapp/WEB-INF/lib/jetty-http-{VERSION}.jar:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/webapp/WEB-INF/lib/jetty-io-{VERSION}.jar:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/webapp/WEB-INF/lib/jetty-util-{VERSION}.jar:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/webapp/WEB-INF/lib/jetty-util-ajax-{VERSION}.jar @@ -298,7 +298,7 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING | | | | | | | +> No ClassLoader | | | +> org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern=.*/jetty-servlet-api-[^/]*\.jar$ - | | += o.e.j.w.WebAppContext@6f01ba6f{/,file:/home/user/jetty-distribution-{VERSION}/webapps/ROOT/,AVAILABLE}{/ROOT} - STARTED + | | += o.e.j.w.WebAppContext@6f01ba6f{/,file:/home/user/jetty-home-{VERSION}/webapps/ROOT/,AVAILABLE}{/ROOT} - STARTED | | | += org.eclipse.jetty.server.session.SessionHandler@5a770658 - STARTED | | | | += org.eclipse.jetty.server.session.HashSessionManager@746a95ae - STARTED | | | | += org.eclipse.jetty.security.ConstraintSecurityHandler@1890e38 - STARTED @@ -320,7 +320,7 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING | | | | | | += jsp@19c47==org.apache.jasper.servlet.JspServlet,0,true - STARTED | | | | | | | +- logVerbosityLevel=DEBUG | | | | | | | +- fork=false - | | | | | | | +- com.sun.appserv.jsp.classpath=/home/user/jetty-distribution-{VERSION}/lib/jetty-xml-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-api-4.0.2.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-http-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-continuation-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-server-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-security-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-webapp-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-deploy-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-client-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-jmx-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar:/home/user/jetty-distribution-{VERSION}/resources:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-util-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-io-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/start.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/dnsns.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/localedata.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunec.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunjce_provider.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunpkcs11.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/zipfs.jar:/opt/local/lib/libsvnjavahl-1.0.dylib:/System/Library/Java/Extensions/AppleScriptEngine.jar:/System/Library/Java/Extensions/dns_sd.jar:/System/Library/Java/Extensions/j3daudio.jar:/System/Library/Java/Extensions/j3dcore.jar:/System/Library/Java/Extensions/j3dutils.jar:/System/Library/Java/Extensions/jai_codec.jar:/System/Library/Java/Extensions/jai_core.jar:/System/Library/Java/Extensions/libAppleScriptEngine.jnilib:/System/Library/Java/Extensions/libJ3D.jnilib:/System/Library/Java/Extensions/libJ3DAudio.jnilib:/System/Library/Java/Extensions/libJ3DUtils.jnilib:/System/Library/Java/Extensions/libmlib_jai.jnilib:/System/Library/Java/Extensions/libQTJNative.jnilib:/System/Library/Java/Extensions/mlibwrapper_jai.jar:/System/Library/Java/Extensions/MRJToolkit.jar:/System/Library/Java/Extensions/QTJava.zip:/System/Library/Java/Extensions/vecmath.jar:/usr/lib/java/libjdns_sd.jnilib + | | | | | | | +- com.sun.appserv.jsp.classpath=/home/user/jetty-home-{VERSION}/lib/jetty-xml-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-api-4.0.2.jar:/home/user/jetty-home-{VERSION}/lib/jetty-http-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-continuation-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-server-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-security-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-webapp-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-deploy-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-client-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-jmx-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar:/home/user/jetty-home-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar:/home/user/jetty-home-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar:/home/user/jetty-home-{VERSION}/resources:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/jetty-util-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-io-{VERSION}.jar:/home/user/jetty-home-{VERSION}/start.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/dnsns.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/localedata.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunec.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunjce_provider.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunpkcs11.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/zipfs.jar:/opt/local/lib/libsvnjavahl-1.0.dylib:/System/Library/Java/Extensions/AppleScriptEngine.jar:/System/Library/Java/Extensions/dns_sd.jar:/System/Library/Java/Extensions/j3daudio.jar:/System/Library/Java/Extensions/j3dcore.jar:/System/Library/Java/Extensions/j3dutils.jar:/System/Library/Java/Extensions/jai_codec.jar:/System/Library/Java/Extensions/jai_core.jar:/System/Library/Java/Extensions/libAppleScriptEngine.jnilib:/System/Library/Java/Extensions/libJ3D.jnilib:/System/Library/Java/Extensions/libJ3DAudio.jnilib:/System/Library/Java/Extensions/libJ3DUtils.jnilib:/System/Library/Java/Extensions/libmlib_jai.jnilib:/System/Library/Java/Extensions/libQTJNative.jnilib:/System/Library/Java/Extensions/mlibwrapper_jai.jar:/System/Library/Java/Extensions/MRJToolkit.jar:/System/Library/Java/Extensions/QTJava.zip:/System/Library/Java/Extensions/vecmath.jar:/usr/lib/java/libjdns_sd.jnilib | | | | | | | +- scratchdir=/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-ROOT-_-any-/jsp | | | | | | | +- xpoweredBy=false | | | | | | +- [*.jsp, *.jspf, *.jspx, *.xsp, *.JSP, *.JSPF, *.JSPX, *.XSP]=>jsp @@ -342,39 +342,39 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING | | | | | | | +> WebAppClassLoader=ROOT@7af33249 | | | | +- startJarLoader@7194b34a - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-xml-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-api-4.0.2.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-http-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-continuation-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-server-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-security-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-webapp-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-deploy-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-client-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-jmx-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/resources/ - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-util-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-io-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-xml-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-api-4.0.2.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-http-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-continuation-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-server-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-security-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-webapp-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-deploy-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-client-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-jmx-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/resources/ + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-util-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-io-{VERSION}.jar | | | | +- sun.misc.Launcher$AppClassLoader@19d1b44b - | | | | +- file:/home/user/jetty-distribution-{VERSION}/start.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/start.jar | | | | +- sun.misc.Launcher$ExtClassLoader@1693b52b | | | +> javax.servlet.context.tempdir=/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-ROOT-_-any- | | | +> org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern=.*/jetty-servlet-api-[^/]*\.jar$ | | | +> com.sun.jsp.taglibraryCache={} | | | +> com.sun.jsp.tagFileJarUrlsCache={} - | | += o.e.j.s.h.ContextHandler@7b2dffdf{/javadoc,file:/home/user/jetty-distribution-{VERSION}/javadoc,AVAILABLE} - STARTED + | | += o.e.j.s.h.ContextHandler@7b2dffdf{/javadoc,file:/home/user/jetty-home-{VERSION}/javadoc,AVAILABLE} - STARTED | | | += org.eclipse.jetty.server.handler.ResourceHandler@8f9c8a7 - STARTED | | | | +~ org.eclipse.jetty.jmx.MBeanContainer@644a5ddd | | | +~ org.eclipse.jetty.jmx.MBeanContainer@644a5ddd @@ -403,7 +403,7 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING | | | | | | += jsp@19c47==org.apache.jasper.servlet.JspServlet,0,true - STARTED | | | | | | | +- logVerbosityLevel=DEBUG | | | | | | | +- fork=false - | | | | | | | +- com.sun.appserv.jsp.classpath=/home/user/jetty-distribution-{VERSION}/lib/jetty-xml-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-api-4.0.2.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-http-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-continuation-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-server-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-security-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-webapp-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-deploy-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-client-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-jmx-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar:/home/user/jetty-distribution-{VERSION}/resources:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-util-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-io-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/start.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/dnsns.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/localedata.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunec.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunjce_provider.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunpkcs11.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/zipfs.jar:/opt/local/lib/libsvnjavahl-1.0.dylib:/System/Library/Java/Extensions/AppleScriptEngine.jar:/System/Library/Java/Extensions/dns_sd.jar:/System/Library/Java/Extensions/j3daudio.jar:/System/Library/Java/Extensions/j3dcore.jar:/System/Library/Java/Extensions/j3dutils.jar:/System/Library/Java/Extensions/jai_codec.jar:/System/Library/Java/Extensions/jai_core.jar:/System/Library/Java/Extensions/libAppleScriptEngine.jnilib:/System/Library/Java/Extensions/libJ3D.jnilib:/System/Library/Java/Extensions/libJ3DAudio.jnilib:/System/Library/Java/Extensions/libJ3DUtils.jnilib:/System/Library/Java/Extensions/libmlib_jai.jnilib:/System/Library/Java/Extensions/libQTJNative.jnilib:/System/Library/Java/Extensions/mlibwrapper_jai.jar:/System/Library/Java/Extensions/MRJToolkit.jar:/System/Library/Java/Extensions/QTJava.zip:/System/Library/Java/Extensions/vecmath.jar:/usr/lib/java/libjdns_sd.jnilib + | | | | | | | +- com.sun.appserv.jsp.classpath=/home/user/jetty-home-{VERSION}/lib/jetty-xml-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-api-4.0.2.jar:/home/user/jetty-home-{VERSION}/lib/jetty-http-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-continuation-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-server-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-security-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-webapp-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-deploy-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-client-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-jmx-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar:/home/user/jetty-home-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar:/home/user/jetty-home-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar:/home/user/jetty-home-{VERSION}/resources:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/jetty-util-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-io-{VERSION}.jar:/home/user/jetty-home-{VERSION}/start.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/dnsns.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/localedata.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunec.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunjce_provider.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunpkcs11.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/zipfs.jar:/opt/local/lib/libsvnjavahl-1.0.dylib:/System/Library/Java/Extensions/AppleScriptEngine.jar:/System/Library/Java/Extensions/dns_sd.jar:/System/Library/Java/Extensions/j3daudio.jar:/System/Library/Java/Extensions/j3dcore.jar:/System/Library/Java/Extensions/j3dutils.jar:/System/Library/Java/Extensions/jai_codec.jar:/System/Library/Java/Extensions/jai_core.jar:/System/Library/Java/Extensions/libAppleScriptEngine.jnilib:/System/Library/Java/Extensions/libJ3D.jnilib:/System/Library/Java/Extensions/libJ3DAudio.jnilib:/System/Library/Java/Extensions/libJ3DUtils.jnilib:/System/Library/Java/Extensions/libmlib_jai.jnilib:/System/Library/Java/Extensions/libQTJNative.jnilib:/System/Library/Java/Extensions/mlibwrapper_jai.jar:/System/Library/Java/Extensions/MRJToolkit.jar:/System/Library/Java/Extensions/QTJava.zip:/System/Library/Java/Extensions/vecmath.jar:/usr/lib/java/libjdns_sd.jnilib | | | | | | | +- scratchdir=/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-test.war-_test-any-/jsp | | | | | | | +- xpoweredBy=false | | | | | | +- [*.jsp, *.jspf, *.jspx, *.xsp, *.JSP, *.JSPF, *.JSPX, *.XSP]=>jsp @@ -494,33 +494,33 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING | | | | +- file:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-test.war-_test-any-/webapp/WEB-INF/lib/websocket-api-9.0.2.v20130417.jar | | | | +- file:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-test.war-_test-any-/webapp/WEB-INF/lib/websocket-servlet-9.0.2.v20130417.jar | | | | +- startJarLoader@7194b34a - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-xml-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-api-4.0.2.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-http-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-continuation-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-server-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-security-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-webapp-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-deploy-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-client-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-jmx-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/resources/ - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-util-{VERSION}.jar - | | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-io-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-xml-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-api-4.0.2.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-http-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-continuation-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-server-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-security-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-webapp-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-deploy-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-client-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-jmx-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/resources/ + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-util-{VERSION}.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-io-{VERSION}.jar | | | | +- sun.misc.Launcher$AppClassLoader@19d1b44b - | | | | +- file:/home/user/jetty-distribution-{VERSION}/start.jar + | | | | +- file:/home/user/jetty-home-{VERSION}/start.jar | | | | +- sun.misc.Launcher$ExtClassLoader@1693b52b | | | +> org.eclipse.jetty.server.context.ManagedAttributes=QoSFilter,TransparentProxy.ThreadPool,TransparentProxy.HttpClient | | | +> context-override-example=a context value @@ -552,7 +552,7 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING | | | | | += jsp@19c47==org.apache.jasper.servlet.JspServlet,0,true - STARTED | | | | | | +- logVerbosityLevel=DEBUG | | | | | | +- fork=false - | | | | | | +- com.sun.appserv.jsp.classpath=/home/user/jetty-distribution-{VERSION}/lib/jetty-xml-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-api-4.0.2.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-http-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-continuation-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-server-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-security-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-webapp-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-deploy-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-client-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-jmx-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar:/home/user/jetty-distribution-{VERSION}/resources:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-util-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/lib/jetty-io-{VERSION}.jar:/home/user/jetty-distribution-{VERSION}/start.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/dnsns.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/localedata.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunec.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunjce_provider.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunpkcs11.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/zipfs.jar:/opt/local/lib/libsvnjavahl-1.0.dylib:/System/Library/Java/Extensions/AppleScriptEngine.jar:/System/Library/Java/Extensions/dns_sd.jar:/System/Library/Java/Extensions/j3daudio.jar:/System/Library/Java/Extensions/j3dcore.jar:/System/Library/Java/Extensions/j3dutils.jar:/System/Library/Java/Extensions/jai_codec.jar:/System/Library/Java/Extensions/jai_core.jar:/System/Library/Java/Extensions/libAppleScriptEngine.jnilib:/System/Library/Java/Extensions/libJ3D.jnilib:/System/Library/Java/Extensions/libJ3DAudio.jnilib:/System/Library/Java/Extensions/libJ3DUtils.jnilib:/System/Library/Java/Extensions/libmlib_jai.jnilib:/System/Library/Java/Extensions/libQTJNative.jnilib:/System/Library/Java/Extensions/mlibwrapper_jai.jar:/System/Library/Java/Extensions/MRJToolkit.jar:/System/Library/Java/Extensions/QTJava.zip:/System/Library/Java/Extensions/vecmath.jar:/usr/lib/java/libjdns_sd.jnilib + | | | | | | +- com.sun.appserv.jsp.classpath=/home/user/jetty-home-{VERSION}/lib/jetty-xml-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-api-4.0.2.jar:/home/user/jetty-home-{VERSION}/lib/jetty-http-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-continuation-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-server-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-security-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-webapp-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-deploy-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-client-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-jmx-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar:/home/user/jetty-home-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar:/home/user/jetty-home-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar:/home/user/jetty-home-{VERSION}/resources:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar:/home/user/jetty-home-{VERSION}/lib/jetty-util-{VERSION}.jar:/home/user/jetty-home-{VERSION}/lib/jetty-io-{VERSION}.jar:/home/user/jetty-home-{VERSION}/start.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/dnsns.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/localedata.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunec.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunjce_provider.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/sunpkcs11.jar:/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/jre/lib/ext/zipfs.jar:/opt/local/lib/libsvnjavahl-1.0.dylib:/System/Library/Java/Extensions/AppleScriptEngine.jar:/System/Library/Java/Extensions/dns_sd.jar:/System/Library/Java/Extensions/j3daudio.jar:/System/Library/Java/Extensions/j3dcore.jar:/System/Library/Java/Extensions/j3dutils.jar:/System/Library/Java/Extensions/jai_codec.jar:/System/Library/Java/Extensions/jai_core.jar:/System/Library/Java/Extensions/libAppleScriptEngine.jnilib:/System/Library/Java/Extensions/libJ3D.jnilib:/System/Library/Java/Extensions/libJ3DAudio.jnilib:/System/Library/Java/Extensions/libJ3DUtils.jnilib:/System/Library/Java/Extensions/libmlib_jai.jnilib:/System/Library/Java/Extensions/libQTJNative.jnilib:/System/Library/Java/Extensions/mlibwrapper_jai.jar:/System/Library/Java/Extensions/MRJToolkit.jar:/System/Library/Java/Extensions/QTJava.zip:/System/Library/Java/Extensions/vecmath.jar:/usr/lib/java/libjdns_sd.jnilib | | | | | | +- scratchdir=/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-xref-proxy.war-_xref-proxy-any-/jsp | | | | | | +- xpoweredBy=false | | | | | +- [*.jsp, *.jspf, *.jspx, *.xsp, *.JSP, *.JSPF, *.JSPX, *.XSP]=>jsp @@ -588,33 +588,33 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING | | | +- file:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-xref-proxy.war-_xref-proxy-any-/webapp/WEB-INF/lib/jetty-proxy-{VERSION}.jar | | | +- file:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-xref-proxy.war-_xref-proxy-any-/webapp/WEB-INF/lib/jetty-util-{VERSION}.jar | | | +- startJarLoader@7194b34a - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-xml-{VERSION}.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-api-4.0.2.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-http-{VERSION}.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-continuation-{VERSION}.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-server-{VERSION}.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-security-{VERSION}.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-{VERSION}.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-webapp-{VERSION}.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-deploy-{VERSION}.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-client-{VERSION}.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-jmx-{VERSION}.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/resources/ - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-util-{VERSION}.jar - | | | +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-io-{VERSION}.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-xml-{VERSION}.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-api-4.0.2.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-http-{VERSION}.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-continuation-{VERSION}.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-server-{VERSION}.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-security-{VERSION}.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-{VERSION}.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-webapp-{VERSION}.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-deploy-{VERSION}.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-client-{VERSION}.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-jmx-{VERSION}.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar + | | | +- file:/home/user/jetty-home-{VERSION}/resources/ + | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-util-{VERSION}.jar + | | | +- file:/home/user/jetty-home-{VERSION}/lib/jetty-io-{VERSION}.jar | | | +- sun.misc.Launcher$AppClassLoader@19d1b44b - | | | +- file:/home/user/jetty-distribution-{VERSION}/start.jar + | | | +- file:/home/user/jetty-home-{VERSION}/start.jar | | | +- sun.misc.Launcher$ExtClassLoader@1693b52b | | +> javax.servlet.context.tempdir=/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-xref-proxy.war-_xref-proxy-any- | | +> org.apache.catalina.jsp_classpath=/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-xref-proxy.war-_xref-proxy-any-/webapp/WEB-INF/classes:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-xref-proxy.war-_xref-proxy-any-/webapp/WEB-INF/lib/jetty-client-{VERSION}.jar:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-xref-proxy.war-_xref-proxy-any-/webapp/WEB-INF/lib/jetty-http-{VERSION}.jar:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-xref-proxy.war-_xref-proxy-any-/webapp/WEB-INF/lib/jetty-io-{VERSION}.jar:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-xref-proxy.war-_xref-proxy-any-/webapp/WEB-INF/lib/jetty-proxy-{VERSION}.jar:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-xref-proxy.war-_xref-proxy-any-/webapp/WEB-INF/lib/jetty-util-{VERSION}.jar @@ -644,7 +644,7 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING | +- org.eclipse.jetty.server.handler.DefaultHandler@4de4926a=org.eclipse.jetty.server.handler:type=defaulthandler,id=0 | +- org.eclipse.jetty.server.session.SessionHandler@5c25bf03=org.eclipse.jetty.server.session:context=xref-proxy,type=sessionhandler,id=0 | +- [/ws/*]=>WSChat=org.eclipse.jetty.servlet:context=test,type=servletmapping,name=WSChat,id=0 - | +- o.e.j.w.WebAppContext@6f01ba6f{/,file:/home/user/jetty-distribution-{VERSION}/webapps/ROOT/,AVAILABLE}{/ROOT}=org.eclipse.jetty.webapp:context=ROOT,type=webappcontext,id=0 + | +- o.e.j.w.WebAppContext@6f01ba6f{/,file:/home/user/jetty-home-{VERSION}/webapps/ROOT/,AVAILABLE}{/ROOT}=org.eclipse.jetty.webapp:context=ROOT,type=webappcontext,id=0 | +- o.e.j.w.WebAppContext@7ea88b1c{/async-rest,[file:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/webapp/, jar:file:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/webapp/WEB-INF/lib/example-async-rest-jar-9.0.2.v20130417.jar!/META-INF/resources/],AVAILABLE}{/async-rest.war}=org.eclipse.jetty.webapp:context=async-rest,type=webappcontext,id=0 | +- ServerConnector@3d0f282{HTTP/1.1}{0.0.0.0:9090}=org.eclipse.jetty.server:context=HTTP/1.1@3d0f282,type=serverconnector,id=0 | +- org.eclipse.jetty.security.DefaultAuthenticatorFactory@6242c657=org.eclipse.jetty.security:context=ROOT,type=defaultauthenticatorfactory,id=0 @@ -687,7 +687,7 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING | +- [/*]/[]==0=>QoSFilter=org.eclipse.jetty.servlet:context=test,type=filtermapping,name=QoSFilter,id=0 | +- org.eclipse.jetty.server.session.SessionHandler@5a770658=org.eclipse.jetty.server.session:context=ROOT,type=sessionhandler,id=0 | +- org.eclipse.jetty.server.session.SessionHandler@336abd81=org.eclipse.jetty.server.session:context=test,type=sessionhandler,id=0 - | +- o.e.j.s.h.ContextHandler@7b2dffdf{/javadoc,file:/home/user/jetty-distribution-{VERSION}/javadoc,AVAILABLE}=org.eclipse.jetty.server.handler:context=javadoc,type=contexthandler,id=0 + | +- o.e.j.s.h.ContextHandler@7b2dffdf{/javadoc,file:/home/user/jetty-home-{VERSION}/javadoc,AVAILABLE}=org.eclipse.jetty.server.handler:context=javadoc,type=contexthandler,id=0 | +- org.eclipse.jetty.servlets.QoSFilter@6df3d1f5=org.eclipse.jetty.servlets:context=test,type=qosfilter,id=0 | +- [*.more]=>Dump=org.eclipse.jetty.servlet:context=test,type=servletmapping,name=Dump,id=1 | +- Dump@20ae14==com.acme.Dump,1,true=org.eclipse.jetty.servlet:context=test,type=servletholder,name=Dump,id=0 @@ -794,33 +794,33 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING += org.eclipse.jetty.server.session.HashSessionIdManager@289eb857 - STARTED | +> startJarLoader@7194b34a - +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-xml-{VERSION}.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-api-4.0.2.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-http-{VERSION}.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-continuation-{VERSION}.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-server-{VERSION}.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-security-{VERSION}.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-servlet-{VERSION}.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-webapp-{VERSION}.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-deploy-{VERSION}.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-client-{VERSION}.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-jmx-{VERSION}.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar - +- file:/home/user/jetty-distribution-{VERSION}/resources/ - +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-util-{VERSION}.jar - +- file:/home/user/jetty-distribution-{VERSION}/lib/jetty-io-{VERSION}.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jetty-xml-{VERSION}.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-api-4.0.2.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jetty-http-{VERSION}.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jetty-continuation-{VERSION}.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jetty-server-{VERSION}.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jetty-security-{VERSION}.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jetty-servlet-{VERSION}.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jetty-webapp-{VERSION}.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jetty-deploy-{VERSION}.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jetty-client-{VERSION}.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jetty-jmx-{VERSION}.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jsp/com.sun.el-2.2.0.v201303151357.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.el-2.2.0.v201303151357.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar + +- file:/home/user/jetty-home-{VERSION}/resources/ + +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-api-9.0.2.v20130417.jar + +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-common-9.0.2.v20130417.jar + +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-server-9.0.2.v20130417.jar + +- file:/home/user/jetty-home-{VERSION}/lib/websocket/websocket-servlet-9.0.2.v20130417.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jetty-util-{VERSION}.jar + +- file:/home/user/jetty-home-{VERSION}/lib/jetty-io-{VERSION}.jar +- sun.misc.Launcher$AppClassLoader@19d1b44b - +- file:/home/user/jetty-distribution-{VERSION}/start.jar + +- file:/home/user/jetty-home-{VERSION}/start.jar +- sun.misc.Launcher$ExtClassLoader@1693b52b 2013-04-29 14:38:39.422:INFO:oejs.Server:Thread-2: Graceful shutdown org.eclipse.jetty.server.Server@76f08fe1 by Mon Apr 29 14:38:44 CDT 2013 2013-04-29 14:38:39.429:INFO:oejs.ServerConnector:Thread-2: Stopped ServerConnector@3d0f282{HTTP/1.1}{0.0.0.0:9090} @@ -828,9 +828,9 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING 2013-04-29 14:38:39.444:INFO:oejsh.ContextHandler:Thread-2: stopped o.e.j.w.WebAppContext@4ac92718{/proxy,file:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-xref-proxy.war-_xref-proxy-any-/webapp/,UNAVAILABLE}{/xref-proxy.war} 2013-04-29 14:38:39.447:INFO:oejsl.ELContextCleaner:Thread-2: javax.el.BeanELResolver purged 2013-04-29 14:38:39.447:INFO:oejsh.ContextHandler:Thread-2: stopped o.e.j.w.WebAppContext@716d9094{/test,file:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-test.war-_test-any-/webapp/,UNAVAILABLE}{/test.war} -2013-04-29 14:38:39.455:INFO:oejsh.ContextHandler:Thread-2: stopped o.e.j.s.h.ContextHandler@7b2dffdf{/javadoc,file:/home/user/jetty-distribution-{VERSION}/javadoc,UNAVAILABLE} +2013-04-29 14:38:39.455:INFO:oejsh.ContextHandler:Thread-2: stopped o.e.j.s.h.ContextHandler@7b2dffdf{/javadoc,file:/home/user/jetty-home-{VERSION}/javadoc,UNAVAILABLE} 2013-04-29 14:38:39.456:INFO:oejsl.ELContextCleaner:Thread-2: javax.el.BeanELResolver purged -2013-04-29 14:38:39.456:INFO:oejsh.ContextHandler:Thread-2: stopped o.e.j.w.WebAppContext@6f01ba6f{/,file:/home/user/jetty-distribution-{VERSION}/webapps/ROOT/,UNAVAILABLE}{/ROOT} +2013-04-29 14:38:39.456:INFO:oejsh.ContextHandler:Thread-2: stopped o.e.j.w.WebAppContext@6f01ba6f{/,file:/home/user/jetty-home-{VERSION}/webapps/ROOT/,UNAVAILABLE}{/ROOT} 2013-04-29 14:38:39.456:INFO:oejsh.ContextHandler:Thread-2: stopped o.e.j.s.h.MovedContextHandler@5e0c8d24{/oldContextPath,null,UNAVAILABLE} 2013-04-29 14:38:39.457:INFO:oejsl.ELContextCleaner:Thread-2: javax.el.BeanELResolver purged 2013-04-29 14:38:39.457:INFO:oejsh.ContextHandler:Thread-2: stopped o.e.j.w.WebAppContext@7ea88b1c{/async-rest,[file:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/webapp/, jar:file:/private/var/folders/br/kbs2g3753c54wmv4j31pnw5r0000gn/T/jetty-0.0.0.0-9090-async-rest.war-_async-rest-any-/webapp/WEB-INF/lib/example-async-rest-jar-9.0.2.v20130417.jar!/META-INF/resources/],UNAVAILABLE}{/async-rest.war} diff --git a/jetty-documentation/src/main/asciidoc/old_docs/logging/example-apache-log4j.adoc b/jetty-documentation/src/main/asciidoc/old_docs/logging/example-apache-log4j.adoc index 380a41a0a987..a7b8ce55b4d5 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/logging/example-apache-log4j.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/logging/example-apache-log4j.adoc @@ -51,7 +51,7 @@ INFO: resources enabled in ${jetty.base}/start.ini The replacement `logging.mod` performs a number of tasks. . `mybase` is a `${jetty.base}` directory. -. The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration. +. The jetty-home is unpacked (and untouched) into `/opt/jetty-home/` and becomes the `${jetty.home}` directory for this demonstration. . The `curl` command downloads the replacement `logging.mod` and puts it into the `${jetty.base}/modules/` directory for use by mybase only. . The `start.jar --add-to-start=logging` command performs a number of steps to make the logging module available to the `${jetty.base}` configuration. .. The `--module=logging` command is added to the `${jetty.base}/start.ini` configuration. diff --git a/jetty-documentation/src/main/asciidoc/old_docs/logging/example-java-util-logging-native.adoc b/jetty-documentation/src/main/asciidoc/old_docs/logging/example-java-util-logging-native.adoc index 9dd34805c861..6be7f1b16b2d 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/logging/example-java-util-logging-native.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/logging/example-java-util-logging-native.adoc @@ -59,7 +59,7 @@ INFO: resources enabled in ${jetty.base}/${jetty.base} The replacement `logging.mod` performs a number of tasks. . `mybase` is a `${jetty.base}` directory. -. The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration. +. The jetty-home is unpacked (and untouched) into `/opt/jetty-home/` and becomes the `${jetty.home}` directory for this demonstration. . The `curl` command downloads the replacement `logging.mod` and puts it into the `${jetty.base}/modules/` directory for use by `mybase` only. . The `start.jar --add-to-start=logging` command performs a number of steps to make the logging module available to the `${jetty.base}` configuration. diff --git a/jetty-documentation/src/main/asciidoc/old_docs/logging/example-java-util-logging.adoc b/jetty-documentation/src/main/asciidoc/old_docs/logging/example-java-util-logging.adoc index 08294a43d357..e4c92c68a1eb 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/logging/example-java-util-logging.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/logging/example-java-util-logging.adoc @@ -53,7 +53,7 @@ INFO: resources enabled in ${jetty.base}/start.ini The replacement `logging.mod` performs a number of tasks. . `mybase` is a `${jetty.base}` directory -. The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration. +. The jetty-home is unpacked (and untouched) into `/opt/jetty-home/` and becomes the `${jetty.home}` directory for this demonstration. . The `curl` command downloads the replacement `logging.mod` and puts it into the `${jetty.base}/modules/` directory for use by `mybase` only. . The `start.jar --add-to-start=logging` command performs a number of steps to make the logging module available to the `${jetty.base}` configuration. .. The `--module=logging` command is added to the `${jetty.base}/start.ini` configuration. diff --git a/jetty-documentation/src/main/asciidoc/old_docs/logging/example-logback-centralized-logging.adoc b/jetty-documentation/src/main/asciidoc/old_docs/logging/example-logback-centralized-logging.adoc index c300ae010285..3f694ab2deef 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/logging/example-logback-centralized-logging.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/logging/example-logback-centralized-logging.adoc @@ -119,7 +119,7 @@ $ This replacement `centralized-webapp-logging.mod` performs a number of tasks. . `mybase` is a `${jetty.base}` directory. -. The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration. +. The jetty-home is unpacked (and untouched) into `/opt/jetty-home/` and becomes the `${jetty.home}` directory for this demonstration. . The `curl` command downloads the replacement config overlay for the `${jetty.base}/modules/` directory to use. . The `start.jar --add-to-start=centralized-webapp-logging` command performs a number of steps to make the centralized-webapp-logging module available to the `${jetty.base}` configuration. .. A new `${jetty.base}/start.d/centralized-webapp-logging.ini` configuration was created. diff --git a/jetty-documentation/src/main/asciidoc/old_docs/logging/example-logback.adoc b/jetty-documentation/src/main/asciidoc/old_docs/logging/example-logback.adoc index 221fb3372ca2..857ad1e712fb 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/logging/example-logback.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/logging/example-logback.adoc @@ -49,7 +49,7 @@ DOWNLOAD: https://raw.githubusercontent.com/jetty-project/logging-modules/master The replacement `logging.mod` performs a number of tasks. . `mybase` is a `${jetty.base}` directory. -. The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration. +. The jetty-home is unpacked (and untouched) into `/opt/jetty-home/` and becomes the `${jetty.home}` directory for this demonstration. . The `curl` command downloads the replacement `logging.mod` and puts it into the `${jetty.base}/modules/` directory for use by `mybase` only. . The `start.jar --add-to-start=logging` command performs a number of steps to make the logging module available to the `${jetty.base}` configuration. .. The `--module=logging` command is added to the `${jetty.base}/start.ini` configuration. diff --git a/jetty-documentation/src/main/asciidoc/old_docs/logging/example-slf4j-multiple-loggers.adoc b/jetty-documentation/src/main/asciidoc/old_docs/logging/example-slf4j-multiple-loggers.adoc index bcdc29c56ce9..4bf6eb45f842 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/logging/example-slf4j-multiple-loggers.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/logging/example-slf4j-multiple-loggers.adoc @@ -120,7 +120,7 @@ INFO: resources enabled in ${jetty.base}/start.ini The replacement `logging.mod` performs a number of tasks. . `mybase` is a `${jetty.base}` directory. -. The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration. +. The jetty-home is unpacked (and untouched) into `/opt/jetty-home/` and becomes the `${jetty.home}` directory for this demonstration. . The `curl` command downloads the replacement `logging.mod` and puts it into the `${jetty.base}/modules/` directory for use by `mybase` only. . The `start.jar --add-to-start=logging` command performs a number of steps to make the logging module available to the `${jetty.base}` configuration. .. The `--module=logging` command is added to the `${jetty.base}/start.ini` configuration. diff --git a/jetty-documentation/src/main/asciidoc/old_docs/platforms/cloudfoundry.adoc b/jetty-documentation/src/main/asciidoc/old_docs/platforms/cloudfoundry.adoc index 878aee4b40c4..d491da97f9ba 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/platforms/cloudfoundry.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/platforms/cloudfoundry.adoc @@ -108,8 +108,8 @@ Installing jetty-buildpack.git. Downloading JDK... Copying openjdk-1.7.0_21.tar.gz from the buildpack cache ... Unpacking JDK to .jdk -Downloading Jetty: jetty-distribution-{VERSION}.tar.gz -Downloading jetty-distribution-{VERSION}.tar.gz from http://repo2.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.0.3.v20130506/ ... +Downloading Jetty: jetty-home-{VERSION}.tar.gz +Downloading jetty-home-{VERSION}.tar.gz from http://repo2.maven.org/maven2/org/eclipse/jetty/jetty-home/10.0.0.v202012xx/ ... Unpacking Jetty to .jetty -> Uploading staged droplet (36M) -> Uploaded droplet diff --git a/jetty-documentation/src/main/asciidoc/old_docs/security/jetty-home-and-jetty-base.adoc b/jetty-documentation/src/main/asciidoc/old_docs/security/jetty-home-and-jetty-base.adoc index e0caa03dcc97..87848011dff9 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/security/jetty-home-and-jetty-base.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/security/jetty-home-and-jetty-base.adoc @@ -48,7 +48,7 @@ This page describes how to configure SSL in Jetty with modules. It provides an example of using the `${jetty.home}` and `${jetty.base}` to maximum effect. It also includes a detailed explanation of how modules work. -This example assumes you have the jetty-distribution unpacked in `/home/user/jetty-distribution-{VERSION}`. +This example assumes you have the jetty-home unpacked in `/home/user/jetty-home-{VERSION}`. It also assumes you are using `start.ini` to configure your server features. 1. Create a base directory anywhere. @@ -177,7 +177,7 @@ Java Environment: Jetty Environment: ----------------- - jetty.home=/home/user/jetty-distribution-{VERSION} + jetty.home=/home/user/jetty-home-{VERSION} jetty.base=/home/user/my-base jetty.version={VERSION} @@ -188,7 +188,7 @@ JVM Arguments: System Properties: ------------------ jetty.base = /home/user/my-base - jetty.home = /home/user/jetty-distribution-{VERSION} + jetty.home = /home/user/jetty-home-{VERSION} Properties: ----------- @@ -448,7 +448,7 @@ If you want to start using a new module: [source, screen, subs="{sub-order}"] .... -[my-base] $ java -jar ../jetty-distribution-{VERSION}/start.jar --add-to-start=https +[my-base] $ java -jar ../jetty-home-{VERSION}/start.jar --add-to-start=https .... This adds the `--module=` lines and associated properties (the parameterized values mentioned above), to your `start.ini`. @@ -477,7 +477,7 @@ For more information on the `start.jar` in 9.1, see xref:start-jar[]. [[summary-configuring-SSL-Jetty]] ==== Summary of Configuring SSL -1. Download and unpack Jetty into `/home/user/jetty-distribution-{VERSION}`. +1. Download and unpack Jetty into `/home/user/jetty-home-{VERSION}`. 2. Go to your base directory and just use the distribution, no editing. + [source, screen, subs="{sub-order}"] @@ -506,7 +506,7 @@ You can see what the configuration looks like, after all of the modules are reso [source, screen, subs="{sub-order}"] .... -[my-base] $ java -jar ../jetty-distribution-{VERSION}/start.jar --list-config +[my-base] $ java -jar ../jetty-home-{VERSION}/start.jar --list-config .... Just because the JARs exist on disk does not mean that they are in use. diff --git a/jetty-documentation/src/main/asciidoc/old_docs/startup/screen-empty-base-listconfig.adoc b/jetty-documentation/src/main/asciidoc/old_docs/startup/screen-empty-base-listconfig.adoc index 016c4b118b25..7dcef0d14448 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/startup/screen-empty-base-listconfig.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/startup/screen-empty-base-listconfig.adoc @@ -30,7 +30,7 @@ Java Environment: java.runtime.name = Java(TM) SE Runtime Environment java.runtime.version = 1.8.0_92-b14 java.io.tmpdir = /var/folders/h6/yb_lbnnn11g0y1jjlvqg631h0000gn/T/ - user.dir = /Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase + user.dir = /var/my-jetty-base user.language = en user.country = US @@ -38,14 +38,14 @@ Jetty Environment: ----------------- jetty.version = {VERSION} jetty.tag.version = master - jetty.home = /Users/staff/installs/repository/jetty-distribution-{VERSION} - jetty.base = /Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase + jetty.home = /Users/staff/installs/repository/jetty-home-{VERSION} + jetty.base = /var/my-jetty-base Config Search Order: -------------------- - ${jetty.base} -> /Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase - ${jetty.home} -> /Users/staff/installs/repository/jetty-distribution-{VERSION} + ${jetty.base} -> /var/my-jetty-base + ${jetty.home} -> /Users/staff/installs/repository/jetty-home-{VERSION} JVM Arguments: diff --git a/jetty-documentation/src/main/asciidoc/old_docs/startup/screen-http-webapp-deploy-listconfig.adoc b/jetty-documentation/src/main/asciidoc/old_docs/startup/screen-http-webapp-deploy-listconfig.adoc index 37a448344c2b..fe66b3f678a5 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/startup/screen-http-webapp-deploy-listconfig.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/startup/screen-http-webapp-deploy-listconfig.adoc @@ -30,7 +30,7 @@ Java Environment: java.runtime.name = Java(TM) SE Runtime Environment java.runtime.version = 1.8.0_92-b14 java.io.tmpdir = /var/folders/h6/yb_lbnnn11g0y1jjlvqg631h0000gn/T/ - user.dir = /Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase + user.dir = /var/my-jetty-base user.language = en user.country = US @@ -38,14 +38,14 @@ Jetty Environment: ----------------- jetty.version = {VERSION} jetty.tag.version = master - jetty.home = /Users/staff/installs/repository/jetty-distribution-{VERSION} - jetty.base = /Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase + jetty.home = /Users/staff/installs/repository/jetty-home-{VERSION} + jetty.base = /var/my-jetty-base Config Search Order: -------------------- - ${jetty.base} -> /Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase - ${jetty.home} -> /Users/staff/installs/repository/jetty-distribution-{VERSION} + ${jetty.base} -> /var/my-jetty-base + ${jetty.home} -> /Users/staff/installs/repository/jetty-home-{VERSION} JVM Arguments: diff --git a/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-base-vs-home.adoc b/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-base-vs-home.adoc index aaca8f270ed6..da8784494d89 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-base-vs-home.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-base-vs-home.adoc @@ -57,7 +57,7 @@ The Jetty Distribution comes with an example `${jetty.base}` which enables the v [source, screen, subs="{sub-order}"] .... -[jetty-distribution-{VERSION}]$ ls -la +[jetty-home-{VERSION}]$ ls -la total 496 drwxrwxr-x 11 user group 4096 Oct 8 15:23 ./ @@ -78,12 +78,12 @@ drwxrwxr-x 2 user group 4096 Oct 8 06:54 start.d/ -rw-rw-r-- 1 user group 336468 Sep 30 19:55 VERSION.txt drwxrwxr-x 2 user group 4096 Oct 8 06:54 webapps/ -[jetty-distribution-{VERSION}]$ cd demo-base +[jetty-home-{VERSION}]$ cd demo-base [my-base]$ java -jar /path/to/jetty-home/start.jar 2013-10-16 09:08:47.800:WARN::main: demo test-realm is deployed. DO NOT USE IN PRODUCTION! 2013-10-16 09:08:47.802:INFO:oejs.Server:main: jetty-{VERSION} -2013-10-16 09:08:47.817:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:/home/user/jetty-distribution-{VERSION}/demo-base/webapps/] at interval 1 +2013-10-16 09:08:47.817:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:/home/user/jetty-home-{VERSION}/demo-base/webapps/] at interval 1 2013-10-16 09:08:48.072:WARN::main: async-rest webapp is deployed. DO NOT USE IN PRODUCTION! ... .... @@ -104,22 +104,22 @@ Java Environment: java.runtime.name = Java(TM) SE Runtime Environment java.runtime.version = 1.8.0_92-b14 java.io.tmpdir = /var/folders/h6/yb_lbnnn11g0y1jjlvqg631h0000gn/T/ - user.dir = /home/user/jetty-distribution-{VERSION} + user.dir = /home/user/jetty-home-{VERSION} user.language = en user.country = US Jetty Environment: ----------------- - jetty.home=/home/user/jetty-distribution-{VERSION} + jetty.home=/home/user/jetty-home-{VERSION} jetty.tag.version = master - jetty.base=/home/user/jetty-distribution-{VERSION}/demo-base + jetty.base=/home/user/jetty-home-{VERSION}/demo-base jetty.version={VERSION} Config Search Order: -------------------- - ${jetty.base} -> /home/user/jetty-distribution-{VERSION}/demo-base - ${jetty.home} -> /home/user/Desktop/jetty-distribution-{VERSION} + ${jetty.base} -> /home/user/jetty-home-{VERSION}/demo-base + ${jetty.home} -> /home/user/Desktop/jetty-home-{VERSION} JVM Arguments: -------------- @@ -127,8 +127,8 @@ JVM Arguments: System Properties: ------------------ - jetty.base = /home/user/jetty-distribution-{VERSION}/demo-base - jetty.home = /home/user/jetty-distribution-{VERSION} + jetty.base = /home/user/jetty-home-{VERSION}/demo-base + jetty.home = /home/user/jetty-home-{VERSION} Properties: ----------- @@ -275,11 +275,11 @@ You can opt to manually define the `${jetty.home}` and `${jetty.base}` directori [source, screen, subs="{sub-order}"] .... -[jetty-distribution-{VERSION}]$ pwd -/home/user/jetty-distribution-{VERSION} +[jetty-home-{VERSION}]$ pwd +/home/user/jetty-home-{VERSION} -[jetty-distribution-{VERSION}]$ java -jar start.jar \ - jetty.home=/home/user/jetty-distribution-{VERSION} \ +[jetty-home-{VERSION}]$ java -jar start.jar \ + jetty.home=/home/user/jetty-home-{VERSION} \ jetty.base=/home/user/my-base 2013-10-16 09:08:47.802:INFO:oejs.Server:main: jetty-{VERSION} @@ -293,10 +293,10 @@ The following example uses default discovery of `${jetty.home}` by using the par [source, screen, subs="{sub-order}"] .... -[jetty-distribution-{VERSION}]$ pwd -/home/user/jetty-distribution-{VERSION} +[jetty-home-{VERSION}]$ pwd +/home/user/jetty-home-{VERSION} -[jetty-distribution-{VERSION}]$ java -jar start.jar jetty.base=/home/user/my-base +[jetty-home-{VERSION}]$ java -jar start.jar jetty.base=/home/user/my-base 2013-10-16 09:08:47.802:INFO:oejs.Server:main: jetty-{VERSION} 2013-10-16 09:08:47.817:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:/home/user/my-base/webapps/] at interval 1 @@ -310,10 +310,10 @@ The following demonstrates this by allowing default discovery of `${jetty.home}` [source,screen,subs="{sub-order}"] .... -[jetty-distribution-{VERSION}]$ pwd -/home/user/jetty-distribution-{VERSION} +[jetty-home-{VERSION}]$ pwd +/home/user/jetty-home-{VERSION} -[jetty-distribution-{VERSION}]$ cd /home/user/my-base +[jetty-home-{VERSION}]$ cd /home/user/my-base [my-base]$ java -jar /path/to/jetty-home/start.jar 2013-10-16 09:08:47.802:INFO:oejs.Server:main: jetty-{VERSION} diff --git a/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-overview.adoc b/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-overview.adoc index 9a4bce974a33..4df091d289eb 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-overview.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-overview.adoc @@ -73,8 +73,8 @@ The simplest way to start Jetty is via the `start.jar` mechanism using the follo [source, screen, subs="{sub-order}"] .... -[user]$ cd jetty-distribution-{VERSION} -[jetty-distribution-{VERSION}]$ java -jar start.jar --module=http jetty.http.port=8080 +[user]$ cd jetty-home-{VERSION} +[jetty-home-{VERSION}]$ java -jar start.jar --module=http jetty.http.port=8080 .... This command uses the `start.jar` mechanism to bootstrap the classpath, properties, and XML files with the metadata obtained from the `http` module. @@ -82,7 +82,7 @@ Specifically the `http` module is defined in the `${jetty.home}/modules/http.mod [source, screen, subs="{sub-order}"] .... -[jetty-distribution-{VERSION}]$ cat modules/http.mod +[jetty-home-{VERSION}]$ cat modules/http.mod [depend] server @@ -101,7 +101,7 @@ Following the server dependency, the `${jetty.home}/modules/server.mod` file inc [source, screen, subs="{sub-order}"] .... -[jetty-distribution-{VERSION}]$ cat modules/server.mod +[jetty-home-{VERSION}]$ cat modules/server.mod [lib] lib/jetty-servlet-api-4.0.2.jar lib/jetty-http-${jetty.version}.jar @@ -125,7 +125,7 @@ Another way to see this is by asking Jetty what its configuration looks like by [source, screen, subs="{sub-order}"] .... -[jetty-distribution-{VERSION}]$ java -jar start.jar --module=http jetty.http.port=9099 --list-config +[jetty-home-{VERSION}]$ java -jar start.jar --module=http jetty.http.port=9099 --list-config Java Environment: ----------------- @@ -140,8 +140,8 @@ Java Environment: Jetty Environment: ----------------- - jetty.home=/opt/jetty/jetty-distribution-{VERSION} - jetty.base=/opt/jetty/jetty-distribution-{VERSION} + jetty.home=/opt/jetty/jetty-home-{VERSION} + jetty.base=/opt/jetty/jetty-home-{VERSION} jetty.version={VERSION} JVM Arguments: @@ -150,8 +150,8 @@ JVM Arguments: System Properties: ------------------ - jetty.home = /opt/jetty/jetty-distribution-{VERSION} - jetty.base = /opt/jetty/jetty-distribution-{VERSION} + jetty.home = /opt/jetty/jetty-home-{VERSION} + jetty.base = /opt/jetty/jetty-home-{VERSION} Properties: ----------- @@ -183,12 +183,12 @@ The following is the equivalent Java command line for what the `start.jar` boots [source, screen, subs="{sub-order}"] .... -[user]$ cd jetty-distribution-{VERSION} -[jetty-distribution-{VERSION}]$ echo jetty.http.port=8080 > /tmp/jetty.properties -[jetty-distribution-{VERSION}]$ export JETTY_HOME=`pwd` -[jetty-distribution-{VERSION}]$ export JETTY_BASE=`pwd` -[jetty-distribution-{VERSION}]$ export JETTY_VERSION="${project.version}" -[jetty-distribution-{VERSION}]$ java -Djetty.home=$JETTY_HOME \ +[user]$ cd jetty-home-{VERSION} +[jetty-home-{VERSION}]$ echo jetty.http.port=8080 > /tmp/jetty.properties +[jetty-home-{VERSION}]$ export JETTY_HOME=`pwd` +[jetty-home-{VERSION}]$ export JETTY_BASE=`pwd` +[jetty-home-{VERSION}]$ export JETTY_VERSION="${project.version}" +[jetty-home-{VERSION}]$ java -Djetty.home=$JETTY_HOME \ -Djetty.base=$JETTY_BASE \ -cp \ $JETTY_HOME/lib/jetty-servlet-api-4.0.2.jar\ @@ -209,8 +209,8 @@ You can further simplify the startup of this server by using the INI template de [source,screen,subs="{sub-order}"] .... -[user]$ cd jetty-distribution-{VERSION} -[jetty-distribution-{VERSION}]$ mkdir example-base +[user]$ cd jetty-home-{VERSION} +[jetty-home-{VERSION}]$ mkdir example-base [example-base]$ cd example-base [example-base]$ ls -la total 8 diff --git a/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-unix-service.adoc b/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-unix-service.adoc index 68ee46826be3..34a48a802b17 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-unix-service.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-unix-service.adoc @@ -29,23 +29,23 @@ The minimum steps to get Jetty to run as a Service include: [source, screen, subs="{sub-order}"] .... -[/opt/jetty]# tar -zxf /home/user/downloads/jetty-distribution-{VERSION}.tar.gz -[/opt/jetty]# cd jetty-distribution-{VERSION}/ -[/opt/jetty/jetty-distribution-{VERSION}]# ls +[/opt/jetty]# tar -zxf /home/user/downloads/jetty-home-{VERSION}.tar.gz +[/opt/jetty]# cd jetty-home-{VERSION}/ +[/opt/jetty/jetty-home-{VERSION}]# ls bin lib modules resources start.jar demo-base license-eplv10-aslv20.html notice.html start.d VERSION.txt etc logs README.TXT start.ini webapps -[/opt/jetty/jetty-distribution-{VERSION}]# cp bin/jetty.sh /etc/init.d/jetty -[/opt/jetty/jetty-distribution-{VERSION}]# echo JETTY_HOME=`pwd` > /etc/default/jetty -[/opt/jetty/jetty-distribution-{VERSION}]# cat /etc/default/jetty -JETTY_HOME=/opt/jetty/jetty-distribution-{VERSION} +[/opt/jetty/jetty-home-{VERSION}]# cp bin/jetty.sh /etc/init.d/jetty +[/opt/jetty/jetty-home-{VERSION}]# echo JETTY_HOME=`pwd` > /etc/default/jetty +[/opt/jetty/jetty-home-{VERSION}]# cat /etc/default/jetty +JETTY_HOME=/opt/jetty/jetty-home-{VERSION} -[/opt/jetty/jetty-distribution-{VERSION}]# service jetty start +[/opt/jetty/jetty-home-{VERSION}]# service jetty start Starting Jetty: OK Wed Nov 20 10:26:53 MST 2013 .... -From this demonstration we can see that Jetty started successfully as a Unix Service from the `/opt/jetty/jetty-distribution-{VERSION}` directory. +From this demonstration we can see that Jetty started successfully as a Unix Service from the `/opt/jetty/jetty-home-{VERSION}` directory. This configuration works well but it is running Jetty as the root user. @@ -131,13 +131,13 @@ Unpack it into place. [source, screen, subs="{sub-order}"] .... -[/opt/jetty]# tar -zxf /home/user/Downloads/jetty-distribution-{VERSION}.tar.gz +[/opt/jetty]# tar -zxf /home/user/Downloads/jetty-home-{VERSION}.tar.gz [/opt/jetty]# ls -F -jetty-distribution-{VERSION}/ +jetty-home-{VERSION}/ [/opt/jetty]# mkdir /opt/jetty/temp .... -It might seem strange or undesirable to unpack the first portion of the jetty-distribution directory name too. +It might seem strange or undesirable to unpack the first portion of the jetty-home directory name too. But starting with Jetty 9 the split between `${jetty.home}` and `${jetty.base}` allows for easier upgrades of Jetty itself while isolating your webapp specific configuration. For more information on the Jetty home and base concepts see the section on managing a Jetty installation link:#startup-base-and-home[earlier in this Chapter.] @@ -149,15 +149,15 @@ The directory at `/opt/web/mybase` is going to be a `${jetty.base}`, so lets con [TIP] -- -In past versions of Jetty, you would configure / modify / add to the `jetty-distribution` directory directly. -While this is still supported, we encourage you to setup a proper `${jetty.base}` directory, as it will benefit you with easier `jetty-distribution` upgrades in the future. +In past versions of Jetty, you would configure / modify / add to the `jetty-home` directory directly. +While this is still supported, we encourage you to setup a proper `${jetty.base}` directory, as it will benefit you with easier `jetty-home` upgrades in the future. -- [source, screen, subs="{sub-order}"] .... # cd /opt/web/mybase/ [/opt/web/mybase]# ls -[/opt/web/mybase]# java -jar /opt/jetty/jetty-distribution-{VERSION}/start.jar \ +[/opt/web/mybase]# java -jar /opt/jetty/jetty-home-{VERSION}/start.jar \ --add-to-start=deploy,http,console-capture INFO : webapp transitively enabled, ini template available with --add-to-start=webapp INFO : server transitively enabled, ini template available with --add-to-start=server @@ -218,8 +218,8 @@ Next we need to make the Unix System aware that we have a new Jetty Service that [source, screen, subs="{sub-order}"] .... -# cp /opt/jetty/jetty-distribution-{VERSION}/bin/jetty.sh /etc/init.d/jetty -# echo "JETTY_HOME=/opt/jetty/jetty-distribution-{VERSION}" > /etc/default/jetty +# cp /opt/jetty/jetty-home-{VERSION}/bin/jetty.sh /etc/init.d/jetty +# echo "JETTY_HOME=/opt/jetty/jetty-home-{VERSION}" > /etc/default/jetty # echo "JETTY_BASE=/opt/web/mybase" >> /etc/default/jetty # echo "TMPDIR=/opt/jetty/temp" >> /etc/default/jetty .... @@ -231,31 +231,31 @@ Test out the configuration: # service jetty status Checking arguments to Jetty: START_INI = /opt/web/mybase/start.ini -JETTY_HOME = /opt/jetty/jetty-distribution-{VERSION} +JETTY_HOME = /opt/jetty/jetty-home-{VERSION} JETTY_BASE = /opt/web/mybase -JETTY_CONF = /opt/jetty/jetty-distribution-{VERSION}/etc/jetty.conf +JETTY_CONF = /opt/jetty/jetty-home-{VERSION}/etc/jetty.conf JETTY_PID = /var/run/jetty.pid -JETTY_START = /opt/jetty/jetty-distribution-{VERSION}/start.jar +JETTY_START = /opt/jetty/jetty-home-{VERSION}/start.jar CLASSPATH = JAVA = /usr/bin/java JAVA_OPTIONS = -Djetty.state=/opt/web/mybase/jetty.state -Djetty.logs=/opt/web/mybase/logs - -Djetty.home=/opt/jetty/jetty-distribution-{VERSION} + -Djetty.home=/opt/jetty/jetty-home-{VERSION} -Djetty.base=/opt/web/mybase -Djava.io.tmpdir=/opt/jetty/temp JETTY_ARGS = console-capture.xml jetty-started.xml RUN_CMD = /usr/bin/java -Djetty.state=/opt/web/mybase/jetty.state -Djetty.logs=/opt/web/mybase/logs - -Djetty.home=/opt/jetty/jetty-distribution-{VERSION} + -Djetty.home=/opt/jetty/jetty-home-{VERSION} -Djetty.base=/opt/web/mybase -Djava.io.tmpdir=/opt/jetty/temp - -jar /opt/jetty/jetty-distribution-{VERSION}/start.jar + -jar /opt/jetty/jetty-home-{VERSION}/start.jar console-capture.xml jetty-started.xml .... -You now have a configured `${jetty.base}` in `/opt/web/mybase` and a `${jetty.home}` in `/opt/jetty/jetty-distribution-{VERSION}`, along with the service level files necessary to start the service. +You now have a configured `${jetty.base}` in `/opt/web/mybase` and a `${jetty.home}` in `/opt/jetty/jetty-home-{VERSION}`, along with the service level files necessary to start the service. Test the service to make sure it starts up and runs successfully. diff --git a/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-windows-service.adoc b/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-windows-service.adoc index 4f7c224dce9a..e4baa813a43a 100644 --- a/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-windows-service.adoc +++ b/jetty-documentation/src/main/asciidoc/old_docs/startup/startup-windows-service.adoc @@ -79,7 +79,7 @@ Java HotSpot(TM) 64-Bit Server VM (build 24.45-b08, mixed mode) Download a copy of the ZIP distribution from the link:#jetty-downloading[Official Eclipse Download Site] -Extract the contents of the `jetty-distribution-{VERSION}` directory to `C:\opt\jetty` +Extract the contents of the `jetty-home-{VERSION}` directory to `C:\opt\jetty` Once complete, the contents of the `C:\opt\jetty` directory should look like this: diff --git a/jetty-documentation/src/main/asciidoc/operations-guide/begin/install.adoc b/jetty-documentation/src/main/asciidoc/operations-guide/begin/install.adoc index cfa1d8ecf90d..05468375182d 100644 --- a/jetty-documentation/src/main/asciidoc/operations-guide/begin/install.adoc +++ b/jetty-documentation/src/main/asciidoc/operations-guide/begin/install.adoc @@ -19,9 +19,9 @@ [[og-begin-install]] ==== Installing Eclipse Jetty -After the download, unpacking the Eclipse Jetty distribution will extract the files into a directory called `jetty-distribution-VERSION`, where `VERSION` is the version that you downloaded, for example `10.0.0`, so that the directory is called `jetty-distribution-10.0.0`. +After the download, unpacking Eclipse Jetty will extract the files into a directory called `jetty-home-VERSION`, where `VERSION` is the version that you downloaded, for example `10.0.0`, so that the directory is called `jetty-home-10.0.0`. -Unpack the Eclipse Jetty distribution compressed file in a convenient location, for example under `/opt`. +Unpack Eclipse Jetty compressed file in a convenient location, for example under `/opt`. NOTE: For Windows users, you should unpack Jetty to a path that does not contain spaces. diff --git a/jetty-documentation/src/main/asciidoc/operations-guide/start/start-jar.adoc b/jetty-documentation/src/main/asciidoc/operations-guide/start/start-jar.adoc index 6767c6d973df..77339b616166 100644 --- a/jetty-documentation/src/main/asciidoc/operations-guide/start/start-jar.adoc +++ b/jetty-documentation/src/main/asciidoc/operations-guide/start/start-jar.adoc @@ -24,7 +24,7 @@ TODO: review in light of Jetty 10 The most basic way of starting the Jetty standalone server is to execute the `start.jar`, which is a bootstrap for starting Jetty with the configuration you want. ---- -[jetty-distribution-{VERSION}]$ java -jar start.jar +[jetty-home-{VERSION}]$ java -jar start.jar 2013-09-23 11:27:06.654:INFO:oejs.Server:main: jetty-{VERSION} ... ---- diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTester.java b/jetty-gcloud/jetty-gcloud-session-manager/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTester.java deleted file mode 100644 index ba069a85dffb..000000000000 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTester.java +++ /dev/null @@ -1,67 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others. -// -// This program and the accompanying materials are made available under -// the terms of the Eclipse Public License 2.0 which is available at -// https://www.eclipse.org/legal/epl-2.0 -// -// This Source Code may also be made available under the following -// Secondary Licenses when the conditions for such availability set -// forth in the Eclipse Public License, v. 2.0 are satisfied: -// the Apache License v2.0 which is available at -// https://www.apache.org/licenses/LICENSE-2.0 -// -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 -// ======================================================================== -// - -package org.eclipse.jetty.gcloud.session; - -import org.eclipse.jetty.security.HashLoginService; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker; -import org.eclipse.jetty.server.session.DefaultSessionCache; -import org.eclipse.jetty.server.session.DefaultSessionIdManager; -import org.eclipse.jetty.webapp.WebAppContext; - -public class GCloudSessionTester -{ - public static void main(String[] args) throws Exception - { - if (args.length < 4) - System.err.println("Usage: GCloudSessionTester projectid p12file password serviceaccount"); - - System.setProperty("org.eclipse.jetty.server.session.LEVEL", "DEBUG"); - - Server server = new Server(8080); - HashLoginService loginService = new HashLoginService(); - loginService.setName("Test Realm"); - loginService.setConfig("../../jetty-distribution/target/distribution/demo-base/resources/realm.properties"); - server.addBean(loginService); - - DefaultSessionIdManager idmgr = new DefaultSessionIdManager(server); - idmgr.setWorkerName("w1"); - server.setSessionIdManager(idmgr); - - WebAppContext webapp = new WebAppContext(); - webapp.setContextPath("/"); - webapp.setWar("../../jetty-distribution/target/distribution/demo-base/webapps/test.war"); - webapp.addAliasCheck(new AllowSymLinkAliasChecker()); - GCloudSessionDataStore ds = new GCloudSessionDataStore(); - - DefaultSessionCache ss = new DefaultSessionCache(webapp.getSessionHandler()); - webapp.getSessionHandler().setSessionCache(ss); - ss.setSessionDataStore(ds); - webapp.getSessionHandler().setSessionIdManager(idmgr); - - // A WebAppContext is a ContextHandler as well so it needs to be set to - // the server so it is aware of where to send the appropriate requests. - server.setHandler(webapp); - - // Start things up! - server.start(); - - server.join(); - } -} diff --git a/jetty-home/src/main/assembly/site-component.xml b/jetty-home/src/main/assembly/site-component.xml index c87eab9547df..694addb43a2b 100644 --- a/jetty-home/src/main/assembly/site-component.xml +++ b/jetty-home/src/main/assembly/site-component.xml @@ -6,7 +6,7 @@ ${basedir}/target/dist-src - jetty-distribution-${version}-site-component + jetty-home-${version}-site-component target/site/** README** diff --git a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml index 8c7c454673f0..a9aaee9f4a3c 100644 --- a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml @@ -74,7 +74,7 @@ org.apache.maven.plugins maven-deploy-plugin - + false diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java index eae17a2f299c..542cd04a5cdc 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java @@ -106,18 +106,18 @@ public void testGetCoordinateNormal() public void testGetCoordinateZip() { MavenLocalRepoFileInitializer repo = new MavenLocalRepoFileInitializer(baseHome); - String ref = "maven://org.eclipse.jetty/jetty-distribution/9.3.x/zip"; + String ref = "maven://org.eclipse.jetty/jetty-home/9.3.x/zip"; Coordinates coords = repo.getCoordinates(URI.create(ref)); assertThat("Coordinates", coords, notNullValue()); assertThat("coords.groupId", coords.groupId, is("org.eclipse.jetty")); - assertThat("coords.artifactId", coords.artifactId, is("jetty-distribution")); + assertThat("coords.artifactId", coords.artifactId, is("jetty-home")); assertThat("coords.version", coords.version, is("9.3.x")); assertThat("coords.type", coords.type, is("zip")); assertThat("coords.classifier", coords.classifier, nullValue()); assertThat("coords.toCentralURI", coords.toCentralURI().toASCIIString(), - is("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.3.x/jetty-distribution-9.3.x.zip")); + is("https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/9.3.x/jetty-home-9.3.x.zip")); } @Test diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/util/CorrectMavenCentralRefs.java b/jetty-start/src/test/java/org/eclipse/jetty/start/util/CorrectMavenCentralRefs.java index 2be89513e3c8..3629051989d5 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/util/CorrectMavenCentralRefs.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/util/CorrectMavenCentralRefs.java @@ -53,7 +53,7 @@ public static void main(String[] args) // Test to make sure we are in right directory Path rootPomXml = buildRoot.resolve("pom.xml"); - Path distPomXml = buildRoot.resolve("jetty-distribution/pom.xml"); + Path distPomXml = buildRoot.resolve("jetty-home/pom.xml"); if (!Files.exists(rootPomXml) || !Files.exists(distPomXml)) { System.err.println("Not build root directory: " + buildRoot); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/util/RebuildTestResources.java b/jetty-start/src/test/java/org/eclipse/jetty/start/util/RebuildTestResources.java index c7d991a7fb7f..2eb2fb57fda4 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/util/RebuildTestResources.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/util/RebuildTestResources.java @@ -34,7 +34,7 @@ * Utility class to rebuild the src/test/resources/dist-home from the active build tree. *

* Not really meant to be run with each build. Nor is it a good idea to attempt to do that (as this would introduce a dependency from jetty-start -> - * jetty-distribution which is a circular dependency) + * jetty-home which is a circular dependency) */ public class RebuildTestResources { @@ -42,7 +42,7 @@ public class RebuildTestResources public static void main(String[] args) { - File realDistHome = MavenTestingUtils.getProjectDir("../jetty-distribution/target/distribution"); + File realDistHome = MavenTestingUtils.getProjectDir("../jetty-home/target/jetty-home"); File outputDir = MavenTestingUtils.getTestResourceDir("dist-home"); try { diff --git a/jetty-websocket/README.TXT b/jetty-websocket/README.TXT deleted file mode 100644 index 9e678e4ba823..000000000000 --- a/jetty-websocket/README.TXT +++ /dev/null @@ -1,40 +0,0 @@ - - -This is the jetty websocket module that provides a websocket server and the skeleton of a websocket client. - -By default websockets is included with a jetty release (with these classes either being in the jetty-websocket jar or in -an aggregate jar (see below). - - -In order to accept a websocket connection, the websocket handshake request is first routed to normal HTTP request -handling, which must respond with a 101 response and an instance of WebSocketConnection set as the -"org.eclipse.jetty.io.Connection" request attribute. The accepting behaviour is provided by WebSocketHandler or the -WebSocketServlet class, both of which delegate to the WebSocketFactory class. - -A TestServer and TestClient class are available, and can be run either directly from an IDE (if jetty source is -imported), or from the command line with - - - java -cp jetty-aggregate/jetty-all/target/jetty-all-7.x.y.jar:jetty-distribution/target/distribution/lib/servlet-api-2.5.jar - org.eclipse.jetty.websocket.TestServer --help - - java -cp jetty-aggregate/jetty-all/target/jetty-all-7.x.y.jar:jetty-distribution/target/distribution/lib/servlet-api-2.5.jar - org.eclipse.jetty.websocket.TestClient --help - - -Without a protocol specified, the client will just send/receive websocket PING/PONG packets. A protocol can be specified for testing other -aspects of websocket. Specifically the server and client understand the following protocols: - - org.ietf.websocket.test-echo - Websocket messages are sent by the client and the server will echo every frame. - - org.ietf.websocket.test-echo-broadcast - Websocket messages are sent by the client and the server will echo every frame to every connection. - - org.ietf.websocket.test-echo-assemble - Websocket messages are sent by the client and the server will echo assembled messages as a single frame. - - org.ietf.websocket.test-echo-fragment - Websocket messages are sent and the server will echo each message fragmented into 2 frames. - - diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/JettyDistro.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/JettyDistro.java deleted file mode 100644 index 0e1afafc20dc..000000000000 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/JettyDistro.java +++ /dev/null @@ -1,824 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others. -// -// This program and the accompanying materials are made available under -// the terms of the Eclipse Public License 2.0 which is available at -// https://www.eclipse.org/legal/epl-2.0 -// -// This Source Code may also be made available under the following -// Secondary Licenses when the conditions for such availability set -// forth in the Eclipse Public License, v. 2.0 are satisfied: -// the Apache License v2.0 which is available at -// https://www.apache.org/licenses/LICENSE-2.0 -// -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 -// ======================================================================== -// - -package org.eclipse.jetty.test.support; - -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.eclipse.jetty.toolchain.test.FS; -import org.eclipse.jetty.toolchain.test.IO; -import org.eclipse.jetty.toolchain.test.JAR; -import org.eclipse.jetty.toolchain.test.MavenTestingUtils; -import org.eclipse.jetty.toolchain.test.PathAssert; -import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; -import org.junit.jupiter.api.Assertions; - -/** - * Basic process based executor for using the Jetty Distribution along with custom configurations to perform basic - *

- * Allows for a test specific directory, that is a copied jetty-distribution, and then modified for the test specific testing required. - *

- * Requires that you setup the maven-dependency-plugin appropriately for the base distribution you want to use, along with any other dependencies (wars, libs, - * etc..) that you may need from other maven projects. - *

- * Maven Dependency Plugin Setup: - * - *

- *  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- *    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- *
- *   <!-- Common Destination Directories -->
- *
- *   <properties>
- *     <test-wars-dir>${project.build.directory}/test-wars</test-wars-dir>
- *     <test-libs-dir>${project.build.directory}/test-libs</test-libs-dir>
- *     <test-distro-dir>${project.build.directory}/test-dist</test-distro-dir>
- *   </properties>
- *
- *   <build>
- *     <plugins>
- *       <plugin>
- *         <groupId>org.apache.maven.plugins</groupId>
- *         <artifactId>maven-dependency-plugin</artifactId>
- *         <version>2.1</version>
- *         <executions>
- *
- *           <!-- Copy LIB and WAR dependencies into place that JettyDistro can use them -->
- *
- *           <execution>
- *             <id>test-lib-war-copy</id>
- *             <phase>process-test-resources</phase>
- *             <goals>
- *               <goal>copy</goal>
- *             </goals>
- *             <configuration>
- *               <artifactItems>
- *                 <artifactItem>
- *                   <groupId>org.mortbay.jetty.testwars</groupId>
- *                   <artifactId>test-war-java_util_logging</artifactId>
- *                   <version>7.3.0</version>
- *                   <type>war</type>
- *                   <outputDirectory>${test-wars-dir}</outputDirectory>
- *                 </artifactItem>
- *                 <artifactItem>
- *                   <groupId>org.mortbay.jetty</groupId>
- *                   <artifactId>jetty-aspect-servlet-api-2.5</artifactId>
- *                   <version>7.3.0</version>
- *                   <type>jar</type>
- *                   <outputDirectory>${test-libs-dir}</outputDirectory>
- *                 </artifactItem>
- *               </artifactItems>
- *               <overWriteIfNewer>true</overWriteIfNewer>
- *               <overWrite>true</overWrite>
- *               <stripVersion>true</stripVersion>
- *             </configuration>
- *           </execution>
- *
- *           <!-- Extract Jetty DISTRIBUTION into place that JettyDistro can use it -->
- *
- *           <execution>
- *             <id>unpack-test-dist</id>
- *             <phase>process-test-resources</phase>
- *             <goals>
- *               <goal>unpack</goal>
- *             </goals>
- *             <configuration>
- *               <artifactItems>
- *                 <artifactItem>
- *                   <groupId>org.eclipse.jetty</groupId>
- *                   <artifactId>jetty-distribution</artifactId>
- *                   <version>7.3.0</version>
- *                   <type>zip</type>
- *                   <overWrite>true</overWrite>
- *                 </artifactItem>
- *               </artifactItems>
- *               <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
- *               <outputDirectory>${test-distro-dir}</outputDirectory>
- *               <overWriteSnapshots>true</overWriteSnapshots>
- *               <overWriteIfNewer>true</overWriteIfNewer>
- *             </configuration>
- *           </execution>
- *         </executions>
- *       </plugin>
- *     </plugins>
- *   </build>
- *
- * </project>
- * 
- *

- * If you have a specific configuration you want to setup, you'll want to prepare this configuration in an overlay directory underneath the - * src/test/resources/ directory.
- * Notes: - *

    - *
  1. The {@link JettyDistro} sets up a unique test directory (based on the constructor {@link #JettyDistro(Class)} or {@link #JettyDistro(org.eclipse.jetty.toolchain.test.jupiter.WorkDir)}), by - * ensuring the directory is empty, then copying the target/test-dist directory into this new testing directory prior to the test specific changes - * to the configuration.
    - * Note: this testing directory is a complete jetty distribution, suitable for executing via the command line for additional testing needs.
  2. - *
  3. The directory name you choose in src/test/resources will be the name you use in the {@link #overlayConfig(String)} method to provide - * replacement configurations for the Jetty Distribution.
  4. - *
  5. You'll want to {@link #delete(String)} any files and/or directories from the standard distribution prior to using the {@link #overlayConfig(String)} - * method.
  6. - *
  7. Use the {@link #copyLib(String, String)} method to copy JAR files from the target/test-libs directory (created and managed above using the - * maven-dependency-plugin) to copy the lib into the test specific.
  8. - *
  9. Use the {@link #copyTestWar(String)} method to copy WAR files from the target/test-wars directory (created and managed above using the - * maven-dependency-plugin) to copy the WAR into the test specific directory.
  10. - *
- *

- * Next you'll want to use Junit 4.8+ and the @BeforeClass and @AfterClass annotations to setup the JettyDistro - * class for setting up your testing configuration. - *

- * Example Test Case using {@link JettyDistro} class - * - *

- * public class MySampleTest
- * {
- *     private static JettyDistro jetty;
- *
- *     @BeforeClass
- *     public static void initJetty() throws Exception
- *     {
- *         jetty = new JettyDistro(MySampleTest.class);
- *
- *         jetty.copyTestWar("test-war-java_util_logging.war");
- *         jetty.copyTestWar("test-war-policy.war");
- *
- *         jetty.delete("webapps/test.war");
- *         jetty.delete("contexts/test.d");
- *         jetty.delete("contexts/javadoc.xml");
- *         jetty.delete("contexts/test.xml");
- *
- *         jetty.overlayConfig("no_security");
- *
- *         jetty.setDebug(true);
- *
- *         jetty.start();
- *     }
- *
- *     @AfterClass
- *     public static void shutdownJetty() throws Exception
- *     {
- *         if (jetty != null)
- *         {
- *             jetty.stop();
- *         }
- *     }
- *
- *     @Test
- *     public void testRequest() throws Exception
- *     {
- *         SimpleRequest request = new SimpleRequest(jetty.getBaseUri());
- *         String path = "/test-war-policy/security/PRACTICAL/testFilsystem");
- *         String response = request.getString(path);
- *         assertEquals("Success", response);
- *     }
- * }
- * 
- */ -public class JettyDistro -{ - private String artifactName = "jetty-distribution"; - private long startTime = 60; - private TimeUnit timeUnit = TimeUnit.SECONDS; - - private File jettyHomeDir; - private Process pid; - private URI baseUri; - - private String jmxUrl; - - private boolean _debug = false; - - /** - * Setup the JettyHome as belonging in a testing directory associated with a testing clazz. - * - * @param clazz the testing class using this JettyDistro - * @throws IOException if unable to copy unpacked distribution into place for the provided testing directory - */ - public JettyDistro(Class clazz) throws IOException - { - this(clazz, null); - } - - /** - * Setup the JettyHome as belonging in a testing directory associated with a testing clazz. - * - * @param clazz the testing class using this JettyDistro - * @param artifact name of jetty distribution artifact - * @throws IOException if unable to copy unpacked distribution into place for the provided testing directory - */ - public JettyDistro(Class clazz, String artifact) throws IOException - { - this.jettyHomeDir = MavenTestingUtils.getTargetTestingPath(clazz, "jettyHome").toFile(); - if (artifact != null) - { - this.artifactName = artifact; - } - - copyBaseDistro(); - } - - /** - * Setup the JettyHome as belonging to a specific testing method directory - * - * @param testdir the testing directory to use as the JettyHome for this JettyDistro - * @throws IOException if unable to copy unpacked distribution into place for the provided testing directory - */ - public JettyDistro(WorkDir testdir) throws IOException - { - this.jettyHomeDir = testdir.getPath().toFile(); - copyBaseDistro(); - } - - /** - * Setup the JettyHome as belonging to a specific testing method directory - * - * @param testdir the testing directory to use as the JettyHome for this JettyDistro - * @param artifact name of jetty distribution artifact - * @throws IOException if unable to copy unpacked distribution into place for the provided testing directory - */ - public JettyDistro(WorkDir testdir, String artifact) throws IOException - { - this.jettyHomeDir = testdir.getPath().toFile(); - if (artifact != null) - { - this.artifactName = artifact; - } - - copyBaseDistro(); - } - - /** - * @throws IOException if unable to copy unpacked distribution into place for the provided testing directory - */ - private void copyBaseDistro() throws IOException - { - // The outputDirectory for the maven side dependency:unpack goal. - File distroUnpackDir = MavenTestingUtils.getTargetFile("test-dist"); - PathAssert.assertDirExists(artifactName + " dependency:unpack", distroUnpackDir); - - // The actual jetty-distribution-${version} directory is under this directory. - // Lets find it. - File[] subdirs = distroUnpackDir.listFiles(path -> - { - if (!path.isDirectory()) - { - return false; - } - return path.getName().startsWith(artifactName + "-"); - } - ); - - if (subdirs.length == 0) - { - // No jetty-distribution found. - StringBuilder err = new StringBuilder(); - err.append("No target/test-dist/"); - err.append(artifactName); - err.append("-${version} directory found."); - err.append("\n To fix this, run 'mvn process-test-resources' to create the directory."); - throw new IOException(err.toString()); - } - - if (subdirs.length != 1) - { - // Too many jetty-distributions found. - StringBuilder err = new StringBuilder(); - err.append("Too many target/test-dist/"); - err.append(artifactName); - err.append("-${version} directories found."); - for (File dir : subdirs) - { - err.append("\n ").append(dir.getAbsolutePath()); - } - err.append("\n To fix this, run 'mvn clean process-test-resources' to recreate the target/test-dist directory."); - throw new IOException(err.toString()); - } - - File distroSrcDir = subdirs[0]; - FS.ensureEmpty(jettyHomeDir); - System.out.printf("Copying Jetty Distribution: %s%n", distroSrcDir.getAbsolutePath()); - System.out.printf(" To Testing Dir: %s%n", jettyHomeDir.getAbsolutePath()); - IO.copyDir(distroSrcDir, jettyHomeDir); - } - - /** - * Return the $(jetty.home) directory being used for this JettyDistro - * - * @return the jetty.home directory being used - */ - public File getJettyHomeDir() - { - return this.jettyHomeDir; - } - - /** - * Copy a war file from ${project.basedir}/target/test-wars/${testWarFilename} into the ${jetty.home}/webapps/ directory - * - * @param testWarFilename the war file to copy (must exist) - * @throws IOException if unable to copy the war file. - */ - public void copyTestWar(String testWarFilename) throws IOException - { - File srcWar = MavenTestingUtils.getTargetFile("test-wars/" + testWarFilename); - File destWar = new File(jettyHomeDir, FS.separators("webapps/" + testWarFilename)); - FS.ensureDirExists(destWar.getParentFile()); - IO.copyFile(srcWar, destWar); - } - - /** - * Copy an arbitrary file from src/test/resources/${resourcePath} to the testing directory. - * - * @param resourcePath the relative path for file content within the src/test/resources directory. - * @param outputPath the testing directory relative output path for the file output (will result in a file with the outputPath name being created) - * @throws IOException if unable to copy resource file - */ - public void copyResource(String resourcePath, String outputPath) throws IOException - { - File srcFile = MavenTestingUtils.getTestResourceFile(resourcePath); - File destFile = new File(jettyHomeDir, FS.separators(outputPath)); - FS.ensureDirExists(destFile.getParentFile()); - IO.copyFile(srcFile, destFile); - } - - /** - * Copy an arbitrary file from target/test-libs/${libFilename} to the testing directory. - * - * @param libFilename the target/test-libs/${libFilename} to copy - * @param outputPath the destination testing directory relative output path for the lib. (will result in a file with the outputPath name being created) - * @throws IOException if unable to copy lib - */ - public void copyLib(String libFilename, String outputPath) throws IOException - { - File srcLib = MavenTestingUtils.getTargetFile("test-libs/" + libFilename); - File destLib = new File(jettyHomeDir, FS.separators(outputPath)); - FS.ensureDirExists(destLib.getParentFile()); - IO.copyFile(srcLib, destLib); - } - - /** - * Copy the ${project.basedir}/src/main/config/ tree into the testing directory. - * - * @throws IOException if unable to copy the directory tree - */ - public void copyProjectMainConfig() throws IOException - { - File srcDir = MavenTestingUtils.getProjectDir("src/main/config"); - IO.copyDir(srcDir, jettyHomeDir); - } - - /** - * Create a ${jetty.home}/lib/self/${jarFilename} jar file from the content in the ${project.basedir}/target/classes/ directory. - * - * @throws IOException if unable to copy the directory tree - */ - public void createProjectLib(String jarFilename) throws IOException - { - File srcDir = MavenTestingUtils.getTargetFile("classes"); - File libSelfDir = new File(jettyHomeDir, FS.separators("lib/self")); - FS.ensureDirExists(libSelfDir); - File jarFile = new File(libSelfDir, jarFilename); - JAR.create(srcDir, jarFile); - } - - /** - * Unpack an arbitrary config from target/test-configs/${configFilename} to the testing directory. - * - * @param configFilename the target/test-configs/${configFilename} to copy - * @throws IOException if unable to unpack config file - */ - public void unpackConfig(String configFilename) throws IOException - { - File srcConfig = MavenTestingUtils.getTargetFile("test-configs/" + configFilename); - JAR.unpack(srcConfig, jettyHomeDir); - } - - /** - * Delete a File or Directory found in the ${jetty.home} directory. - * - * @param path the path to delete. (can be a file or directory) - */ - public void delete(String path) - { - File jettyPath = new File(jettyHomeDir, FS.separators(path)); - FS.delete(jettyPath); - } - - /** - * Return the baseUri being used for this Jetty Process Instance. - * - * @return the base URI for this Jetty Process Instance. - */ - public URI getBaseUri() - { - return this.baseUri; - } - - /** - * Return the JMX URL being used for this Jetty Process Instance. - * - * @return the JMX URL for this Jetty Process Instance. - */ - public String getJmxUrl() - { - return this.jmxUrl; - } - - /** - * Take the directory contents from ${project.basedir}/src/test/resources/${testConfigName}/ and copy it over whatever happens to be at ${jetty.home} - * - * @param testConfigName the src/test/resources/ directory name to use as the source diretory for the configuration we are interested in. - * @throws IOException if unable to copy directory. - */ - public void overlayConfig(String testConfigName) throws IOException - { - File srcDir = MavenTestingUtils.getTestResourceDir(testConfigName); - IO.copyDir(srcDir, jettyHomeDir); - } - - /** - * Start the jetty server - * - * @throws IOException if unable to start the server. - */ - public void start() throws IOException - { - List commands = new ArrayList(); - commands.add(getJavaBin()); - - commands.add("-Djetty.home=" + jettyHomeDir.getAbsolutePath()); - - // Do a dry run first to get the exact command line for Jetty process - commands.add("-jar"); - commands.add("start.jar"); - commands.add("jetty.http.port=0"); - if (_debug) - { - commands.add("-D.DEBUG=true"); - } - commands.add("--dry-run"); - - ProcessBuilder pbCmd = new ProcessBuilder(commands); - pbCmd.directory(jettyHomeDir); - - String cmdLine = null; - Process pidCmd = pbCmd.start(); - try - { - cmdLine = readOutputLine(pidCmd); - } - finally - { - pidCmd.destroy(); - } - - if (cmdLine == null || !cmdLine.contains("XmlConfiguration")) - { - Assertions.fail("Unable to get Jetty command line"); - } - - // Need to breakdown commandline into parts, as spaces in command line will cause failures. - List execCommands = splitAndUnescapeCommandLine(cmdLine); - - System.out.printf("Executing: %s%n", cmdLine); - System.out.printf("Working Dir: %s%n", jettyHomeDir.getAbsolutePath()); - - pbCmd = new ProcessBuilder(execCommands); - pid = pbCmd.start(); - - ConsoleParser parser = new ConsoleParser(); - List jmxList = parser.newPattern("JMX Remote URL: (.*)", 0); - List connList = parser.newPattern("Started [A-Za-z]*Connector@([0-9]*\\.[0-9]*\\.[0-9]*\\.[0-9]*):([0-9]*)", 1); - // DISABLED: This is what exists in Jetty 9+ - // List connList = parser.newPattern("Started [A-Za-z]*Connector@.*[\\({]([0-9]*\\.[0-9]*\\.[0-9]*\\.[0-9]*):([0-9]*)[\\)}].*",1); - - startPump("STDOUT", parser, this.pid.getInputStream()); - startPump("STDERR", parser, this.pid.getErrorStream()); - - try - { - parser.waitForDone(this.startTime, this.timeUnit); - - if (!jmxList.isEmpty()) - { - this.jmxUrl = jmxList.get(0)[0]; - System.out.printf("## Found JMX connector at %s%n", this.jmxUrl); - } - - if (!connList.isEmpty()) - { - String[] params = connList.get(0); - if (params.length == 2) - { - this.baseUri = URI.create("http://localhost:" + params[1] + "/"); - } - System.out.printf("## Found Jetty connector at host: %s port: %s%n", (Object[])params); - } - } - catch (InterruptedException e) - { - pid.destroy(); - Assertions.fail("Unable to get required information within time limit"); - } - } - - public static List splitAndUnescapeCommandLine(CharSequence rawCmdLine) - { - List cmds = new ArrayList(); - - int len = rawCmdLine.length(); - StringBuilder arg = new StringBuilder(); - boolean escaped = false; - boolean inQuote = false; - char c; - for (int i = 0; i < len; i++) - { - c = rawCmdLine.charAt(i); - if (escaped) - { - switch (c) - { - case 'r': - arg.append('\r'); - break; - case 'f': - arg.append('\f'); - break; - case 't': - arg.append('\t'); - break; - case 'n': - arg.append('\n'); - break; - case 'b': - arg.append('\b'); - break; - default: - arg.append(c); - break; - } - escaped = false; - continue; - } - - if (c == '\\') - { - escaped = true; - } - else - { - if ((c == ' ') && (!inQuote)) - { - // the delim! - cmds.add(String.valueOf(arg.toString())); - arg.setLength(0); - } - else if (c == '"') - { - inQuote = !inQuote; - } - else - { - arg.append(c); - } - } - } - cmds.add(String.valueOf(arg.toString())); - - return cmds; - } - - private String readOutputLine(Process pidCmd) throws IOException - { - InputStream in = null; - InputStreamReader reader = null; - BufferedReader buf = null; - try - { - in = pidCmd.getInputStream(); - reader = new InputStreamReader(in); - buf = new BufferedReader(reader); - return buf.readLine(); - } - finally - { - IO.close(buf); - IO.close(reader); - IO.close(in); - } - } - - private static class ConsoleParser - { - private List patterns = new ArrayList(); - private CountDownLatch latch; - private int count; - - public List newPattern(String exp, int cnt) - { - ConsolePattern pat = new ConsolePattern(exp, cnt); - patterns.add(pat); - count += cnt; - - return pat.getMatches(); - } - - public void parse(String line) - { - for (ConsolePattern pat : patterns) - { - Matcher mat = pat.getMatcher(line); - if (mat.find()) - { - int num = 0; - int count = mat.groupCount(); - String[] match = new String[count]; - while (num++ < count) - { - match[num - 1] = mat.group(num); - } - pat.getMatches().add(match); - - if (pat.getCount() > 0) - { - getLatch().countDown(); - } - } - } - } - - public void waitForDone(long timeout, TimeUnit unit) throws InterruptedException - { - getLatch().await(timeout, unit); - } - - private CountDownLatch getLatch() - { - synchronized (this) - { - if (latch == null) - { - latch = new CountDownLatch(count); - } - } - - return latch; - } - } - - private static class ConsolePattern - { - private Pattern pattern; - private List matches; - private int count; - - ConsolePattern(String exp, int cnt) - { - pattern = Pattern.compile(exp); - matches = new ArrayList(); - count = cnt; - } - - public Matcher getMatcher(String line) - { - return pattern.matcher(line); - } - - public List getMatches() - { - return matches; - } - - public int getCount() - { - return count; - } - } - - private void startPump(String mode, ConsoleParser parser, InputStream inputStream) - { - ConsoleStreamer pump = new ConsoleStreamer(mode, inputStream); - pump.setParser(parser); - Thread thread = new Thread(pump, "ConsoleStreamer/" + mode); - thread.start(); - } - - /** - * enable debug on the jetty process - */ - public void setDebug(boolean debug) - { - _debug = debug; - } - - private String getJavaBin() - { - String[] javaexes = new String[] - {"java", "java.exe"}; - - File javaHomeDir = new File(System.getProperty("java.home")); - for (String javaexe : javaexes) - { - File javabin = new File(javaHomeDir, FS.separators("bin/" + javaexe)); - if (javabin.exists() && javabin.isFile()) - { - return javabin.getAbsolutePath(); - } - } - - Assertions.fail("Unable to find java bin"); - return "java"; - } - - /** - * Stop the jetty server - */ - public void stop() - { - System.out.println("Stopping JettyDistro ..."); - if (pid != null) - { - // TODO: maybe issue a STOP instead? - pid.destroy(); - } - } - - /** - * Simple streamer for the console output from a Process - */ - private static class ConsoleStreamer implements Runnable - { - private String mode; - private BufferedReader reader; - private ConsoleParser parser; - - public ConsoleStreamer(String mode, InputStream is) - { - this.mode = mode; - this.reader = new BufferedReader(new InputStreamReader(is)); - } - - public void setParser(ConsoleParser connector) - { - this.parser = connector; - } - - @Override - public void run() - { - String line; - // System.out.printf("ConsoleStreamer/%s initiated%n",mode); - try - { - while ((line = reader.readLine()) != (null)) - { - if (parser != null) - { - parser.parse(line); - } - System.out.println("[" + mode + "] " + line); - } - } - catch (IOException ignore) - { - /* ignore */ - } - finally - { - IO.close(reader); - } - // System.out.printf("ConsoleStreamer/%s finished%n",mode); - } - } - - public void setStartTime(long startTime, TimeUnit timeUnit) - { - this.startTime = startTime; - this.timeUnit = timeUnit; - } -}