diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 502eba080c3..8481ab2313f 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -101,7 +101,7 @@ war true ** - ${assembly-directory}/webapps.demo + ${assembly-directory}/demo/webapps test.war @@ -111,7 +111,7 @@ war true ** - ${assembly-directory}/webapps.demo + ${assembly-directory}/demo/webapps test-jaas.war @@ -121,7 +121,7 @@ war true ** - ${assembly-directory}/webapps.demo + ${assembly-directory}/demo/webapps test-jndi.war @@ -131,7 +131,7 @@ war true ** - ${assembly-directory}/webapps.demo + ${assembly-directory}/demo/webapps test-spec.war @@ -141,7 +141,7 @@ war true ** - ${assembly-directory}/webapps.demo + ${assembly-directory}/demo/webapps xref-proxy.war @@ -151,7 +151,7 @@ war true ** - ${assembly-directory}/webapps.demo + ${assembly-directory}/demo/webapps async-rest.war @@ -223,6 +223,7 @@ ${assembly-directory} + META-INF/** @@ -244,6 +245,7 @@ ${assembly-directory} + META-INF/** @@ -265,6 +267,7 @@ ${assembly-directory} + META-INF/** @@ -286,6 +289,7 @@ ${assembly-directory} + META-INF/** diff --git a/jetty-distribution/src/main/resources/webapps.demo/README.TXT b/jetty-distribution/src/main/resources/demo/webapps/README.TXT similarity index 100% rename from jetty-distribution/src/main/resources/webapps.demo/README.TXT rename to jetty-distribution/src/main/resources/demo/webapps/README.TXT diff --git a/jetty-distribution/src/main/resources/webapps.demo/ROOT/images/jetty-header.jpg b/jetty-distribution/src/main/resources/demo/webapps/ROOT/images/jetty-header.jpg similarity index 100% rename from jetty-distribution/src/main/resources/webapps.demo/ROOT/images/jetty-header.jpg rename to jetty-distribution/src/main/resources/demo/webapps/ROOT/images/jetty-header.jpg diff --git a/jetty-distribution/src/main/resources/webapps.demo/ROOT/images/webtide_logo.jpg b/jetty-distribution/src/main/resources/demo/webapps/ROOT/images/webtide_logo.jpg similarity index 100% rename from jetty-distribution/src/main/resources/webapps.demo/ROOT/images/webtide_logo.jpg rename to jetty-distribution/src/main/resources/demo/webapps/ROOT/images/webtide_logo.jpg diff --git a/jetty-distribution/src/main/resources/webapps.demo/ROOT/index.html b/jetty-distribution/src/main/resources/demo/webapps/ROOT/index.html similarity index 100% rename from jetty-distribution/src/main/resources/webapps.demo/ROOT/index.html rename to jetty-distribution/src/main/resources/demo/webapps/ROOT/index.html diff --git a/jetty-distribution/src/main/resources/webapps.demo/ROOT/jetty.css b/jetty-distribution/src/main/resources/demo/webapps/ROOT/jetty.css similarity index 100% rename from jetty-distribution/src/main/resources/webapps.demo/ROOT/jetty.css rename to jetty-distribution/src/main/resources/demo/webapps/ROOT/jetty.css diff --git a/jetty-distribution/src/main/resources/webapps.demo/example-moved.xml b/jetty-distribution/src/main/resources/demo/webapps/example-moved.xml similarity index 100% rename from jetty-distribution/src/main/resources/webapps.demo/example-moved.xml rename to jetty-distribution/src/main/resources/demo/webapps/example-moved.xml diff --git a/jetty-distribution/src/main/resources/webapps.demo/javadoc.xml b/jetty-distribution/src/main/resources/demo/webapps/javadoc.xml similarity index 100% rename from jetty-distribution/src/main/resources/webapps.demo/javadoc.xml rename to jetty-distribution/src/main/resources/demo/webapps/javadoc.xml diff --git a/jetty-distribution/src/main/resources/start.d/demo.ini b/jetty-distribution/src/main/resources/start.d/demo.ini index ecb02d02950..d256443e08c 100644 --- a/jetty-distribution/src/main/resources/start.d/demo.ini +++ b/jetty-distribution/src/main/resources/start.d/demo.ini @@ -5,11 +5,8 @@ # the start.d directory or rename it to not end with ".ini" # =========================================================== ---module=jaas,jndi,rewrite,client,annotations,websocket -jaas.login.conf=webapps.demo/test-jaas.d/login.conf +--module=demo -# Activate the demo options and configurations ---module=jndi.demo - -etc/jetty-demo.xml +demo.realm=demo/realm.properties +jaas.login.conf=demo/login.conf diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java index b7047460895..13307cc19d6 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java @@ -318,7 +318,7 @@ public class Main File start_ini = baseHome.getBaseFile("start.ini"); if (FS.canReadFile(start_ini)) { - StartLog.debug("Reading ${jetty.base}/start.ini) - %s",start_ini); + StartLog.debug("Reading ${jetty.base}/start.ini - %s",start_ini); args.parse(baseHome, new StartIni(start_ini)); } diff --git a/jetty-start/src/test/resources/usecases/base.with.db/start.ini b/jetty-start/src/test/resources/usecases/base.with.db/start.ini index 1140dacd5a6..d5513df249c 100644 --- a/jetty-start/src/test/resources/usecases/base.with.db/start.ini +++ b/jetty-start/src/test/resources/usecases/base.with.db/start.ini @@ -1,5 +1,5 @@ ---module=server,http,db +--module=http,db mysql.user=frank mysql.pass=secret diff --git a/tests/test-webapps/test-jaas-webapp/pom.xml b/tests/test-webapps/test-jaas-webapp/pom.xml index 77213b9be04..ba827d2d4b8 100644 --- a/tests/test-webapps/test-jaas-webapp/pom.xml +++ b/tests/test-webapps/test-jaas-webapp/pom.xml @@ -34,7 +34,7 @@ java.security.auth.login.config - ${basedir}/src/main/config/webapps.demo/test-jaas.d/login.conf + ${basedir}/src/main/config/demo/login.conf diff --git a/tests/test-webapps/test-jaas-webapp/src/main/config/webapps.demo/test-jaas.d/login.conf b/tests/test-webapps/test-jaas-webapp/src/main/config/demo/login.conf similarity index 56% rename from tests/test-webapps/test-jaas-webapp/src/main/config/webapps.demo/test-jaas.d/login.conf rename to tests/test-webapps/test-jaas-webapp/src/main/config/demo/login.conf index 0978de6f381..aa0736f41a8 100644 --- a/tests/test-webapps/test-jaas-webapp/src/main/config/webapps.demo/test-jaas.d/login.conf +++ b/tests/test-webapps/test-jaas-webapp/src/main/config/demo/login.conf @@ -1,5 +1,5 @@ xyz { org.eclipse.jetty.jaas.spi.PropertyFileLoginModule required debug="true" -file="${jetty.home}/webapps.demo/test-jaas.d/login.properties"; +file="${jetty.home}/demo/login.properties"; }; diff --git a/tests/test-webapps/test-jaas-webapp/src/main/config/webapps.demo/test-jaas.d/login.properties b/tests/test-webapps/test-jaas-webapp/src/main/config/demo/login.properties similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/config/webapps.demo/test-jaas.d/login.properties rename to tests/test-webapps/test-jaas-webapp/src/main/config/demo/login.properties diff --git a/tests/test-webapps/test-jaas-webapp/src/main/config/webapps.demo/test-jaas.xml b/tests/test-webapps/test-jaas-webapp/src/main/config/demo/webapps/test-jaas.xml similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/config/webapps.demo/test-jaas.xml rename to tests/test-webapps/test-jaas-webapp/src/main/config/demo/webapps/test-jaas.xml diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html b/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html index d9f637bfa65..5b4f50da8c2 100644 --- a/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html +++ b/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html @@ -24,7 +24,7 @@ etc/jetty-jaas.xml

-

For the jetty distribution demos, jaas is already enabled in the start.d/900-demo.ini file and sets the jaas.login.conf property to webapps.demo/test-jaas.d/login.conf for use with the webapps.demo/test-jaas.war web application.

+

For the jetty distribution demos, jaas is already enabled in the start.d/900-demo.ini file and sets the jaas.login.conf property to demo/login.conf for use with the demo/webapps/test-jaas.war web application.

The full source of this demonstration is available here.

diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml index 6558ccb62f8..231bde47b13 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/tests/test-webapps/test-jetty-webapp/pom.xml @@ -147,7 +147,7 @@ Test Realm - src/main/config/etc/realm.properties + src/main/config/demo/realm.properties diff --git a/tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml b/tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml index 4ed6fbc8853..8c10dad34b3 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml +++ b/tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml @@ -28,7 +28,7 @@ detected. true false /etc/webdefault.xml - /contexts/test.d/override-web.xml + /demo/override-web.xml - + - /webapps.demo - /etc/webdefault.xml + /demo/webapps + /etc/webdefault.xml 1 true diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.d/override-web.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/demo/override-web.xml similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.d/override-web.xml rename to tests/test-webapps/test-jetty-webapp/src/main/config/demo/override-web.xml diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/etc/realm.properties b/tests/test-webapps/test-jetty-webapp/src/main/config/demo/realm.properties similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/config/etc/realm.properties rename to tests/test-webapps/test-jetty-webapp/src/main/config/demo/realm.properties diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/etc/test-realm.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/demo/test-realm.xml similarity index 83% rename from tests/test-webapps/test-jetty-webapp/src/main/config/etc/test-realm.xml rename to tests/test-webapps/test-jetty-webapp/src/main/config/demo/test-realm.xml index 5459dd51c77..97fccac33d4 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/config/etc/test-realm.xml +++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo/test-realm.xml @@ -12,13 +12,13 @@ Test Realm - /etc/realm.properties + 0 - test-realm is deployed. DO NOT USE IN PRODUCTION! + demo test-realm is deployed. DO NOT USE IN PRODUCTION! diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/demo/webapps/test.xml similarity index 94% rename from tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml rename to tests/test-webapps/test-jetty-webapp/src/main/config/demo/webapps/test.xml index 44cbce55c37..e64687509c0 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml +++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo/webapps/test.xml @@ -27,7 +27,7 @@ detected. true false /etc/webdefault.xml - /test.d/override-web.xml + /demo/override-web.xml @@ -66,8 +66,8 @@ detected. - Test Realm - /etc/realm.properties + Test Realm + /demo/realm.properties