You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2020/04/14 17:18:55 UTC

[tomcat] branch 9.0.x updated: Add websocket/el jars to test the native-image files

This is an automated email from the ASF dual-hosted git repository.

fhanik pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 36031a7  Add websocket/el jars to test the native-image files
36031a7 is described below

commit 36031a7fcd30332d337cecb387d4fc1aa90ef061
Author: Filip Hanik <fh...@pivotal.io>
AuthorDate: Tue Apr 14 10:14:03 2020 -0700

    Add websocket/el jars to test the native-image files
    
    Fix type in the el resource file
---
 res/graal/build-tomcat-native-image.sh                      | 2 +-
 res/graal/tomcat-embed-el/native-image/tomcat-resource.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/graal/build-tomcat-native-image.sh b/res/graal/build-tomcat-native-image.sh
index 592e930..1a211c9 100755
--- a/res/graal/build-tomcat-native-image.sh
+++ b/res/graal/build-tomcat-native-image.sh
@@ -38,7 +38,7 @@ native-image \
 -H:+ReportExceptionStackTraces \
 --allow-incomplete-classpath \
 --no-fallback \
--cp ../embed/tomcat-embed-core.jar:tomcat-embedded-sample.jar \
+-cp ../embed/tomcat-embed-core.jar:../embed/tomcat-embed-websocket.jar:../embed/tomcat-embed-el.jar:tomcat-embedded-sample.jar \
 org.apache.catalina.startup.EmbeddedTomcat
 
 cd $CURDIR
\ No newline at end of file
diff --git a/res/graal/tomcat-embed-el/native-image/tomcat-resource.json b/res/graal/tomcat-embed-el/native-image/tomcat-resource.json
index 55b2fb3..645ff26 100644
--- a/res/graal/tomcat-embed-el/native-image/tomcat-resource.json
+++ b/res/graal/tomcat-embed-el/native-image/tomcat-resource.json
@@ -1,6 +1,6 @@
 {
   "bundles":[
-    {"name":"jakarta.el.LocalStrings"},
+    {"name":"javax.el.LocalStrings"},
     {"name":"org.apache.el.Messages"}
   ],
   "resources":[


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org