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

WIP

This commit is contained in:
Jan Bartel 2022-07-11 23:21:35 +10:00
parent d03193a770
commit a5fcce595f
16 changed files with 57 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/pom.xml
View File

@ -114,7 +114,7 @@
<tempDirectory>${project.build.directory}/work</tempDirectory> <tempDirectory>${project.build.directory}/work</tempDirectory>
</webApp> </webApp>
<loginServices> <loginServices>
<loginService implementation="org.eclipse.jetty.security.HashLoginService"> <loginService implementation="org.eclipse.jetty.ee9.security.HashLoginService">
<name>Test Realm</name> <name>Test Realm</name>
<config>src/test/resources/test-realm.properties</config> <config>src/test/resources/test-realm.properties</config>
</loginService> </loginService>

35
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
View File

@ -19,7 +19,7 @@ detected.
<!-- + war OR resourceBase --> <!-- + war OR resourceBase -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<Set name="contextPath">/</Set> <Set name="contextPath">/</Set>
<Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/test.war</Set> <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/ee9-demo-jetty.war</Set>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- Optional context configuration --> <!-- Optional context configuration -->
@ -27,7 +27,7 @@ detected.
<Set name="extractWAR">true</Set> <Set name="extractWAR">true</Set>
<Set name="copyWebDir">false</Set> <Set name="copyWebDir">false</Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault-ee9.xml</Set> <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault-ee9.xml</Set>
<Set name="overrideDescriptor"><SystemProperty name="jetty.base" default="."/>/etc/override-web.xml</Set> <Set name="overrideDescriptor"><SystemProperty name="jetty.base" default="."/>/etc/ee9-demo-override-web.xml</Set>
<!-- virtual hosts <!-- virtual hosts
<Set name="virtualHosts"> <Set name="virtualHosts">
@ -49,10 +49,10 @@ detected.
<Get name="securityHandler"> <Get name="securityHandler">
<Set name="loginService"> <Set name="loginService">
<New class="org.eclipse.jetty.security.HashLoginService"> <New class="org.eclipse.jetty.ee9.security.HashLoginService">
<Set name="name">Test Realm</Set> <Set name="name">Test Realm</Set>
<Set name="config"> <Set name="config">
<Property name="web-inf.uri">/realm.properties</Property> <Property name="web-inf.uri">/ee9-demo-realm.properties</Property>
</Set> </Set>
<!-- To enable reload of realm when properties change, uncomment the following lines --> <!-- To enable reload of realm when properties change, uncomment the following lines -->
<!-- <!--
@ -63,31 +63,4 @@ detected.
</Set> </Set>
<Set name="checkWelcomeFiles">true</Set> <Set name="checkWelcomeFiles">true</Set>
</Get> </Get>
<!-- Non standard error page mapping -->
<!--
<Get name="errorHandler">
<Call name="addErrorPage">
<Arg type="int">500</Arg>
<Arg type="int">599</Arg>
<Arg type="String">/dump/errorCodeRangeMapping</Arg>
</Call>
</Get>
-->
<!-- Add context specific logger
<Set name="handler">
<New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler">
<Set name="requestLog">
<New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
<Set name="filename"><Property name="jetty.logs" default="./logs"/>/test-yyyy_mm_dd.request.log</Set>
<Set name="filenameDateFormat">yyyy_MM_dd</Set>
<Set name="append">true</Set>
<Set name="LogTimeZone">GMT</Set>
</New>
</Set>
</New>
</Set>
-->
</Configure> </Configure>

6
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-jetty.xml
View File

