WIP

2022-07-11 23:21:35 +10:00 · 2022-07-11 23:21:35 +10:00 · a5fcce595f
parent d03193a770
commit a5fcce595f
16 changed files with 57 additions and 89 deletions
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/pom.xml
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/pom.xml
@ -114,7 +114,7 @@
              <tempDirectory>${project.build.directory}/work</tempDirectory>
            </webApp>
            <loginServices>
-              <loginService implementation="org.eclipse.jetty.security.HashLoginService">
+              <loginService implementation="org.eclipse.jetty.ee9.security.HashLoginService">
                <name>Test Realm</name>
                <config>src/test/resources/test-realm.properties</config>
              </loginService>
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
@ -19,7 +19,7 @@ detected.
  <!--  + war OR resourceBase                                          -->
  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
  <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                                  -->
@ -27,7 +27,7 @@ detected.
  <Set name="extractWAR">true</Set>
  <Set name="copyWebDir">false</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
  <Set name="virtualHosts">
@ -49,10 +49,10 @@ detected.

  <Get name="securityHandler">
    <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="config">
-	       <Property name="web-inf.uri">/realm.properties</Property>      
+	       <Property name="web-inf.uri">/ee9-demo-realm.properties</Property>      
 	    </Set>
            <!-- To enable reload of realm when properties change, uncomment the following lines -->
            <!--
@ -63,31 +63,4 @@ detected.
    </Set>
    <Set name="checkWelcomeFiles">true</Set>
  </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>
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-jetty.xml
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-jetty.xml
@ -13,7 +13,7 @@ Configure and deploy the test web application
  <!--  + war OR resourceBase                                          -->
  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
  <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>

  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@ -22,7 +22,7 @@ Configure and deploy the test web application
  <Set name="extractWAR">true</Set>
  <Set name="copyWebDir">false</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>
  
  <!-- Enable WebSocket container -->
@ -31,11 +31,13 @@ Configure and deploy the test web application
    <Arg type="Boolean">true</Arg>
  </Call>
  
-  <Call name="insertHandler">
-    <Arg>
-      <New class="org.eclipse.jetty.server.handler.gzip.GzipHandler">
-        <Set name="minGzipSize">2048</Set>
-      </New>
-    </Arg>
-  </Call>
+  <Get name="coreContextHandler">
+    <Call name="insertHandler">
+      <Arg>
+        <New class="org.eclipse.jetty.server.handler.gzip.GzipHandler">
+          <Set name="minGzipSize">2048</Set>
+        </New>
+      </Arg>
+    </Call>
+  </Get>
 </Configure>
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-rewrite-rules.xml
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-rewrite-rules.xml
@ -10,20 +10,13 @@
  <!-- Add rewrite rules                                             -->
  <!-- ============================================================= -->
  <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 -->
      <Call name="addRule">
        <Arg>
          <New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
-            <Set name="pattern">/favicon.ico</Set>
-            <Set name="name">Cache-Control</Set>
-            <Set name="value">Max-Age=3600,public</Set>
+            <Arg>/favicon.ico</Arg>
+            <Arg>Cache-Control</Arg>
+            <Arg>Max-Age=3600,public</Arg>
            <Set name="terminating">true</Set>
          </New>
        </Arg>
@ -33,8 +26,8 @@
      <Call name="addRule">
        <Arg>
          <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
-            <Set name="pattern">/test/rewrite/</Set>
-            <Set name="replacement">/test/rewrite/info.html</Set>
+            <Arg>/test/rewrite/</Arg>
+            <Arg>/test/rewrite/info.html</Arg>
          </New>
        </Arg>
      </Call>
@ -43,8 +36,8 @@
      <Call name="addRule">
        <Arg>
          <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
-            <Set name="pattern">/test/some/old/context</Set>
-            <Set name="replacement">/test/rewritten/newcontext</Set>
+            <Arg>/test/some/old/context</Arg>
+            <Arg>/test/rewritten/newcontext</Arg>
          </New>
        </Arg>
      </Call>
@ -53,8 +46,8 @@
      <Call name="addRule">
        <Arg>
          <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
