diff options
author | Konstantin Pavlov <thresh@nginx.com> | 2022-11-16 17:05:57 +0400 |
---|---|---|
committer | Konstantin Pavlov <thresh@nginx.com> | 2022-11-16 17:05:57 +0400 |
commit | 6afc5241165bedee42d5aede1d3ae0d5a9847bdb (patch) | |
tree | a9a87b1f93ace7725e03173b9812413618ddb7db | |
parent | 0feab91c5ba1bfd3e1e71cadb4cb0687bae846cd (diff) | |
download | unit-6afc5241165bedee42d5aede1d3ae0d5a9847bdb.tar.gz unit-6afc5241165bedee42d5aede1d3ae0d5a9847bdb.tar.bz2 |
Packages: added Ubuntu 22.10 "kinetic" support.
-rw-r--r-- | docs/changes.xml | 16 | ||||
-rw-r--r-- | pkg/deb/Makefile | 15 | ||||
-rw-r--r-- | pkg/deb/Makefile.jsc19 | 71 | ||||
-rw-r--r-- | pkg/deb/debian.module/unit.example-jsc19-config | 15 |
4 files changed, 116 insertions, 1 deletions
diff --git a/docs/changes.xml b/docs/changes.xml index 9aaec9e5..e2444a8e 100644 --- a/docs/changes.xml +++ b/docs/changes.xml @@ -13,7 +13,8 @@ unit-perl unit-ruby unit-jsc-common unit-jsc8 unit-jsc10 unit-jsc11 unit-jsc13 - unit-jsc14 unit-jsc15 unit-jsc16 unit-jsc17 unit-jsc18" + unit-jsc14 unit-jsc15 unit-jsc16 unit-jsc17 unit-jsc18 + unit-jsc19" ver="1.29.0" rev="1" date="" time="" packager="Nginx Packaging <nginx-packaging@f5.com>"> @@ -27,6 +28,19 @@ NGINX Unit updated to 1.29.0. </changes> +<changes apply="unit-jsc19" ver="1.29.0" rev="1" + date="2022-11-18" time="15:00:00 +0400" + packager="Nginx Packaging <nginx-packaging@f5.com>"> + +<change> +<para> +Initial release of Java 19 module for NGINX Unit. +</para> +</change> + +</changes> + + <changes apply="unit" ver="1.29.0" rev="1" date="" time="" packager="Nginx Packaging <nginx-packaging@f5.com>"> diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 6595cb45..e9cf53b3 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -19,6 +19,21 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= +# Ubuntu 22.10 +ifeq ($(CODENAME),kinetic) +include Makefile.php +include Makefile.python27 +include Makefile.python310 +include Makefile.go +include Makefile.perl +include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc11 +include Makefile.jsc17 +include Makefile.jsc18 +include Makefile.jsc19 +endif + # Ubuntu 22.04 ifeq ($(CODENAME),jammy) include Makefile.php diff --git a/pkg/deb/Makefile.jsc19 b/pkg/deb/Makefile.jsc19 new file mode 100644 index 00000000..2a6ef7db --- /dev/null +++ b/pkg/deb/Makefile.jsc19 @@ -0,0 +1,71 @@ +MODULES+= jsc19 +MODULE_SUFFIX_jsc19= jsc19 + +MODULE_SUMMARY_jsc19= Java 19 module for NGINX Unit + +MODULE_VERSION_jsc19= $(VERSION) +MODULE_RELEASE_jsc19= 1 + +MODULE_CONFARGS_jsc19= java --module=java19 --home=/usr/lib/jvm/java-19-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ +MODULE_MAKEARGS_jsc19= java19 +MODULE_INSTARGS_jsc19= java19-install + +MODULE_SOURCES_jsc19= unit.example-jsc-app \ + unit.example-jsc19-config + +BUILD_DEPENDS_jsc19= openjdk-19-jdk-headless openjdk-19-jre-headless +BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc19) + +MODULE_BUILD_DEPENDS_jsc19=,openjdk-19-jdk-headless +MODULE_DEPENDS_jsc19=,openjdk-19-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME)) + +define MODULE_PREINSTALL_jsc19 + mkdir -p debian/unit-jsc19/usr/share/doc/unit-jsc19/examples/jsc-app + install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc19/usr/share/doc/unit-jsc19/examples/jsc-app/index.jsp + install -m 644 -p debian/unit.example-jsc19-config debian/unit-jsc19/usr/share/doc/unit-jsc19/examples/unit.config + install -m 644 -p src/java/README.JSR-340 debian/unit-jsc19/usr/share/doc/unit-jsc19/ +endef +export MODULE_PREINSTALL_jsc19 + +define MODULE_POSTINSTALL_jsc19 + cd $$\(BUILDDIR_unit\) \&\& \ + DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall +endef +export MODULE_POSTINSTALL_jsc19 + +define MODULE_POST_jsc19 +cat <<BANNER +---------------------------------------------------------------------- + +The $(MODULE_SUMMARY_jsc19) has been installed. + +To check out the sample app, run these commands: + + sudo service unit restart + cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc19)/examples + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config + curl http://localhost:8800/ + +Online documentation is available at https://unit.nginx.org + +NOTICE: + +This version of Unit code is made available in support of the open source +development process. This is an intermediate build made available for +testing purposes only. This Unit code is untested and presumed incompatible +with the JSR 340 Java Servlet 3.1 specification. You should not deploy or +write to this code. You should instead deploy and write production +applications on pre-built binaries that have been tested and certified +to meet the JSR-340 compatibility requirements such as certified binaries +published for the JSR-340 reference implementation available at +https://javaee.github.io/glassfish/. + +Redistribution of any Intermediate Build must retain this notice. + +Oracle and Java are registered trademarks of Oracle and/or its affiliates. +Other names may be trademarks of their respective owners. + +---------------------------------------------------------------------- +BANNER +endef +export MODULE_POST_jsc19 diff --git a/pkg/deb/debian.module/unit.example-jsc19-config b/pkg/deb/debian.module/unit.example-jsc19-config new file mode 100644 index 00000000..106b694b --- /dev/null +++ b/pkg/deb/debian.module/unit.example-jsc19-config @@ -0,0 +1,15 @@ +{ + "applications": { + "example_java19": { + "processes": 1, + "type": "java 19", + "webapp": "/usr/share/doc/unit-jsc19/examples/jsc-app" + } + }, + + "listeners": { + "*:8800": { + "pass": "applications/example_java19" + } + } +} |