Commit Graph

186 Commits

Author SHA1 Message Date
Olivier Lamy d533040ea7
fix ee8 jstl module and demo (#8484)
* add distribution test for demo jstl
* fix default pattern, not more need of taglib

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-25 07:06:30 +10:00
Olivier Lamy 0e526d9b3f fix deployment of some demo modules
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-23 12:15:38 +10:00
Olivier Lamy c8c6ae5fcf
skip deployment of test jars and remove some not needed bom dependencies (#8481)
* skip deployment of test jars and remove some not needed bom dependencies

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-20 19:54:29 +10:00
Olivier Lamy 8e732ccf72
using bom within the reactor is really a bad idea and it sources from ee10 in ee9 as well (#8479)
* using bom with the reactor is really a bad idea and it sources from ee10 in ee9 as well

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-19 21:24:09 +10:00
Olivier Lamy 8fdbf50222
Restore jetty-ee8-maven-plugin mvove back ITs to jetty-eeX-maven-plugin modules (#8472)
add back jetty-ee8-maven-plugin
- add back jetty-ee8-jspc-maven-plugin
- remove not used site plugin and simplify code
- moving back ee9 maven plugin ITs to the module
- back of ee10 maven ITs test to the plugin module


Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-19 17:50:58 +10:00
Olivier Lamy a87c9fec44 use released version of modify-sources-plugin 1.0.1
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-19 16:07:49 +10:00
Greg Wilkins af5fecd18d
Jetty 12 : Rename resourceBase to baseResource (#8310)
* rename to baseResource
2022-08-15 12:24:13 +10:00
Olivier Lamy c011126e63
fix hardcoding versions in mod files (#8459)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-13 19:43:07 +10:00
Simone Bordet 0413825640
Fixed jetty-http2-server artifact name in pom.xml after merge.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 17:37:53 +02:00
Simone Bordet 6f0f8854de
Merged branch 'jetty-12.0.x' into 'jetty-12.0.x-module-renaming'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 17:31:01 +02:00
Olivier Lamy 44a37746e6
Jetty 12 : reactivate `jetty-ee9-demo-embedded` and `jetty-ee9-demo-proxy-webapp` and add more (#8419)
* ee8 demos to use ee9 demos resources
* add jetty-ee8-demo-jaas-webapp
* add jetty-ee8-demo-jndi-webapp jetty-ee8-demo-mock-resources
* uhm jetty-ee8-demo-jetty-webapp have some issues
* fix jetty-ee8-demo-jetty-webapp
* fix some jetty-ee9-demo-embedded and add back jetty-ee8-demo-proxy-webapp
* demo-embedded need to have jetty-ee9-demo-jsp-webapp built first
* fixing more demos modules. Activate dist test for demo modules and all env


Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-12 17:52:53 +10:00
Simone Bordet 1eea480764
Jetty 12 module renaming - jetty-websocket.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 09:33:31 +02:00
Simone Bordet 7d264e6024
Jetty 12 module renaming - jetty-http2.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-12 09:33:31 +02:00
Olivier Lamy 727f6e0bb7
move from org.glassfish.web:jstl-impl:1.2 to org.glassfish.web:javax.servlet.jsp.jstl:1.2.5 (#8453)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-12 13:54:31 +10:00
Joakim Erdfelt 199a9cd2ad
Jetty 12 : XML namespace cleanup (#8406)
* Adding Servlet 6 XML Entities
* Fixing bad xsi:schemaLocation entries
* Update all jetty-ee10 web XMLs to JakartaEE version 6.0 based
* Using XML Catalog
* Introducing catalogs for:
   - default XML xsd/dtd (catalog-org.w3.xml)
   - Configure dtd (catalog-configure.xml)
   - EE10 Servlet 6 xsd/dtd (catalog-ee10.xml)
   - EE9 Servlet 5 xsd/dtd (catalog-ee9.xml)
   - EE8 Servlet 4 xsd/dtd (catalog-ee8.xml)
* New XmlParser.addCatalog(URI catalogXml, Class<?> classBase)
   to allow the loading of a catalog which has it's resources
   referenced via the classBase.getResource(name)
* WebDescriptor uses Environment to load appropriate catalog.
* Remove XmlParser.redirectEntity(String, String)
2022-08-09 06:34:29 -05:00
Olivier Lamy 4c03c7dddf
jetty 12.0.x test ee8 sessions (#8361)
* add test-jetty-ee8 sessions tests modules
* add test ee8 session suites

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-01 12:16:07 +10:00
Olivier Lamy e78250bc3c
add jetty-ee8-glassfish-jstl (#8346)
* add jetty-ee8-glassfish-jstl

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-29 20:20:37 +10:00
Olivier Lamy c7dc445530
add jetty-ee8-apache-jsp (#8344)
* add jetty-ee8-apache-jsp

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-27 11:08:08 +10:00
Olivier Lamy ccd79c4b47
add ee8 openid (#8342)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-26 19:26:34 +10:00
Olivier Lamy 82338660a8
add jetty-ee8-proxy (#8332)
* restore ee8 proxy

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-25 19:54:18 +10:00
Olivier Lamy be7056e174
jetty 12.0.x ee8 enable websocket tests (#8313)
* renable tests for jetty-ee8-websocket-javax-tests

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-20 17:50:35 +10:00
Olivier Lamy 68206ce880
fix some filtering of files for ee9 to ee8 conversion (#8311)
* restore ee8-quickstart
* use our special resources filtering
* do not filter some extensions

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-15 11:20:52 +10:00
Greg Wilkins cdc1b079ae ee8 ee9 ee10 webapp demos
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-07-14 16:15:22 +10:00
Olivier Lamy 6efb927a77 translate sources from jetty-ee8-demo-simple-webapp
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-14 14:53:25 +10:00
Jan Bartel cb7b395ce3 Fix ee8 modules 2022-07-14 14:16:21 +10:00
Olivier Lamy 08865ed5a8
restore jetty-ee8-demo-simple-webapp and jetty-ee8-demo-async-rest (#8299)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-14 12:18:23 +10:00
Jan Bartel b6d8bcb7b4 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-ee9-demos 2022-07-13 10:05:35 +10:00
Olivier Lamy ae77d14cf9
add jetty-ee8-jndi (#8287)
* add jetty-ee8-jndi

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-12 20:19:29 +10:00
Olivier Lamy d164efb779
add jetty-ee8-home and unzip it in the jetty-home (#8283)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-12 12:04:26 +10:00
Olivier Lamy 7062db01b1
enable mapping websocket ee9 to ee8 (#8279)
* websocket ee9 to ee8 dynamic generation
* temporary disable tests for jetty-ee8-plus

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-11 21:23:44 +10:00
Greg Wilkins ea5bedf072
Jetty 12.0.x deployment (#8208)
Deploy webapps for different environments from the same webapps directory.
The maximal environment known to the AppProviders is used as the default environment.
An explicit environment can be set in a properties file for an application, which is also used for property substitution in any context xml file.
2022-06-30 09:51:19 +10:00
Jan Bartel e6d5eb1826 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-06-27 12:41:50 +10:00
Jan Bartel 395f1084d2 Skip ee8-plus tests until 8209 is fixed 2022-06-27 12:35:29 +10:00
Jan Bartel 9893c81abf
Jetty 12.0.x update jakarta api versions (#8192)
* update to latest jakarta official releases
2022-06-22 10:32:54 +10:00
Olivier Lamy b71d348d98 add some missing [environment] ee8 in mod files
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-06-06 10:48:26 +10:00
Olivier Lamy e7274e3bb1
Add ee8 modules with sources generated from ee9 sources (#8066)
* auto translate some modules from EE9 to EE8

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-06-01 13:38:42 +10:00