-            <Set name="pattern">/test/rewrite/for/*</Set>
-            <Set name="replacement">/test/rewritten/</Set>
+            <Arg>/test/rewrite/for/*</Arg>
+            <Arg>/test/rewritten/</Arg>
          </New>
        </Arg>
      </Call>
@ -63,8 +56,8 @@
      <Call name="addRule">
        <Arg>
          <New class="org.eclipse.jetty.rewrite.handler.RewriteRegexRule">
-            <Set name="regex">(.*?)/reverse/([^/]*)/(.*)</Set>
-            <Set name="replacement">$1/reverse/$3/$2</Set>
+            <Arg>(.*?)/reverse/([^/]*)/(.*)</Arg>
+            <Arg>$1/reverse/$3/$2</Arg>
          </New>
        </Arg>
      </Call>
@ -73,9 +66,9 @@
      <Call name="addRule">
        <Arg>
          <New class="org.eclipse.jetty.rewrite.handler.CookiePatternRule">
-            <Set name="pattern">/*</Set>
-            <Set name="name">visited</Set>
-            <Set name="value">yes</Set>
+            <Arg>/*</Arg>
+            <Arg>visited</Arg>
+            <Arg>yes</Arg>
          </New>
        </Arg>
      </Call>
@ -84,8 +77,8 @@
      <Call name="addRule">
        <Arg>
          <New class="org.eclipse.jetty.rewrite.handler.RedirectPatternRule">
-            <Set name="pattern">/test/redirect/*</Set>
-            <Set name="location">/test/redirected</Set>
+            <Arg>/test/redirect/*</Arg>
+            <Arg>/test/redirected</Arg>
          </New>
        </Arg>
      </Call>
@ -94,9 +87,9 @@
      <Call name="addRule">
        <Arg>
           <New class="org.eclipse.jetty.rewrite.handler.ResponsePatternRule">
-             <Set name="pattern">/400Error</Set>
-             <Set name="code">400</Set>
-             <Set name="message">ResponsePatternRule Demo</Set>
+             <Arg>/400Error</Arg>
+             <Arg type="int">400</Arg>
+             <Arg>ResponsePatternRuleDemo</Arg>
          </New>
        </Arg>
      </Call>
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod
@ -23,7 +23,7 @@ ee9-websocket-jetty
 ee9-demo-realm

 [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-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
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/config/modules/ee9-demo-jsp.mod
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/config/modules/ee9-demo-jsp.mod
@ -9,8 +9,8 @@ demo
 webapp

 [depends]
-jsp
-jstl
+ee9-jsp
+ee9-jstl
 ee9-deploy

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

 <Configure id="wac" class="org.eclipse.jetty.ee9.webapp.WebAppContext">
  <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 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>
      <New class="org.example.MockUserTransaction" />
    </Arg>
  </New>

-  <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>
@ -22,7 +22,7 @@
    <Arg type="boolean">true</Arg>
  </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>jdbc/mydatasource</Arg>
    <Arg>
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod
@ -13,7 +13,7 @@ webapp
 [depends]
 ee9-deploy
 jdbc
-jsp
+ee9-jsp
 ee9-annotations
 ext
 ee9-demo-realm
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/templates/annotations-context-header.xml
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/templates/annotations-context-header.xml
@ -8,21 +8,21 @@

 <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>
      <New class="org.example.MockUserTransaction"/>
    </Arg>
  </New>

  <!-- 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>

  <Get name="securityHandler">
    <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="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>
    </Set>
  </Get>
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/templates/env-definitions.xml
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/templates/env-definitions.xml
@ -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>maxAmount</Arg>
    <Arg type="java.lang.Double">100</Arg>
@ -7,7 +7,7 @@
  </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>jdbc/mydatasource</Arg>
    <Arg>
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/templates/plugin-context-header.xml
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/templates/plugin-context-header.xml
@ -9,7 +9,7 @@
 <Configure id='wac' class="org.eclipse.jetty.ee9.webapp.WebAppContext">

  <!-- 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>
      <New class="org.example.MockUserTransaction"/>
    </Arg>
--- a/jetty-ee9/jetty-ee9-plus/src/main/config/modules/ee9-plus.mod
+++ b/jetty-ee9/jetty-ee9-plus/src/main/config/modules/ee9-plus.mod
@ -15,4 +15,4 @@ ee9-webapp

 [lib]
 lib/jetty-ee9-plus-${jetty.version}.jar
-lib/jakarta.transaction-api-2.0.0.jar
+lib/jakarta.transaction-api-2.0.1.jar
--- a/jetty-ee9/pom.xml
+++ b/jetty-ee9/pom.xml
@ -65,7 +65,7 @@
 <!--    <module>jetty-ee9-openid</module>-->
 <!--    <module>jetty-ee9-osgi</module>-->
    <module>jetty-ee9-plus</module>
-    <module>jetty-ee9-proxy</module>
+<!--    <module>jetty-ee9-proxy</module>-->
    <module>jetty-ee9-quickstart</module>
 <!--    <module>jetty-ee9-runner</module>-->
    <module>jetty-ee9-websocket</module>
--- a/jetty-home/src/main/resources/modules/demo.d/jetty-ee9-demo-realm.xml
+++ b/jetty-home/src/main/resources/modules/demo.d/jetty-ee9-demo-realm.xml
@ -10,7 +10,7 @@
  <!-- =========================================================== -->
  <Call name="addBean">
    <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="config">etc/jetty-ee9-demo-realm.properties</Set>
        <Set name="hotReload">false</Set>
--- a/jetty-home/src/main/resources/modules/ee9-demo.mod
+++ b/jetty-home/src/main/resources/modules/ee9-demo.mod
@ -19,7 +19,7 @@ ee9-demo-async-rest
 ee9-demo-jaas
 ee9-demo-jetty
 ee9-demo-moved-context
-ee9-demo-proxy
+#ee9-demo-proxy
 ee9-demo-rewrite
 ee9-demo-jndi
 ee9-demo-spec