@ -13,7 +13,7 @@ Configure and deploy the test web application
<!-- + war OR resourceBase --> <!-- + war OR resourceBase -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<Set name="contextPath">/test</Set> <Set name="contextPath">/test</Set>
<Set name="war"><Property name="jetty.webapps" default="." />/demo-jetty.war <Set name="war"><Property name="jetty.webapps" default="." />/ee9-demo-jetty.war
</Set> </Set>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@ -22,7 +22,7 @@ Configure and deploy the test web application
<Set name="extractWAR">true</Set> <Set name="extractWAR">true</Set>
<Set name="copyWebDir">false</Set> <Set name="copyWebDir">false</Set>
<Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault-ee9.xml</Set> <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault-ee9.xml</Set>
<Set name="overrideDescriptor"><Property name="jetty.webapps" default="." />/demo-jetty.d/demo-jetty-override-web.xml <Set name="overrideDescriptor"><Property name="jetty.webapps" default="." />/ee9-demo-jetty.d/ee9-demo-jetty-override-web.xml
</Set> </Set>
<!-- Enable WebSocket container --> <!-- Enable WebSocket container -->
@ -31,6 +31,7 @@ Configure and deploy the test web application
<Arg type="Boolean">true</Arg> <Arg type="Boolean">true</Arg>
</Call> </Call>
<Get name="coreContextHandler">
<Call name="insertHandler"> <Call name="insertHandler">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.handler.gzip.GzipHandler"> <New class="org.eclipse.jetty.server.handler.gzip.GzipHandler">
@ -38,4 +39,5 @@ Configure and deploy the test web application
</New> </New>
</Arg> </Arg>
</Call> </Call>
</Get>
</Configure> </Configure>

45
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-rewrite-rules.xml
View File

