From ca7db8be3299b8260442c90916bb9db0b6ebc7b8 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 24 Sep 2020 10:39:13 -0500 Subject: [PATCH] Moving /examples/ to /demos/ Signed-off-by: Joakim Erdfelt --- .../AbstractRestServlet.java | 2 +- .../asyncrest => demos}/AsyncRestServlet.java | 2 +- .../SerialRestServlet.java | 2 +- .../main/resources/META-INF/web-fragment.xml | 22 ++++++------- .../asyncrest => demos}/AsyncRestServer.java | 2 +- {examples => demos}/embedded/pom.xml | 12 +++---- .../embedded/prodDb.properties | 0 {examples => demos}/embedded/prodDb.script | 0 .../jetty/demos}/AsyncEchoServlet.java | 2 +- .../org/eclipse/jetty/demos}/DumpServlet.java | 2 +- .../eclipse/jetty/demos}/ExampleServer.java | 2 +- .../jetty/demos}/ExampleServerXml.java | 2 +- .../org/eclipse/jetty/demos}/ExampleUtil.java | 2 +- .../eclipse/jetty/demos}/FastFileServer.java | 2 +- .../org/eclipse/jetty/demos}/FileServer.java | 2 +- .../eclipse/jetty/demos}/FileServerXml.java | 2 +- .../eclipse/jetty/demos}/HelloHandler.java | 2 +- .../eclipse/jetty/demos}/HelloServlet.java | 2 +- .../jetty/demos}/HelloSessionServlet.java | 2 +- .../org/eclipse/jetty/demos}/HelloWorld.java | 2 +- .../org/eclipse/jetty/demos}/Http2Server.java | 2 +- .../org/eclipse/jetty/demos}/JarServer.java | 2 +- .../eclipse/jetty/demos}/JettyDemoBase.java | 2 +- .../org/eclipse/jetty/demos}/JettyHome.java | 2 +- .../eclipse/jetty/demos}/LikeJettyXml.java | 2 +- .../eclipse/jetty/demos}/ManyConnectors.java | 2 +- .../eclipse/jetty/demos}/ManyContexts.java | 2 +- .../eclipse/jetty/demos}/ManyHandlers.java | 2 +- .../jetty/demos}/ManyServletContexts.java | 2 +- .../eclipse/jetty/demos}/MinimalServlets.java | 2 +- .../eclipse/jetty/demos}/OneConnector.java | 2 +- .../org/eclipse/jetty/demos}/OneContext.java | 2 +- .../org/eclipse/jetty/demos}/OneHandler.java | 2 +- .../jetty/demos}/OneServletContext.java | 2 +- .../demos}/OneServletContextJmxStats.java | 2 +- .../demos}/OneServletContextWithSession.java | 2 +- .../org/eclipse/jetty/demos}/OneWebApp.java | 2 +- .../jetty/demos}/OneWebAppWithJsp.java | 2 +- .../org/eclipse/jetty/demos}/ProxyServer.java | 2 +- .../eclipse/jetty/demos}/RewriteServer.java | 2 +- .../jetty/demos}/SecuredHelloHandler.java | 2 +- .../jetty/demos}/ServerWithAnnotations.java | 2 +- .../eclipse/jetty/demos}/ServerWithJMX.java | 2 +- .../eclipse/jetty/demos}/ServerWithJNDI.java | 2 +- .../eclipse/jetty/demos}/SimplestServer.java | 2 +- .../eclipse/jetty/demos}/SplitFileServer.java | 2 +- .../jetty/demos}/WebSocketJsrServer.java | 2 +- .../eclipse/jetty/demos}/WebSocketServer.java | 2 +- .../embedded/src/main/other/content.jar | Bin .../src/main/resources/docroot/push.html | 0 .../main/resources/docroot/pushed/tile00.jpg | Bin .../main/resources/docroot/pushed/tile01.jpg | Bin .../main/resources/docroot/pushed/tile02.jpg | Bin .../main/resources/docroot/pushed/tile03.jpg | Bin .../main/resources/docroot/pushed/tile04.jpg | Bin .../main/resources/docroot/pushed/tile05.jpg | Bin .../main/resources/docroot/pushed/tile06.jpg | Bin .../main/resources/docroot/pushed/tile07.jpg | Bin .../main/resources/docroot/pushed/tile08.jpg | Bin .../main/resources/docroot/pushed/tile09.jpg | Bin .../main/resources/docroot/pushed/tile10.jpg | Bin .../main/resources/docroot/pushed/tile11.jpg | Bin .../main/resources/docroot/pushed/tile12.jpg | Bin .../main/resources/docroot/pushed/tile13.jpg | Bin .../main/resources/docroot/pushed/tile14.jpg | Bin .../main/resources/docroot/pushed/tile15.jpg | Bin .../main/resources/docroot/pushed/tile16.jpg | Bin .../main/resources/docroot/pushed/tile17.jpg | Bin .../main/resources/docroot/pushed/tile18.jpg | Bin .../main/resources/docroot/pushed/tile19.jpg | Bin .../main/resources/docroot/pushed/tile20.jpg | Bin .../main/resources/docroot/pushed/tile21.jpg | Bin .../main/resources/docroot/pushed/tile22.jpg | Bin .../main/resources/docroot/pushed/tile23.jpg | Bin .../main/resources/docroot/pushed/tile24.jpg | Bin .../main/resources/docroot/pushed/tile25.jpg | Bin .../main/resources/docroot/pushed/tile26.jpg | Bin .../main/resources/docroot/pushed/tile27.jpg | Bin .../main/resources/docroot/pushed/tile28.jpg | Bin .../main/resources/docroot/pushed/tile29.jpg | Bin .../main/resources/docroot/pushed/tile30.jpg | Bin .../main/resources/docroot/pushed/tile31.jpg | Bin .../main/resources/docroot/pushed/tile32.jpg | Bin .../main/resources/docroot/pushed/tile33.jpg | Bin .../main/resources/docroot/pushed/tile34.jpg | Bin .../main/resources/docroot/pushed/tile35.jpg | Bin .../main/resources/docroot/pushed/tile36.jpg | Bin .../main/resources/docroot/pushed/tile37.jpg | Bin .../main/resources/docroot/pushed/tile38.jpg | Bin .../main/resources/docroot/pushed/tile39.jpg | Bin .../main/resources/docroot/pushed/tile40.jpg | Bin .../main/resources/docroot/pushed/tile41.jpg | Bin .../main/resources/docroot/pushed/tile42.jpg | Bin .../main/resources/docroot/pushed/tile43.jpg | Bin .../main/resources/docroot/pushed/tile44.jpg | Bin .../main/resources/docroot/pushed/tile45.jpg | Bin .../main/resources/docroot/pushed/tile46.jpg | Bin .../main/resources/docroot/pushed/tile47.jpg | Bin .../main/resources/docroot/pushed/tile48.jpg | Bin .../main/resources/docroot/pushed/tile49.jpg | Bin .../src/main/resources/docroot/readme.txt | 0 .../main/resources/docroot/tiles/tile00.jpg | Bin .../main/resources/docroot/tiles/tile01.jpg | Bin .../main/resources/docroot/tiles/tile02.jpg | Bin .../main/resources/docroot/tiles/tile03.jpg | Bin .../main/resources/docroot/tiles/tile04.jpg | Bin .../main/resources/docroot/tiles/tile05.jpg | Bin .../main/resources/docroot/tiles/tile06.jpg | Bin .../main/resources/docroot/tiles/tile07.jpg | Bin .../main/resources/docroot/tiles/tile08.jpg | Bin .../main/resources/docroot/tiles/tile09.jpg | Bin .../main/resources/docroot/tiles/tile10.jpg | Bin .../main/resources/docroot/tiles/tile11.jpg | Bin .../main/resources/docroot/tiles/tile12.jpg | Bin .../main/resources/docroot/tiles/tile13.jpg | Bin .../main/resources/docroot/tiles/tile14.jpg | Bin .../main/resources/docroot/tiles/tile15.jpg | Bin .../main/resources/docroot/tiles/tile16.jpg | Bin .../main/resources/docroot/tiles/tile17.jpg | Bin .../main/resources/docroot/tiles/tile18.jpg | Bin .../main/resources/docroot/tiles/tile19.jpg | Bin .../main/resources/docroot/tiles/tile20.jpg | Bin .../main/resources/docroot/tiles/tile21.jpg | Bin .../main/resources/docroot/tiles/tile22.jpg | Bin .../main/resources/docroot/tiles/tile23.jpg | Bin .../main/resources/docroot/tiles/tile24.jpg | Bin .../main/resources/docroot/tiles/tile25.jpg | Bin .../main/resources/docroot/tiles/tile26.jpg | Bin .../main/resources/docroot/tiles/tile27.jpg | Bin .../main/resources/docroot/tiles/tile28.jpg | Bin .../main/resources/docroot/tiles/tile29.jpg | Bin .../main/resources/docroot/tiles/tile30.jpg | Bin .../main/resources/docroot/tiles/tile31.jpg | Bin .../main/resources/docroot/tiles/tile32.jpg | Bin .../main/resources/docroot/tiles/tile33.jpg | Bin .../main/resources/docroot/tiles/tile34.jpg | Bin .../main/resources/docroot/tiles/tile35.jpg | Bin .../main/resources/docroot/tiles/tile36.jpg | Bin .../main/resources/docroot/tiles/tile37.jpg | Bin .../main/resources/docroot/tiles/tile38.jpg | Bin .../main/resources/docroot/tiles/tile39.jpg | Bin .../main/resources/docroot/tiles/tile40.jpg | Bin .../main/resources/docroot/tiles/tile41.jpg | Bin .../main/resources/docroot/tiles/tile42.jpg | Bin .../main/resources/docroot/tiles/tile43.jpg | Bin .../main/resources/docroot/tiles/tile44.jpg | Bin .../main/resources/docroot/tiles/tile45.jpg | Bin .../main/resources/docroot/tiles/tile46.jpg | Bin .../main/resources/docroot/tiles/tile47.jpg | Bin .../main/resources/docroot/tiles/tile48.jpg | Bin .../main/resources/docroot/tiles/tile49.jpg | Bin .../src/main/resources/etc/keystore.p12 | Bin .../src/main/resources/etc/realm.properties | 0 .../src/main/resources/exampleserver.xml | 2 +- .../src/main/resources/fileserver.xml | 0 .../resources/java-util-logging.properties | 0 .../main/resources/jetty-logging.properties | 0 .../src/main/resources/logback-access.xml | 0 .../jetty/demos}/AbstractEmbeddedTest.java | 2 +- .../jetty/demos}/ExampleServerTest.java | 2 +- .../jetty/demos}/ExampleServerXmlTest.java | 2 +- .../jetty/demos}/FastFileServerTest.java | 2 +- .../eclipse/jetty/demos}/FileServerTest.java | 2 +- .../jetty/demos}/FileServerXmlTest.java | 2 +- .../eclipse/jetty/demos}/JarServerTest.java | 2 +- .../jetty/demos}/LikeJettyXmlTest.java | 2 +- .../jetty/demos}/ManyConnectorsTest.java | 2 +- .../jetty/demos}/ManyContextsTest.java | 2 +- .../jetty/demos}/ManyHandlersTest.java | 2 +- .../jetty/demos}/ManyServletContextsTest.java | 2 +- .../jetty/demos}/MinimalServletsTest.java | 2 +- .../jetty/demos}/OneConnectorTest.java | 2 +- .../eclipse/jetty/demos}/OneContextTest.java | 2 +- .../eclipse/jetty/demos}/OneHandlerTest.java | 2 +- .../demos}/OneServletContextJmxStatsTest.java | 2 +- .../jetty/demos}/OneServletContextTest.java | 2 +- .../OneServletContextWithSessionTest.java | 2 +- .../eclipse/jetty/demos}/OneWebAppTest.java | 2 +- .../jetty/demos}/OneWebAppWithJspTest.java | 2 +- .../eclipse/jetty/demos}/ProxyServerTest.java | 2 +- .../jetty/demos}/RewriteServerTest.java | 2 +- .../jetty/demos}/SecuredHelloHandlerTest.java | 2 +- .../org/eclipse/jetty/demos}/ServerUtil.java | 2 +- .../demos}/ServerWithAnnotationsTest.java | 2 +- .../jetty/demos}/ServerWithJMXTest.java | 2 +- .../jetty/demos}/ServerWithJNDITest.java | 2 +- .../jetty/demos}/SimplestServerTest.java | 2 +- .../jetty/demos}/SplitFileServerTest.java | 2 +- .../jetty/demos}/WebSocketJsrServerTest.java | 2 +- .../jetty/demos}/WebSocketServerTest.java | 2 +- .../src/test/resources/dir0/test0.txt | 0 .../src/test/resources/dir1/test1.txt | 0 .../test/resources/jetty-logging.properties | 2 +- .../src/test/resources/realm.properties | 0 demos/pom.xml | 1 + .../{embedded => demos}/EmbeddedWeldTest.java | 3 -- .../old_docs/logging/dump-tool.adoc | 12 +++---- .../old_docs/logging/jetty-server-dump.adoc | 30 +++++++++--------- .../old_docs/embedding/jetty-helloworld.adoc | 2 +- pom.xml | 2 -- 200 files changed, 117 insertions(+), 123 deletions(-) rename demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/{example/asyncrest => demos}/AbstractRestServlet.java (99%) rename demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/{example/asyncrest => demos}/AsyncRestServlet.java (99%) rename demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/{example/asyncrest => demos}/SerialRestServlet.java (98%) rename demos/demo-async-rest/demo-async-rest-server/src/main/java/org/eclipse/jetty/{example/asyncrest => demos}/AsyncRestServer.java (97%) rename {examples => demos}/embedded/pom.xml (94%) rename {examples => demos}/embedded/prodDb.properties (100%) rename {examples => demos}/embedded/prodDb.script (100%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/AsyncEchoServlet.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/DumpServlet.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/ExampleServer.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/ExampleServerXml.java (97%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/ExampleUtil.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/FastFileServer.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/FileServer.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/FileServerXml.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/HelloHandler.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/HelloServlet.java (97%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/HelloSessionServlet.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/HelloWorld.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/Http2Server.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/JarServer.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/JettyDemoBase.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/JettyHome.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/LikeJettyXml.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/ManyConnectors.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/ManyContexts.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/ManyHandlers.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/ManyServletContexts.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/MinimalServlets.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/OneConnector.java (97%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/OneContext.java (97%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/OneHandler.java (97%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/OneServletContext.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/OneServletContextJmxStats.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/OneServletContextWithSession.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/OneWebApp.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/OneWebAppWithJsp.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/ProxyServer.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/RewriteServer.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/SecuredHelloHandler.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/ServerWithAnnotations.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/ServerWithJMX.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/ServerWithJNDI.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/SimplestServer.java (97%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/SplitFileServer.java (99%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/WebSocketJsrServer.java (98%) rename {examples/embedded/src/main/java/org/eclipse/jetty/embedded => demos/embedded/src/main/java/org/eclipse/jetty/demos}/WebSocketServer.java (98%) rename {examples => demos}/embedded/src/main/other/content.jar (100%) rename {examples => demos}/embedded/src/main/resources/docroot/push.html (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile00.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile01.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile02.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile03.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile04.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile05.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile06.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile07.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile08.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile09.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile10.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile11.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile12.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile13.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile14.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile15.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile16.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile17.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile18.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile19.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile20.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile21.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile22.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile23.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile24.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile25.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile26.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile27.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile28.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile29.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile30.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile31.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile32.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile33.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile34.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile35.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile36.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile37.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile38.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile39.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile40.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile41.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile42.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile43.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile44.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile45.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile46.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile47.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile48.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/pushed/tile49.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/readme.txt (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile00.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile01.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile02.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile03.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile04.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile05.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile06.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile07.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile08.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile09.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile10.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile11.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile12.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile13.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile14.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile15.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile16.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile17.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile18.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile19.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile20.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile21.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile22.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile23.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile24.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile25.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile26.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile27.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile28.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile29.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile30.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile31.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile32.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile33.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile34.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile35.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile36.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile37.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile38.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile39.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile40.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile41.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile42.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile43.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile44.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile45.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile46.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile47.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile48.jpg (100%) rename {examples => demos}/embedded/src/main/resources/docroot/tiles/tile49.jpg (100%) rename {examples => demos}/embedded/src/main/resources/etc/keystore.p12 (100%) rename {examples => demos}/embedded/src/main/resources/etc/realm.properties (100%) rename {examples => demos}/embedded/src/main/resources/exampleserver.xml (95%) rename {examples => demos}/embedded/src/main/resources/fileserver.xml (100%) rename {examples => demos}/embedded/src/main/resources/java-util-logging.properties (100%) rename {examples => demos}/embedded/src/main/resources/jetty-logging.properties (100%) rename {examples => demos}/embedded/src/main/resources/logback-access.xml (100%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/AbstractEmbeddedTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/ExampleServerTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/ExampleServerXmlTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/FastFileServerTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/FileServerTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/FileServerXmlTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/JarServerTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/LikeJettyXmlTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/ManyConnectorsTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/ManyContextsTest.java (99%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/ManyHandlersTest.java (99%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/ManyServletContextsTest.java (99%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/MinimalServletsTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/OneConnectorTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/OneContextTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/OneHandlerTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/OneServletContextJmxStatsTest.java (99%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/OneServletContextTest.java (99%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/OneServletContextWithSessionTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/OneWebAppTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/OneWebAppWithJspTest.java (99%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/ProxyServerTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/RewriteServerTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/SecuredHelloHandlerTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/ServerUtil.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/ServerWithAnnotationsTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/ServerWithJMXTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/ServerWithJNDITest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/SimplestServerTest.java (97%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/SplitFileServerTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/WebSocketJsrServerTest.java (98%) rename {examples/embedded/src/test/java/org/eclipse/jetty/embedded => demos/embedded/src/test/java/org/eclipse/jetty/demos}/WebSocketServerTest.java (99%) rename {examples => demos}/embedded/src/test/resources/dir0/test0.txt (100%) rename {examples => demos}/embedded/src/test/resources/dir1/test1.txt (100%) rename {examples => demos}/embedded/src/test/resources/jetty-logging.properties (87%) rename {examples => demos}/embedded/src/test/resources/realm.properties (100%) rename jetty-cdi/src/test/java/org/eclipse/jetty/{embedded => demos}/EmbeddedWeldTest.java (98%) diff --git a/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java b/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/demos/AbstractRestServlet.java similarity index 99% rename from demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java rename to demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/demos/AbstractRestServlet.java index bcf230ac427..aaa37875349 100644 --- a/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java +++ b/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/demos/AbstractRestServlet.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.example.asyncrest; +package org.eclipse.jetty.demos; import java.io.IOException; import java.math.BigDecimal; diff --git a/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java b/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/demos/AsyncRestServlet.java similarity index 99% rename from demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java rename to demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/demos/AsyncRestServlet.java index c89fda2c2bd..d7d0fd0bbc4 100644 --- a/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java +++ b/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/demos/AsyncRestServlet.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.example.asyncrest; +package org.eclipse.jetty.demos; import java.io.IOException; import java.io.PrintWriter; diff --git a/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java b/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/demos/SerialRestServlet.java similarity index 98% rename from demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java rename to demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/demos/SerialRestServlet.java index e7c8bf01590..d6c1f1c315c 100644 --- a/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java +++ b/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/demos/SerialRestServlet.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.example.asyncrest; +package org.eclipse.jetty.demos; import java.io.BufferedReader; import java.io.IOException; diff --git a/demos/demo-async-rest/demo-async-rest-jar/src/main/resources/META-INF/web-fragment.xml b/demos/demo-async-rest/demo-async-rest-jar/src/main/resources/META-INF/web-fragment.xml index db2b21bebc2..d8b4682b92e 100644 --- a/demos/demo-async-rest/demo-async-rest-jar/src/main/resources/META-INF/web-fragment.xml +++ b/demos/demo-async-rest/demo-async-rest-jar/src/main/resources/META-INF/web-fragment.xml @@ -6,21 +6,21 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd" version="3.1"> - SerialRestServlet - SerialRestServlet - org.eclipse.jetty.example.asyncrest.SerialRestServlet - + SerialRestServlet + SerialRestServlet + org.eclipse.jetty.demos.SerialRestServlet + SerialRestServlet /testSerial - - - AsyncRestServlet - AsyncRestServlet - org.eclipse.jetty.example.asyncrest.AsyncRestServlet - true - + + + AsyncRestServlet + AsyncRestServlet + org.eclipse.jetty.demos.AsyncRestServlet + true + AsyncRestServlet /testAsync diff --git a/demos/demo-async-rest/demo-async-rest-server/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServer.java b/demos/demo-async-rest/demo-async-rest-server/src/main/java/org/eclipse/jetty/demos/AsyncRestServer.java similarity index 97% rename from demos/demo-async-rest/demo-async-rest-server/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServer.java rename to demos/demo-async-rest/demo-async-rest-server/src/main/java/org/eclipse/jetty/demos/AsyncRestServer.java index 16dfd619ce1..21f53d88526 100644 --- a/demos/demo-async-rest/demo-async-rest-server/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServer.java +++ b/demos/demo-async-rest/demo-async-rest-server/src/main/java/org/eclipse/jetty/demos/AsyncRestServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.example.asyncrest; +package org.eclipse.jetty.demos; import java.nio.file.FileSystems; import java.nio.file.Files; diff --git a/examples/embedded/pom.xml b/demos/embedded/pom.xml similarity index 94% rename from examples/embedded/pom.xml rename to demos/embedded/pom.xml index 987c28ebc50..c0cb677a0e6 100644 --- a/examples/embedded/pom.xml +++ b/demos/embedded/pom.xml @@ -1,15 +1,13 @@ - org.eclipse.jetty.examples - examples-parent + org.eclipse.jetty.demos + demos-parent 10.0.0-SNAPSHOT - ../pom.xml 4.0.0 - org.eclipse.jetty - example-jetty-embedded - Example :: Jetty Embedded - Jetty Embedded Examples + demos-jetty-embedded + Demos :: Jetty Embedded + Jetty Embedded Demos http://www.eclipse.org/jetty ${project.groupId}.embedded diff --git a/examples/embedded/prodDb.properties b/demos/embedded/prodDb.properties similarity index 100% rename from examples/embedded/prodDb.properties rename to demos/embedded/prodDb.properties diff --git a/examples/embedded/prodDb.script b/demos/embedded/prodDb.script similarity index 100% rename from examples/embedded/prodDb.script rename to demos/embedded/prodDb.script diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/AsyncEchoServlet.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/AsyncEchoServlet.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/AsyncEchoServlet.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/AsyncEchoServlet.java index 603d9313023..06566a8e637 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/AsyncEchoServlet.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/AsyncEchoServlet.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/DumpServlet.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/DumpServlet.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/DumpServlet.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/DumpServlet.java index f01c7da8756..639969547b2 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/DumpServlet.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/DumpServlet.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.IOException; import java.io.PrintWriter; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleServer.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ExampleServer.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleServer.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/ExampleServer.java index 538c06486fb..915863f48b6 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleServer.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ExampleServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleServerXml.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ExampleServerXml.java similarity index 97% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleServerXml.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/ExampleServerXml.java index ce4c6eb4662..b71f3eaa892 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleServerXml.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ExampleServerXml.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.resource.Resource; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleUtil.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ExampleUtil.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleUtil.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/ExampleUtil.java index b50e27dea11..99bd72186ac 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleUtil.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ExampleUtil.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import org.eclipse.jetty.util.StringUtil; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/FastFileServer.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/FastFileServer.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/FastFileServer.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/FastFileServer.java index 083dc371140..ec4325f2cf7 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/FastFileServer.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/FastFileServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.File; import java.io.IOException; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/FileServer.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/FileServer.java index fbff826fdd8..ac4f487de0b 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/FileServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/FileServerXml.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/FileServerXml.java index d973cc9573a..92e7882d9f9 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/FileServerXml.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloHandler.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/HelloHandler.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloHandler.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/HelloHandler.java index f424b641125..ae96c7e287d 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloHandler.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/HelloHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.IOException; import java.io.PrintWriter; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloServlet.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/HelloServlet.java similarity index 97% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloServlet.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/HelloServlet.java index 79aadd8b67b..f464a02969a 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloServlet.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/HelloServlet.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.IOException; import javax.servlet.ServletException; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloSessionServlet.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/HelloSessionServlet.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloSessionServlet.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/HelloSessionServlet.java index 4daa4dc78aa..ba6c2fb837a 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloSessionServlet.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/HelloSessionServlet.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.IOException; import java.io.PrintWriter; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloWorld.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/HelloWorld.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloWorld.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/HelloWorld.java index 2554591fc99..739f7b9bb9e 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/HelloWorld.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/HelloWorld.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.IOException; import javax.servlet.ServletException; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/Http2Server.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/Http2Server.java index c18551268d1..fce8047ae5e 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/Http2Server.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/JarServer.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/JarServer.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/JarServer.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/JarServer.java index b5b41164869..95d0460c00e 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/JarServer.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/JarServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.FileNotFoundException; import java.nio.file.Files; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/JettyDemoBase.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/JettyDemoBase.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/JettyDemoBase.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/JettyDemoBase.java index bb7f8f9e530..62120e9126d 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/JettyDemoBase.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/JettyDemoBase.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.InputStream; import java.lang.reflect.Method; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/JettyHome.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/JettyHome.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/JettyHome.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/JettyHome.java index 23c6ecf6328..fb4bbdcc20e 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/JettyHome.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/JettyHome.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.nio.file.Files; import java.nio.file.Path; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/LikeJettyXml.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/LikeJettyXml.java index 630ae031a88..344f73f2995 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/LikeJettyXml.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.FileNotFoundException; import java.lang.management.ManagementFactory; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ManyConnectors.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/ManyConnectors.java index 40d4f1c2e34..28a93a9c33f 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ManyConnectors.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.FileNotFoundException; import java.nio.file.Files; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ManyContexts.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/ManyContexts.java index d68a7d3d00e..99dad85dfe8 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ManyContexts.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ContextHandler; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ManyHandlers.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/ManyHandlers.java index 58df808147d..ccf620aca8b 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ManyHandlers.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.File; import java.io.IOException; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyServletContexts.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ManyServletContexts.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyServletContexts.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/ManyServletContexts.java index c68ea874575..824fabb404e 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyServletContexts.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ManyServletContexts.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.lang.management.ManagementFactory; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/MinimalServlets.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/MinimalServlets.java index 3dcf2d53729..302961c579e 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/MinimalServlets.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.IOException; import javax.servlet.http.HttpServlet; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneConnector.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneConnector.java similarity index 97% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneConnector.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/OneConnector.java index 19af0927086..468508b236e 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneConnector.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneConnector.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneContext.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneContext.java similarity index 97% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneContext.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/OneContext.java index 2596f0264d9..4da50b74d99 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneContext.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneContext.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ContextHandler; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneHandler.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneHandler.java similarity index 97% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneHandler.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/OneHandler.java index 35515f0aff9..feab38dcbde 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneHandler.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import org.eclipse.jetty.server.Server; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContext.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneServletContext.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContext.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/OneServletContext.java index b97ee20dbd7..c84afb237bd 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContext.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneServletContext.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.IOException; import java.nio.file.Path; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContextJmxStats.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneServletContextJmxStats.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContextJmxStats.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/OneServletContextJmxStats.java index 0e2544c5913..64948c37229 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContextJmxStats.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneServletContextJmxStats.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.lang.management.ManagementFactory; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContextWithSession.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneServletContextWithSession.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContextWithSession.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/OneServletContextWithSession.java index e3d296ef8b7..fb70803e02c 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContextWithSession.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneServletContextWithSession.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneWebApp.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/OneWebApp.java index da2d64b827e..67f0af34cbf 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneWebApp.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.File; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebAppWithJsp.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneWebAppWithJsp.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebAppWithJsp.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/OneWebAppWithJsp.java index 3f093c9a722..46286a138a8 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebAppWithJsp.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/OneWebAppWithJsp.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.FileNotFoundException; import java.net.URL; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ProxyServer.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ProxyServer.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/ProxyServer.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/ProxyServer.java index 8eb6ea2a77f..6aa53a216da 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ProxyServer.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ProxyServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import org.eclipse.jetty.proxy.ConnectHandler; import org.eclipse.jetty.proxy.ProxyServlet; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/RewriteServer.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/RewriteServer.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/RewriteServer.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/RewriteServer.java index 397c545ef31..11167dbcd78 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/RewriteServer.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/RewriteServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.util.Arrays; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/SecuredHelloHandler.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/SecuredHelloHandler.java index df9dacad272..660a13e19de 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/SecuredHelloHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.FileNotFoundException; import java.net.URL; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ServerWithAnnotations.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/ServerWithAnnotations.java index 93ef314e3e0..53ffe108ab7 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ServerWithAnnotations.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.File; import java.io.FileNotFoundException; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJMX.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ServerWithJMX.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJMX.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/ServerWithJMX.java index 6062182684a..4a4c06474fe 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJMX.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ServerWithJMX.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.lang.management.ManagementFactory; import java.net.MalformedURLException; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJNDI.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ServerWithJNDI.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJNDI.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/ServerWithJNDI.java index 8dd94ed7580..9d9d50d63cc 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJNDI.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/ServerWithJNDI.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.nio.file.Path; import java.util.Properties; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/SimplestServer.java similarity index 97% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/SimplestServer.java index 74f3aa0cb14..248a7b2db77 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/SimplestServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import org.eclipse.jetty.server.Server; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SplitFileServer.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/SplitFileServer.java similarity index 99% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/SplitFileServer.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/SplitFileServer.java index b67ce5300f4..866319e6ee2 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SplitFileServer.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/SplitFileServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.nio.file.Paths; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/WebSocketJsrServer.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/WebSocketJsrServer.java index 26fa623cdbe..31213b8e304 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/WebSocketJsrServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import javax.websocket.OnMessage; import javax.websocket.Session; diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketServer.java b/demos/embedded/src/main/java/org/eclipse/jetty/demos/WebSocketServer.java similarity index 98% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketServer.java rename to demos/embedded/src/main/java/org/eclipse/jetty/demos/WebSocketServer.java index 8b5d3a34ad3..6ad833427b4 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketServer.java +++ b/demos/embedded/src/main/java/org/eclipse/jetty/demos/WebSocketServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; diff --git a/examples/embedded/src/main/other/content.jar b/demos/embedded/src/main/other/content.jar similarity index 100% rename from examples/embedded/src/main/other/content.jar rename to demos/embedded/src/main/other/content.jar diff --git a/examples/embedded/src/main/resources/docroot/push.html b/demos/embedded/src/main/resources/docroot/push.html similarity index 100% rename from examples/embedded/src/main/resources/docroot/push.html rename to demos/embedded/src/main/resources/docroot/push.html diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile00.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile00.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile00.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile00.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile01.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile01.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile01.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile01.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile02.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile02.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile02.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile02.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile03.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile03.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile03.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile03.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile04.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile04.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile04.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile04.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile05.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile05.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile05.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile05.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile06.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile06.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile06.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile06.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile07.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile07.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile07.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile07.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile08.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile08.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile08.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile08.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile09.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile09.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile09.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile09.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile10.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile10.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile10.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile10.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile11.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile11.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile11.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile11.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile12.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile12.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile12.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile12.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile13.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile13.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile13.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile13.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile14.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile14.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile14.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile14.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile15.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile15.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile15.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile15.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile16.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile16.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile16.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile16.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile17.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile17.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile17.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile17.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile18.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile18.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile18.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile18.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile19.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile19.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile19.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile19.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile20.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile20.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile20.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile20.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile21.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile21.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile21.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile21.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile22.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile22.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile22.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile22.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile23.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile23.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile23.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile23.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile24.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile24.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile24.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile24.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile25.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile25.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile25.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile25.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile26.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile26.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile26.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile26.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile27.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile27.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile27.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile27.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile28.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile28.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile28.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile28.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile29.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile29.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile29.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile29.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile30.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile30.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile30.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile30.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile31.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile31.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile31.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile31.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile32.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile32.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile32.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile32.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile33.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile33.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile33.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile33.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile34.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile34.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile34.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile34.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile35.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile35.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile35.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile35.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile36.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile36.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile36.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile36.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile37.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile37.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile37.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile37.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile38.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile38.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile38.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile38.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile39.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile39.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile39.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile39.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile40.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile40.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile40.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile40.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile41.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile41.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile41.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile41.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile42.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile42.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile42.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile42.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile43.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile43.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile43.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile43.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile44.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile44.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile44.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile44.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile45.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile45.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile45.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile45.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile46.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile46.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile46.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile46.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile47.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile47.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile47.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile47.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile48.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile48.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile48.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile48.jpg diff --git a/examples/embedded/src/main/resources/docroot/pushed/tile49.jpg b/demos/embedded/src/main/resources/docroot/pushed/tile49.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/pushed/tile49.jpg rename to demos/embedded/src/main/resources/docroot/pushed/tile49.jpg diff --git a/examples/embedded/src/main/resources/docroot/readme.txt b/demos/embedded/src/main/resources/docroot/readme.txt similarity index 100% rename from examples/embedded/src/main/resources/docroot/readme.txt rename to demos/embedded/src/main/resources/docroot/readme.txt diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile00.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile00.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile00.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile00.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile01.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile01.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile01.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile01.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile02.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile02.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile02.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile02.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile03.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile03.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile03.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile03.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile04.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile04.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile04.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile04.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile05.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile05.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile05.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile05.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile06.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile06.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile06.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile06.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile07.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile07.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile07.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile07.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile08.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile08.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile08.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile08.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile09.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile09.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile09.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile09.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile10.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile10.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile10.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile10.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile11.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile11.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile11.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile11.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile12.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile12.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile12.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile12.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile13.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile13.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile13.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile13.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile14.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile14.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile14.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile14.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile15.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile15.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile15.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile15.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile16.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile16.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile16.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile16.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile17.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile17.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile17.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile17.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile18.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile18.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile18.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile18.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile19.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile19.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile19.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile19.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile20.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile20.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile20.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile20.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile21.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile21.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile21.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile21.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile22.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile22.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile22.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile22.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile23.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile23.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile23.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile23.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile24.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile24.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile24.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile24.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile25.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile25.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile25.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile25.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile26.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile26.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile26.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile26.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile27.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile27.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile27.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile27.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile28.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile28.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile28.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile28.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile29.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile29.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile29.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile29.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile30.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile30.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile30.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile30.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile31.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile31.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile31.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile31.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile32.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile32.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile32.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile32.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile33.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile33.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile33.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile33.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile34.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile34.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile34.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile34.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile35.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile35.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile35.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile35.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile36.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile36.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile36.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile36.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile37.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile37.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile37.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile37.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile38.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile38.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile38.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile38.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile39.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile39.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile39.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile39.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile40.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile40.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile40.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile40.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile41.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile41.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile41.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile41.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile42.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile42.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile42.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile42.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile43.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile43.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile43.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile43.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile44.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile44.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile44.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile44.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile45.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile45.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile45.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile45.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile46.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile46.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile46.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile46.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile47.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile47.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile47.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile47.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile48.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile48.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile48.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile48.jpg diff --git a/examples/embedded/src/main/resources/docroot/tiles/tile49.jpg b/demos/embedded/src/main/resources/docroot/tiles/tile49.jpg similarity index 100% rename from examples/embedded/src/main/resources/docroot/tiles/tile49.jpg rename to demos/embedded/src/main/resources/docroot/tiles/tile49.jpg diff --git a/examples/embedded/src/main/resources/etc/keystore.p12 b/demos/embedded/src/main/resources/etc/keystore.p12 similarity index 100% rename from examples/embedded/src/main/resources/etc/keystore.p12 rename to demos/embedded/src/main/resources/etc/keystore.p12 diff --git a/examples/embedded/src/main/resources/etc/realm.properties b/demos/embedded/src/main/resources/etc/realm.properties similarity index 100% rename from examples/embedded/src/main/resources/etc/realm.properties rename to demos/embedded/src/main/resources/etc/realm.properties diff --git a/examples/embedded/src/main/resources/exampleserver.xml b/demos/embedded/src/main/resources/exampleserver.xml similarity index 95% rename from examples/embedded/src/main/resources/exampleserver.xml rename to demos/embedded/src/main/resources/exampleserver.xml index d480f86e163..c7258dddb20 100644 --- a/examples/embedded/src/main/resources/exampleserver.xml +++ b/demos/embedded/src/main/resources/exampleserver.xml @@ -19,7 +19,7 @@ /hello - org.eclipse.jetty.embedded.HelloServlet + org.eclipse.jetty.demos.HelloServlet / diff --git a/examples/embedded/src/main/resources/fileserver.xml b/demos/embedded/src/main/resources/fileserver.xml similarity index 100% rename from examples/embedded/src/main/resources/fileserver.xml rename to demos/embedded/src/main/resources/fileserver.xml diff --git a/examples/embedded/src/main/resources/java-util-logging.properties b/demos/embedded/src/main/resources/java-util-logging.properties similarity index 100% rename from examples/embedded/src/main/resources/java-util-logging.properties rename to demos/embedded/src/main/resources/java-util-logging.properties diff --git a/examples/embedded/src/main/resources/jetty-logging.properties b/demos/embedded/src/main/resources/jetty-logging.properties similarity index 100% rename from examples/embedded/src/main/resources/jetty-logging.properties rename to demos/embedded/src/main/resources/jetty-logging.properties diff --git a/examples/embedded/src/main/resources/logback-access.xml b/demos/embedded/src/main/resources/logback-access.xml similarity index 100% rename from examples/embedded/src/main/resources/logback-access.xml rename to demos/embedded/src/main/resources/logback-access.xml diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/AbstractEmbeddedTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/AbstractEmbeddedTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/AbstractEmbeddedTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/AbstractEmbeddedTest.java index c5ab238f365..aa0737e0dd0 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/AbstractEmbeddedTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/AbstractEmbeddedTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.ContentResponse; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ExampleServerTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ExampleServerTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/ExampleServerTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/ExampleServerTest.java index c1ef6421593..970a0836fcd 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ExampleServerTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ExampleServerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ExampleServerXmlTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ExampleServerXmlTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/ExampleServerXmlTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/ExampleServerXmlTest.java index d3eb56ad671..e4b8f398d95 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ExampleServerXmlTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ExampleServerXmlTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/FastFileServerTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/FastFileServerTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/FastFileServerTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/FastFileServerTest.java index 683a1905776..e0b0c7e243d 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/FastFileServerTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/FastFileServerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.BufferedWriter; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/FileServerTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/FileServerTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/FileServerTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/FileServerTest.java index e16a401ca90..df315c3c015 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/FileServerTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/FileServerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.BufferedWriter; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/FileServerXmlTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/FileServerXmlTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/FileServerXmlTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/FileServerXmlTest.java index 51c996fdf3f..ee0ce81b9f4 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/FileServerXmlTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/FileServerXmlTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.BufferedWriter; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/JarServerTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/JarServerTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/JarServerTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/JarServerTest.java index d7c0ad8a72b..8e75b58090a 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/JarServerTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/JarServerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/LikeJettyXmlTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/LikeJettyXmlTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/LikeJettyXmlTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/LikeJettyXmlTest.java index dead1f52d84..835099f2664 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/LikeJettyXmlTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/LikeJettyXmlTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; import java.util.Map; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ManyConnectorsTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ManyConnectorsTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/ManyConnectorsTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/ManyConnectorsTest.java index d8cca4079bc..8cc5657d76d 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ManyConnectorsTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ManyConnectorsTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; import java.util.Map; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ManyContextsTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ManyContextsTest.java similarity index 99% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/ManyContextsTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/ManyContextsTest.java index 7d580d2604a..d35955fc4b5 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ManyContextsTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ManyContextsTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ManyHandlersTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ManyHandlersTest.java similarity index 99% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/ManyHandlersTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/ManyHandlersTest.java index 6b0b2d7fa24..75513691165 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ManyHandlersTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ManyHandlersTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; import java.util.Map; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ManyServletContextsTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ManyServletContextsTest.java similarity index 99% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/ManyServletContextsTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/ManyServletContextsTest.java index 396e82c64c9..2505b0ef0ed 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ManyServletContextsTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ManyServletContextsTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/MinimalServletsTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/MinimalServletsTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/MinimalServletsTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/MinimalServletsTest.java index 64c3155dfec..603f4032664 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/MinimalServletsTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/MinimalServletsTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneConnectorTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneConnectorTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneConnectorTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/OneConnectorTest.java index 88611297d61..2be4a6ec065 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneConnectorTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneConnectorTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneContextTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneContextTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneContextTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/OneContextTest.java index 429fb9105e4..2aacd936ec6 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneContextTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneContextTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneHandlerTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneHandlerTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneHandlerTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/OneHandlerTest.java index 00ee7605f47..66a30968f63 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneHandlerTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneHandlerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneServletContextJmxStatsTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneServletContextJmxStatsTest.java similarity index 99% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneServletContextJmxStatsTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/OneServletContextJmxStatsTest.java index 8bc3b888b57..4eb8c2c0c0a 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneServletContextJmxStatsTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneServletContextJmxStatsTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; import java.util.Set; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneServletContextTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneServletContextTest.java similarity index 99% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneServletContextTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/OneServletContextTest.java index 9e798db358f..6689720ba08 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneServletContextTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneServletContextTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.BufferedWriter; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneServletContextWithSessionTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneServletContextWithSessionTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneServletContextWithSessionTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/OneServletContextWithSessionTest.java index d8359ba3d39..921644e58bf 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneServletContextWithSessionTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneServletContextWithSessionTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.io.BufferedWriter; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppTest.java index 9140f3d50b5..174c43b3aa0 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppWithJspTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppWithJspTest.java similarity index 99% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppWithJspTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppWithJspTest.java index bef56be5ce4..1e5735a0bc6 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppWithJspTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/OneWebAppWithJspTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ProxyServerTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ProxyServerTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/ProxyServerTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/ProxyServerTest.java index 703f6b8e983..77f71e366b5 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ProxyServerTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ProxyServerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/RewriteServerTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/RewriteServerTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/RewriteServerTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/RewriteServerTest.java index 9048f2fc0b9..e78d67b60c5 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/RewriteServerTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/RewriteServerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/SecuredHelloHandlerTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/SecuredHelloHandlerTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/SecuredHelloHandlerTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/SecuredHelloHandlerTest.java index 92bec6ec4dd..fc7b3118460 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/SecuredHelloHandlerTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/SecuredHelloHandlerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; import java.util.Base64; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerUtil.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerUtil.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerUtil.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerUtil.java index 34baaff3995..6fd31f6a349 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerUtil.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerUtil.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.util.HashMap; import java.util.Map; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithAnnotationsTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithAnnotationsTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithAnnotationsTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithAnnotationsTest.java index 7135fa73989..c0b2bf39a44 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithAnnotationsTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithAnnotationsTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithJMXTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithJMXTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithJMXTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithJMXTest.java index da1a02a59bb..1bab334da7b 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithJMXTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithJMXTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.util.Optional; import java.util.Set; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithJNDITest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithJNDITest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithJNDITest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithJNDITest.java index f25171f0018..e806ad9da7b 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithJNDITest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithJNDITest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/SimplestServerTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/SimplestServerTest.java similarity index 97% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/SimplestServerTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/SimplestServerTest.java index 563532e9cbc..ca434391988 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/SimplestServerTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/SimplestServerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/SplitFileServerTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/SplitFileServerTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/SplitFileServerTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/SplitFileServerTest.java index c7322dcded5..b5b16c2f5d0 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/SplitFileServerTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/SplitFileServerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; import java.nio.file.Path; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJsrServerTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/WebSocketJsrServerTest.java similarity index 98% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJsrServerTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/WebSocketJsrServerTest.java index 4ee58f65fbc..6cb26ecebeb 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJsrServerTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/WebSocketJsrServerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; import java.util.concurrent.LinkedBlockingQueue; diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketServerTest.java b/demos/embedded/src/test/java/org/eclipse/jetty/demos/WebSocketServerTest.java similarity index 99% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketServerTest.java rename to demos/embedded/src/test/java/org/eclipse/jetty/demos/WebSocketServerTest.java index 4e80855d51d..b9b40a93890 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketServerTest.java +++ b/demos/embedded/src/test/java/org/eclipse/jetty/demos/WebSocketServerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.embedded; +package org.eclipse.jetty.demos; import java.net.URI; import java.time.Duration; diff --git a/examples/embedded/src/test/resources/dir0/test0.txt b/demos/embedded/src/test/resources/dir0/test0.txt similarity index 100% rename from examples/embedded/src/test/resources/dir0/test0.txt rename to demos/embedded/src/test/resources/dir0/test0.txt diff --git a/examples/embedded/src/test/resources/dir1/test1.txt b/demos/embedded/src/test/resources/dir1/test1.txt similarity index 100% rename from examples/embedded/src/test/resources/dir1/test1.txt rename to demos/embedded/src/test/resources/dir1/test1.txt diff --git a/examples/embedded/src/test/resources/jetty-logging.properties b/demos/embedded/src/test/resources/jetty-logging.properties similarity index 87% rename from examples/embedded/src/test/resources/jetty-logging.properties rename to demos/embedded/src/test/resources/jetty-logging.properties index 36c6146e919..280f2283562 100644 --- a/examples/embedded/src/test/resources/jetty-logging.properties +++ b/demos/embedded/src/test/resources/jetty-logging.properties @@ -1,6 +1,6 @@ # Jetty Logging using jetty-slf4j-impl org.eclipse.jetty.LEVEL=INFO -org.eclipse.jetty.embedded.JettyHome.LEVEL=DEBUG +org.eclipse.jetty.demos.JettyHome.LEVEL=DEBUG #org.eclipse.jetty.STACKS=true #org.eclipse.jetty.STACKS=false #org.eclipse.jetty.io.LEVEL=DEBUG diff --git a/examples/embedded/src/test/resources/realm.properties b/demos/embedded/src/test/resources/realm.properties similarity index 100% rename from examples/embedded/src/test/resources/realm.properties rename to demos/embedded/src/test/resources/realm.properties diff --git a/demos/pom.xml b/demos/pom.xml index 82c5ae0d787..7db7c41ca72 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -23,5 +23,6 @@ demo-jetty-webapp demo-proxy-webapp demo-spec-webapp + embedded diff --git a/jetty-cdi/src/test/java/org/eclipse/jetty/embedded/EmbeddedWeldTest.java b/jetty-cdi/src/test/java/org/eclipse/jetty/demos/EmbeddedWeldTest.java similarity index 98% rename from jetty-cdi/src/test/java/org/eclipse/jetty/embedded/EmbeddedWeldTest.java rename to jetty-cdi/src/test/java/org/eclipse/jetty/demos/EmbeddedWeldTest.java index 567e928e2c1..b4879693447 100644 --- a/jetty-cdi/src/test/java/org/eclipse/jetty/embedded/EmbeddedWeldTest.java +++ b/jetty-cdi/src/test/java/org/eclipse/jetty/demos/EmbeddedWeldTest.java @@ -40,13 +40,10 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.annotations.AnnotationConfiguration; import org.eclipse.jetty.cdi.CdiConfiguration; -import org.eclipse.jetty.cdi.CdiServletContainerInitializer; import org.eclipse.jetty.server.LocalConnector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ListenerHolder; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.webapp.Configuration; -import org.eclipse.jetty.webapp.JettyWebXmlConfiguration; import org.eclipse.jetty.webapp.WebAppContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/jetty-documentation/src/main/asciidoc/operations-guide/old_docs/logging/dump-tool.adoc b/jetty-documentation/src/main/asciidoc/operations-guide/old_docs/logging/dump-tool.adoc index e2de8e785ad..3af7274f28a 100644 --- a/jetty-documentation/src/main/asciidoc/operations-guide/old_docs/logging/dump-tool.adoc +++ b/jetty-documentation/src/main/asciidoc/operations-guide/old_docs/logging/dump-tool.adoc @@ -19,8 +19,8 @@ [[jetty-dump-tool]] === Jetty Dump Tool -The dump feature in Jetty provides a good snapshot of the status of the threadpool, select sets, classloaders, and so forth. -To get maximum detail from the dump, you need to `setDetailDump(true)` on any `QueuedThreadPools` you are using. +The dump feature in Jetty provides a good snapshot of the status of the threadpool, select sets, classloaders, and so forth. +To get maximum detail from the dump, you need to `setDetailDump(true)` on any `QueuedThreadPools` you are using. You can do this by a direct call if you are embedding Jetty, or in `jetty.xml`. [[configuring-dump-feature]] @@ -229,9 +229,9 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING | | | | | | | +- 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 - | | | | | | += SerialRestServlet@461411d==org.eclipse.jetty.example.asyncrest.SerialRestServlet,-1,false - STARTED + | | | | | | += SerialRestServlet@461411d==SerialRestServlet,-1,false - STARTED | | | | | | +- [/testSerial]=>SerialRestServlet - | | | | | | += AsyncRestServlet@73eb9bd5==org.eclipse.jetty.example.asyncrest.AsyncRestServlet,-1,false - STARTED + | | | | | | += AsyncRestServlet@73eb9bd5==AsyncRestServlet,-1,false - STARTED | | | | | | +- [/testAsync]=>AsyncRestServlet | | | | | | +~ org.eclipse.jetty.jmx.MBeanContainer@644a5ddd | | | | | +~ org.eclipse.jetty.jmx.MBeanContainer@644a5ddd @@ -728,9 +728,9 @@ org.eclipse.jetty.server.Server@76f08fe1 - STARTING | +- org.eclipse.jetty.servlet.ErrorPageErrorHandler@321f8d38=org.eclipse.jetty.servlet:context=xref-proxy,type=errorpageerrorhandler,id=0 | +- org.eclipse.jetty.server.handler.ResourceHandler@8f9c8a7=org.eclipse.jetty.server.handler:context=javadoc,type=resourcehandler,id=0 | +- CGI@10465==org.eclipse.jetty.servlets.CGI,1,true=org.eclipse.jetty.servlet:context=test,type=servletholder,name=CGI,id=0 - | +- SerialRestServlet@461411d==org.eclipse.jetty.example.asyncrest.SerialRestServlet,-1,false=org.eclipse.jetty.servlet:context=async-rest,type=servletholder,name=SerialRestServlet,id=0 + | +- SerialRestServlet@461411d==SerialRestServlet,-1,false=org.eclipse.jetty.servlet:context=async-rest,type=servletholder,name=SerialRestServlet,id=0 | +- HashLoginService[Test Realm]=org.eclipse.jetty.security:type=hashloginservice,id=0 - | +- AsyncRestServlet@73eb9bd5==org.eclipse.jetty.example.asyncrest.AsyncRestServlet,-1,false=org.eclipse.jetty.servlet:context=async-rest,type=servletholder,name=AsyncRestServlet,id=0 + | +- AsyncRestServlet@73eb9bd5==AsyncRestServlet,-1,false=org.eclipse.jetty.servlet:context=async-rest,type=servletholder,name=AsyncRestServlet,id=0 | +- org.eclipse.jetty.server.Server@76f08fe1=org.eclipse.jetty.server:type=server,id=0 | +- org.eclipse.jetty.servlet.ErrorPageErrorHandler@3c41a9ce=org.eclipse.jetty.servlet:context=ROOT,type=errorpageerrorhandler,id=0 | +- [/apidocs/*]=>JavadocTransparentProxy=org.eclipse.jetty.servlet:context=xref-proxy,type=servletmapping,name=JavadocTransparentProxy,id=0 diff --git a/jetty-documentation/src/main/asciidoc/operations-guide/old_docs/logging/jetty-server-dump.adoc b/jetty-documentation/src/main/asciidoc/operations-guide/old_docs/logging/jetty-server-dump.adoc index 1b830b2bb77..736d31e1ee3 100644 --- a/jetty-documentation/src/main/asciidoc/operations-guide/old_docs/logging/jetty-server-dump.adoc +++ b/jetty-documentation/src/main/asciidoc/operations-guide/old_docs/logging/jetty-server-dump.adoc @@ -172,25 +172,25 @@ Server@59906517{STARTED}[9.4.32-SNAPSHOT] - STARTED | += org.eclipse.jetty.server.session.SessionHandler1089504328==dftMaxIdleSec=-1 - STARTED | | += ServletHandler@516be40f{STARTED} - STARTED | | | +> listeners ServletHandler@516be40f{STARTED} size=2 -| | | | +> ListenerHolder@3c0a50da{STARTED}: org.eclipse.jetty.embedded.OneServletContext$InitListener - STARTED -| | | | +> ListenerHolder@646be2c3{STARTED}: org.eclipse.jetty.embedded.OneServletContext$RequestListener - STARTED +| | | | +> ListenerHolder@3c0a50da{STARTED}: org.eclipse.jetty.demos.OneServletContext$InitListener - STARTED +| | | | +> ListenerHolder@646be2c3{STARTED}: org.eclipse.jetty.demos.OneServletContext$RequestListener - STARTED | | | +> filters ServletHandler@516be40f{STARTED} size=2 -| | | | +> org.eclipse.jetty.embedded.OneServletContext$TestFilter-e874448@e874448==org.eclipse.jetty.embedded.OneServletContext$TestFilter,inst=true,async=true - STARTED -| | | | | +> org.eclipse.jetty.embedded.OneServletContext$TestFilter@797badd3 -| | | | +> org.eclipse.jetty.embedded.OneServletContext$TestFilter-60285225@60285225==org.eclipse.jetty.embedded.OneServletContext$TestFilter,inst=true,async=true - STARTED -| | | | +> org.eclipse.jetty.embedded.OneServletContext$TestFilter@77be656f +| | | | +> org.eclipse.jetty.demos.OneServletContext$TestFilter-e874448@e874448==org.eclipse.jetty.demos.OneServletContext$TestFilter,inst=true,async=true - STARTED +| | | | | +> org.eclipse.jetty.demos.OneServletContext$TestFilter@797badd3 +| | | | +> org.eclipse.jetty.demos.OneServletContext$TestFilter-60285225@60285225==org.eclipse.jetty.demos.OneServletContext$TestFilter,inst=true,async=true - STARTED +| | | | +> org.eclipse.jetty.demos.OneServletContext$TestFilter@77be656f | | | +> filterMappings ServletHandler@516be40f{STARTED} size=2 -| | | | +> [/test/*]/[]/[REQUEST]=>org.eclipse.jetty.embedded.OneServletContext$TestFilter-e874448 -| | | | +> [*.test]/[]/[ASYNC, REQUEST]=>org.eclipse.jetty.embedded.OneServletContext$TestFilter-60285225 +| | | | +> [/test/*]/[]/[REQUEST]=>org.eclipse.jetty.demos.OneServletContext$TestFilter-e874448 +| | | | +> [*.test]/[]/[ASYNC, REQUEST]=>org.eclipse.jetty.demos.OneServletContext$TestFilter-60285225 | | | +> servlets ServletHandler@516be40f{STARTED} size=3 -| | | | +> org.eclipse.jetty.embedded.HelloServlet-58c1670b@d20bf05b==org.eclipse.jetty.embedded.HelloServlet,jsp=null,order=-1,inst=false,async=true - STARTED -| | | | | +> class org.eclipse.jetty.embedded.HelloServlet -| | | | +> debug@5b09653==org.eclipse.jetty.embedded.DumpServlet,jsp=null,order=-1,inst=false,async=true - STARTED -| | | | | +> class org.eclipse.jetty.embedded.DumpServlet +| | | | +> org.eclipse.jetty.demos.HelloServlet-58c1670b@d20bf05b==org.eclipse.jetty.demos.HelloServlet,jsp=null,order=-1,inst=false,async=true - STARTED +| | | | | +> class org.eclipse.jetty.demos.HelloServlet +| | | | +> debug@5b09653==org.eclipse.jetty.demos.DumpServlet,jsp=null,order=-1,inst=false,async=true - STARTED +| | | | | +> class org.eclipse.jetty.demos.DumpServlet | | | | +> org.eclipse.jetty.servlet.DefaultServlet-6b9651f3@8eb381d1==org.eclipse.jetty.servlet.DefaultServlet,jsp=null,order=-1,inst=true,async=true - STARTED | | | | +> org.eclipse.jetty.servlet.DefaultServlet@78a2da20 | | | +> servletMappings ServletHandler@516be40f{STARTED} size=4 -| | | +> [/hello/*]=>org.eclipse.jetty.embedded.HelloServlet-58c1670b +| | | +> [/hello/*]=>org.eclipse.jetty.demos.HelloServlet-58c1670b | | | +> [/dump/*]=>debug | | | +> [*.dump]=>debug | | | +> [/]=>org.eclipse.jetty.servlet.DefaultServlet-6b9651f3 @@ -199,8 +199,8 @@ Server@59906517{STARTED}[9.4.32-SNAPSHOT] - STARTED | | +~ DefaultSessionIdManager@58fdd99{STARTED}[worker=node0] - STARTED | +> No ClassLoader | +> eventListeners o.e.j.s.ServletContextHandler@3ffcd140{/,file:///tmp/,AVAILABLE} size=2 -| | +> org.eclipse.jetty.embedded.OneServletContext$InitListener@6b1274d2 -| | +> org.eclipse.jetty.embedded.OneServletContext$RequestListener@7bc1a03d +| | +> org.eclipse.jetty.demos.OneServletContext$InitListener@6b1274d2 +| | +> org.eclipse.jetty.demos.OneServletContext$RequestListener@7bc1a03d | +> handler attributes o.e.j.s.ServletContextHandler@3ffcd140{/,file:///tmp/,AVAILABLE} size=1 | | +> org.eclipse.jetty.server.Executor=QueuedThreadPool[qtp488044861]@1d16f93d{STARTED,8<=8<=200,i=2,r=4,q=0}[ReservedThreadExecutor@16267862{s=2/4,p=0}] | +> context attributes o.e.j.s.ServletContextHandler@3ffcd140{/,file:///tmp/,AVAILABLE} size=2 diff --git a/jetty-documentation/src/main/asciidoc/programming-guide/old_docs/embedding/jetty-helloworld.adoc b/jetty-documentation/src/main/asciidoc/programming-guide/old_docs/embedding/jetty-helloworld.adoc index 8ff53ec770d..ea7990c541d 100644 --- a/jetty-documentation/src/main/asciidoc/programming-guide/old_docs/embedding/jetty-helloworld.adoc +++ b/jetty-documentation/src/main/asciidoc/programming-guide/old_docs/embedding/jetty-helloworld.adoc @@ -79,7 +79,7 @@ The following command runs the HelloWorld example: [source, screen, subs="{sub-order}"] .... -> java -cp classes:jetty-all-uber.jar org.eclipse.jetty.embedded.HelloWorld +> java -cp classes:jetty-all-uber.jar org.eclipse.jetty.demos.HelloWorld .... You can now point your browser at http://localhost:8080/[http://localhost:8080] to see your hello world page. diff --git a/pom.xml b/pom.xml index ab68010695e..23592b2c1ed 100644 --- a/pom.xml +++ b/pom.xml @@ -131,9 +131,7 @@ jetty-hazelcast jetty-unixsocket tests - examples jetty-quickstart - jetty-runner jetty-http-spi jetty-osgi