Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #1743 Update webapps in distro for new jetty-maven-plugin config 

Signed-off-by: Jan Bartel <janb@webtide.com>
This commit is contained in:
Jan Bartel 2019-11-15 07:49:36 +11:00
parent 04bc4c786e
commit 58d69aaf02
5 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/test-webapps/test-jaas-webapp/pom.xml
View File

@ -27,20 +27,14 @@
<artifactId>jetty-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<scan>10</scan>
<systemProperties>
<!-- This is for convenience so that the src/etc/login.conf file can stay unmodified when copied to $jetty.home/etc directory -->
<systemProperty>
<name>jetty.base</name>
<value>${basedir}/src/main/config/demo-base</value>
</systemProperty>
<jetty.base>${basedir}/src/main/config/demo-base</jetty.base>
<!-- Mandatory. This system property tells JAAS where to find the login module configuration file -->
<systemProperty>
<name>java.security.auth.login.config</name>
<value>${basedir}/src/main/config/demo-base/etc/login.conf</value>
</systemProperty>
<java.security.auth.login.config>${basedir}/src/main/config/demo-base/etc/login.conf</java.security.auth.login.config>
</systemProperties>
<webAppConfig>
<webApp>
<contextPath>/test-jaas</contextPath>
<securityHandler implementation="org.eclipse.jetty.security.ConstraintSecurityHandler">
<loginService implementation="org.eclipse.jetty.jaas.JAASLoginService">
@ -48,7 +42,7 @@
<loginModuleName>xyz</loginModuleName>
</loginService>
</securityHandler>
</webAppConfig>
</webApp>
</configuration>
<dependencies>
<dependency>

7
tests/test-webapps/test-jetty-webapp/pom.xml
View File

@ -107,12 +107,9 @@
<configuration>
<stopPort>8087</stopPort>
<stopKey>foo</stopKey>
<scanIntervalSeconds>1</scanIntervalSeconds>
<scan>1</scan>
<systemProperties>
<systemProperty>
<name>fooprop</name>
<value>222</value>
</systemProperty>
<fooprop>222</fooprop>
</systemProperties>
<webApp>
<contextPath>/test</contextPath>

6
tests/test-webapps/test-jndi-webapp/pom.xml
View File

@ -83,12 +83,12 @@
<artifactId>jetty-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<webAppXml>${project.build.directory}/plugin-context.xml</webAppXml>
<webAppConfig>
<contextXml>${project.build.directory}/plugin-context.xml</contextXml>
<webApp>
<war>src/main/webapp</war>
<descriptor>src/main/webapp/WEB-INF/web.xml</descriptor>
<contextPath>/test-jndi</contextPath>
</webAppConfig>
</webApp>
</configuration>
<dependencies>
<dependency>

8
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
View File

@ -138,17 +138,17 @@
<artifactId>jetty-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<scan>10</scan>
<useTestClasspath>true</useTestClasspath>
<webAppXml>${project.build.directory}/plugin-context.xml</webAppXml>
<webAppConfig>
<contextXml>${project.build.directory}/plugin-context.xml</contextXml>
<webApp>
<war>src/main/webapp</war>
<descriptor>src/main/webapp/WEB-INF/web.xml</descriptor>
<contextPath>/test-spec</contextPath>
<containerIncludeJarPattern>.*/jetty-servlet-api-[^/]*\.jar$</containerIncludeJarPattern>
<configurationDiscovered>true</configurationDiscovered>
<jettyEnvXml>${basedir}/src/main/webapp/WEB-INF/jetty-env.xml</jettyEnvXml>
</webAppConfig>
</webApp>
<loginServices>
<loginService implementation="org.eclipse.jetty.security.HashLoginService">
<name>Test Realm</name>

7
tests/test-webapps/test-webapp-rfc2616/pom.xml
View File

@ -30,12 +30,9 @@
<configuration>
<stopPort>8087</stopPort>
<stopKey>foo</stopKey>
<scanIntervalSeconds>1</scanIntervalSeconds>
<scan>1</scan>
<systemProperties>
<systemProperty>
<name>fooprop</name>
<value>222</value>
</systemProperty>
<fooprop>222</fooprop>
</systemProperties>
</configuration>
</plugin>