@ -10,20 +10,13 @@
<!-- Add rewrite rules --> <!-- Add rewrite rules -->
<!-- ============================================================= --> <!-- ============================================================= -->
<Ref refid="Rewrite"> <Ref refid="Rewrite">
<!-- Add rule to protect against IE ssl bug -->
<Call name="addRule">
<Arg>
<New class="org.eclipse.jetty.rewrite.handler.MsieSslRule"/>
</Arg>
</Call>
<!-- protect favicon handling --> <!-- protect favicon handling -->
<Call name="addRule"> <Call name="addRule">
<Arg> <Arg>
<New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule"> <New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
<Set name="pattern">/favicon.ico</Set> <Arg>/favicon.ico</Arg>
<Set name="name">Cache-Control</Set> <Arg>Cache-Control</Arg>
<Set name="value">Max-Age=3600,public</Set> <Arg>Max-Age=3600,public</Arg>
<Set name="terminating">true</Set> <Set name="terminating">true</Set>
</New> </New>
</Arg> </Arg>
@ -33,8 +26,8 @@
<Call name="addRule"> <Call name="addRule">
<Arg> <Arg>
<New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule"> <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
<Set name="pattern">/test/rewrite/</Set> <Arg>/test/rewrite/</Arg>
<Set name="replacement">/test/rewrite/info.html</Set> <Arg>/test/rewrite/info.html</Arg>
</New> </New>
</Arg> </Arg>
</Call> </Call>
@ -43,8 +36,8 @@
<Call name="addRule"> <Call name="addRule">
<Arg> <Arg>
<New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule"> <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
<Set name="pattern">/test/some/old/context</Set> <Arg>/test/some/old/context</Arg>
<Set name="replacement">/test/rewritten/newcontext</Set> <Arg>/test/rewritten/newcontext</Arg>
</New> </New>
</Arg> </Arg>
</Call> </Call>
@ -53,8 +46,8 @@
<Call name="addRule"> <Call name="addRule">
<Arg> <Arg>
<New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule"> <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
<Set name="pattern">/test/rewrite/for/*</Set> <Arg>/test/rewrite/for/*</Arg>
<Set name="replacement">/test/rewritten/</Set> <Arg>/test/rewritten/</Arg>
</New> </New>
</Arg> </Arg>
</Call> </Call>
@ -63,8 +56,8 @@
<Call name="addRule"> <Call name="addRule">
<Arg> <Arg>
<New class="org.eclipse.jetty.rewrite.handler.RewriteRegexRule"> <New class="org.eclipse.jetty.rewrite.handler.RewriteRegexRule">
<Set name="regex">(.*?)/reverse/([^/]*)/(.*)</Set> <Arg>(.*?)/reverse/([^/]*)/(.*)</Arg>
<Set name="replacement">$1/reverse/$3/$2</Set> <Arg>$1/reverse/$3/$2</Arg>
</New> </New>
</Arg> </Arg>
</Call> </Call>
@ -73,9 +66,9 @@
<Call name="addRule"> <Call name="addRule">
<Arg> <Arg>
<New class="org.eclipse.jetty.rewrite.handler.CookiePatternRule"> <New class="org.eclipse.jetty.rewrite.handler.CookiePatternRule">
<Set name="pattern">/*</Set> <Arg>/*</Arg>
<Set name="name">visited</Set> <Arg>visited</Arg>
<Set name="value">yes</Set> <Arg>yes</Arg>
</New> </New>
</Arg> </Arg>
</Call> </Call>
@ -84,8 +77,8 @@
<Call name="addRule"> <Call name="addRule">
<Arg> <Arg>
<New class="org.eclipse.jetty.rewrite.handler.RedirectPatternRule"> <New class="org.eclipse.jetty.rewrite.handler.RedirectPatternRule">
<Set name="pattern">/test/redirect/*</Set> <Arg>/test/redirect/*</Arg>
<Set name="location">/test/redirected</Set> <Arg>/test/redirected</Arg>
</New> </New>
</Arg> </Arg>
</Call> </Call>
@ -94,9 +87,9 @@
<Call name="addRule"> <Call name="addRule">
<Arg> <Arg>
<New class="org.eclipse.jetty.rewrite.handler.ResponsePatternRule"> <New class="org.eclipse.jetty.rewrite.handler.ResponsePatternRule">
<Set name="pattern">/400Error</Set> <Arg>/400Error</Arg>
<Set name="code">400</Set> <Arg type="int">400</Arg>
<Set name="message">ResponsePatternRule Demo</Set> <Arg>ResponsePatternRuleDemo</Arg>
</New> </New>
</Arg> </Arg>
</Call> </Call>

2
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod
View File

@ -23,7 +23,7 @@ ee9-websocket-jetty
ee9-demo-realm ee9-demo-realm
[files] [files]
webapps-ee9/demo-jetty.d/ webapps/demo-jetty.d/
basehome:modules/demo.d/ee9-demo-jetty.xml|webapps/ee9-demo-jetty.xml basehome:modules/demo.d/ee9-demo-jetty.xml|webapps/ee9-demo-jetty.xml
basehome:modules/demo.d/ee9-demo-jetty-override-web.xml|webapps/ee9-demo-jetty.d/ee9-demo-jetty-override-web.xml basehome:modules/demo.d/ee9-demo-jetty-override-web.xml|webapps/ee9-demo-jetty.d/ee9-demo-jetty-override-web.xml
basehome:modules/demo.d/ee9-demo-jetty.properties|webapps/ee9-demo-jetty.properties basehome:modules/demo.d/ee9-demo-jetty.properties|webapps/ee9-demo-jetty.properties

4
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/config/modules/ee9-demo-jsp.mod
View File

@ -9,8 +9,8 @@ demo
webapp webapp
[depends] [depends]
jsp ee9-jsp
jstl ee9-jstl
ee9-deploy ee9-deploy
[files] [files]

6
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml
View File

@ -150,8 +150,8 @@
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-ee9-maven-plugin</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<configuration> <configuration>
<scan>10</scan> <scan>10</scan>
@ -165,7 +165,7 @@
<jettyEnvXml>${basedir}/src/main/webapp/WEB-INF/jetty-env.xml</jettyEnvXml> <jettyEnvXml>${basedir}/src/main/webapp/WEB-INF/jetty-env.xml</jettyEnvXml>
</webApp> </webApp>
<loginServices> <loginServices>
<loginService implementation="org.eclipse.jetty.security.HashLoginService"> <loginService implementation="org.eclipse.jetty.ee9.security.HashLoginService">
<name>Test Realm</name> <name>Test Realm</name>
<config>src/etc/realm.properties</config> <config>src/etc/realm.properties</config>
</loginService> </loginService>

8
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/demo.d/ee9-demo-spec.xml
View File

@ -3,17 +3,17 @@
<Configure id="wac" class="org.eclipse.jetty.ee9.webapp.WebAppContext"> <Configure id="wac" class="org.eclipse.jetty.ee9.webapp.WebAppContext">
<Set name="contextPath">/test-spec</Set> <Set name="contextPath">/test-spec</Set>
<Set name="war"><Property name="jetty.webapps" />/demo-spec.war <Set name="war"><Property name="jetty.webapps" />/ee9-demo-spec.war
</Set> </Set>
<Set name="configurationDiscovered">true</Set> <Set name="configurationDiscovered">true</Set>
<New id="tx" class="org.eclipse.jetty.plus.jndi.Transaction"> <New id="tx" class="org.eclipse.jetty.ee9.plus.jndi.Transaction">
<Arg> <Arg>
<New class="org.example.MockUserTransaction" /> <New class="org.example.MockUserTransaction" />
</Arg> </Arg>
</New> </New>
<New id="maxAmount" class="org.eclipse.jetty.plus.jndi.EnvEntry"> <New id="maxAmount" class="org.eclipse.jetty.ee9.plus.jndi.EnvEntry">
<Arg> <Arg>
<Ref refid='wac' /> <Ref refid='wac' />
</Arg> </Arg>
@ -22,7 +22,7 @@
<Arg type="boolean">true</Arg> <Arg type="boolean">true</Arg>
</New> </New>
<New id="mydatasource" class="org.eclipse.jetty.plus.jndi.Resource"> <New id="mydatasource" class="org.eclipse.jetty.ee9.plus.jndi.Resource">
<Arg><Ref refid='wac'/></Arg> <Arg><Ref refid='wac'/></Arg>
<Arg>jdbc/mydatasource</Arg> <Arg>jdbc/mydatasource</Arg>
<Arg> <Arg>

2
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod
View File

@ -13,7 +13,7 @@ webapp
[depends] [depends]
ee9-deploy ee9-deploy
jdbc jdbc
jsp ee9-jsp
ee9-annotations ee9-annotations
ext ext
ee9-demo-realm ee9-demo-realm

8
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/templates/annotations-context-header.xml
View File

@ -8,21 +8,21 @@
<Configure id='wac' class="org.eclipse.jetty.ee9.webapp.WebAppContext"> <Configure id='wac' class="org.eclipse.jetty.ee9.webapp.WebAppContext">
<New id="tx" class="org.eclipse.jetty.plus.jndi.Transaction"> <New id="tx" class="org.eclipse.jetty.ee9.plus.jndi.Transaction">
<Arg> <Arg>
<New class="org.example.MockUserTransaction"/> <New class="org.example.MockUserTransaction"/>
</Arg> </Arg>
</New> </New>
<!-- ContextPath set in web.xml --> <!-- ContextPath set in web.xml -->
<Set name="war"><Property name="jetty.webapps"/>/test-spec.war</Set> <Set name="war"><Property name="jetty.webapps"/>/ee9-demo-spec.war</Set>
<Set name="configurationDiscovered">true</Set> <Set name="configurationDiscovered">true</Set>
<Get name="securityHandler"> <Get name="securityHandler">
<Set name="loginService"> <Set name="loginService">
<New class="org.eclipse.jetty.security.HashLoginService"> <New class="org.eclipse.jetty.ee9.security.HashLoginService">
<Set name="name">Test Realm</Set> <Set name="name">Test Realm</Set>
<Set name="config"><SystemProperty name="jetty.base" default="."/>/etc/realm.properties</Set> <Set name="config"><SystemProperty name="jetty.base" default="."/>/etc/ee9-demo-realm.properties</Set>
</New> </New>
</Set> </Set>
</Get> </Get>

4
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/templates/env-definitions.xml
View File

@ -1,5 +1,5 @@
<New id="maxAmount" class="org.eclipse.jetty.plus.jndi.EnvEntry"> <New id="maxAmount" class="org.eclipse.jetty.ee9.plus.jndi.EnvEntry">
<Arg><Ref refid='wac'/></Arg> <Arg><Ref refid='wac'/></Arg>
<Arg>maxAmount</Arg> <Arg>maxAmount</Arg>
<Arg type="java.lang.Double">100</Arg> <Arg type="java.lang.Double">100</Arg>
@ -7,7 +7,7 @@
</New> </New>
<New id="mydatasource" class="org.eclipse.jetty.plus.jndi.Resource"> <New id="mydatasource" class="org.eclipse.jetty.ee9.plus.jndi.Resource">
<Arg><Ref refid='wac'/></Arg> <Arg><Ref refid='wac'/></Arg>
<Arg>jdbc/mydatasource</Arg> <Arg>jdbc/mydatasource</Arg>
<Arg> <Arg>

2
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/templates/plugin-context-header.xml
View File

@ -9,7 +9,7 @@
<Configure id='wac' class="org.eclipse.jetty.ee9.webapp.WebAppContext"> <Configure id='wac' class="org.eclipse.jetty.ee9.webapp.WebAppContext">
<!-- Configure the tx mgr (only needed for mvn jetty:run --> <!-- Configure the tx mgr (only needed for mvn jetty:run -->
<New id="tx" class="org.eclipse.jetty.plus.jndi.Transaction"> <New id="tx" class="org.eclipse.jetty.ee9.plus.jndi.Transaction">
<Arg> <Arg>
<New class="org.example.MockUserTransaction"/> <New class="org.example.MockUserTransaction"/>
</Arg> </Arg>

2
jetty-ee9/jetty-ee9-plus/src/main/config/modules/ee9-plus.mod
View File

@ -15,4 +15,4 @@ ee9-webapp
[lib] [lib]
lib/jetty-ee9-plus-${jetty.version}.jar lib/jetty-ee9-plus-${jetty.version}.jar
lib/jakarta.transaction-api-2.0.0.jar lib/jakarta.transaction-api-2.0.1.jar

2
jetty-ee9/pom.xml
View File

@ -65,7 +65,7 @@
<!-- <module>jetty-ee9-openid</module>--> <!-- <module>jetty-ee9-openid</module>-->
<!-- <module>jetty-ee9-osgi</module>--> <!-- <module>jetty-ee9-osgi</module>-->
<module>jetty-ee9-plus</module> <module>jetty-ee9-plus</module>
<module>jetty-ee9-proxy</module> <!-- <module>jetty-ee9-proxy</module>-->
<module>jetty-ee9-quickstart</module> <module>jetty-ee9-quickstart</module>
<!-- <module>jetty-ee9-runner</module>--> <!-- <module>jetty-ee9-runner</module>-->
<module>jetty-ee9-websocket</module> <module>jetty-ee9-websocket</module>

2
jetty-home/src/main/resources/modules/demo.d/jetty-ee9-demo-realm.xml
View File

@ -10,7 +10,7 @@
<!-- =========================================================== --> <!-- =========================================================== -->
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>
<New class="org.eclipse.jetty.ee9.servlet.security.HashLoginService"> <New class="org.eclipse.jetty.ee9.security.HashLoginService">
<Set name="name">Test Realm</Set> <Set name="name">Test Realm</Set>
<Set name="config">etc/jetty-ee9-demo-realm.properties</Set> <Set name="config">etc/jetty-ee9-demo-realm.properties</Set>
<Set name="hotReload">false</Set> <Set name="hotReload">false</Set>

2
jetty-home/src/main/resources/modules/ee9-demo.mod
View File

@ -19,7 +19,7 @@ ee9-demo-async-rest
ee9-demo-jaas ee9-demo-jaas
ee9-demo-jetty ee9-demo-jetty
ee9-demo-moved-context ee9-demo-moved-context
ee9-demo-proxy #ee9-demo-proxy
ee9-demo-rewrite ee9-demo-rewrite
ee9-demo-jndi ee9-demo-jndi
ee9-demo-spec ee9-demo-spec