diff options
| -rw-r--r-- | docs/Makefile | 5 | ||||
| -rw-r--r-- | docs/changes.xml | 26 | ||||
| -rw-r--r-- | pkg/deb/Makefile | 15 | ||||
| -rw-r--r-- | pkg/deb/Makefile.jsc-common | 2 | ||||
| -rw-r--r-- | pkg/deb/Makefile.jsc16 | 71 | ||||
| -rw-r--r-- | pkg/deb/Makefile.jsc17 | 71 | ||||
| -rw-r--r-- | pkg/deb/Makefile.python39 | 46 | ||||
| -rw-r--r-- | pkg/deb/debian.module/unit.example-jsc16-config | 15 | ||||
| -rw-r--r-- | pkg/deb/debian.module/unit.example-jsc17-config | 15 | ||||
| -rw-r--r-- | pkg/deb/debian.module/unit.example-python3.9-config | 16 |
10 files changed, 279 insertions, 3 deletions
diff --git a/docs/Makefile b/docs/Makefile index db63eec4..d27e69be 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -7,12 +7,13 @@ PACKAGES= unit \ unit-php \ unit-python unit-python2.7 unit-python3.4 \ unit-python3.5 unit-python3.6 unit-python3.7 \ - unit-python3.8 \ + unit-python3.8 unit-python3.9 \ unit-go unit-go1.7 unit-go1.8 unit-go1.9 unit-go1.10 \ unit-go1.12 unit-go1.13 \ unit-perl \ unit-ruby \ - unit-jsc-common unit-jsc8 unit-jsc10 unit-jsc11 + unit-jsc-common unit-jsc8 unit-jsc10 unit-jsc11 \ + unit-jsc13 unit-jsc14 unit-jsc15 unit-jsc16 unit-jsc17 CURDATE:=$(shell date +"%Y-%m-%d") CURTIME:=$(shell date +"%H:%M:%S %z") diff --git a/docs/changes.xml b/docs/changes.xml index 2dcaf4dd..0a666a3e 100644 --- a/docs/changes.xml +++ b/docs/changes.xml @@ -5,6 +5,32 @@ <change_log title="unit"> +<changes apply="unit-jsc17" ver="1.24.0" rev="1" + date="" time="" + packager="Andrei Belov <defan@nginx.com>"> + +<change> +<para> +Initial release of Java 17 module for NGINX Unit. +</para> +</change> + +</changes> + + +<changes apply="unit-jsc16" ver="1.24.0" rev="1" + date="" time="" + packager="Andrei Belov <defan@nginx.com>"> + +<change> +<para> +Initial release of Java 16 module for NGINX Unit. +</para> +</change> + +</changes> + + <changes apply="unit-php unit-python unit-python2.7 unit-python3.4 unit-python3.5 unit-python3.6 unit-python3.7 diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index d28351d0..c343eb53 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -19,6 +19,21 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= +# Ubuntu 21.04 +ifeq ($(CODENAME),hirsute) +include Makefile.php +include Makefile.python27 +include Makefile.python39 +include Makefile.go +include Makefile.perl +include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc11 +include Makefile.jsc15 +include Makefile.jsc16 +include Makefile.jsc17 +endif + # Ubuntu 20.10 ifeq ($(CODENAME),groovy) include Makefile.php diff --git a/pkg/deb/Makefile.jsc-common b/pkg/deb/Makefile.jsc-common index f7a6010b..1c4a77b5 100644 --- a/pkg/deb/Makefile.jsc-common +++ b/pkg/deb/Makefile.jsc-common @@ -6,7 +6,7 @@ MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit MODULE_VERSION_jsc_common= $(VERSION) MODULE_RELEASE_jsc_common= 1 -ifneq (,$(findstring $(CODENAME),groovy focal eoan disco buster)) +ifneq (,$(findstring $(CODENAME),hirsute groovy focal eoan disco buster)) JAVA_MINVERSION= 11 else JAVA_MINVERSION= 8 diff --git a/pkg/deb/Makefile.jsc16 b/pkg/deb/Makefile.jsc16 new file mode 100644 index 00000000..f45e1299 --- /dev/null +++ b/pkg/deb/Makefile.jsc16 @@ -0,0 +1,71 @@ +MODULES+= jsc16 +MODULE_SUFFIX_jsc16= jsc16 + +MODULE_SUMMARY_jsc16= Java 16 module for NGINX Unit + +MODULE_VERSION_jsc16= $(VERSION) +MODULE_RELEASE_jsc16= 1 + +MODULE_CONFARGS_jsc16= java --module=java16 --home=/usr/lib/jvm/java-16-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ +MODULE_MAKEARGS_jsc16= java16 +MODULE_INSTARGS_jsc16= java16-install + +MODULE_SOURCES_jsc16= unit.example-jsc-app \ + unit.example-jsc16-config + +BUILD_DEPENDS_jsc16= openjdk-16-jdk-headless openjdk-16-jre-headless +BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc16) + +MODULE_BUILD_DEPENDS_jsc16=,openjdk-16-jdk-headless +MODULE_DEPENDS_jsc16=,openjdk-16-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME)) + +define MODULE_PREINSTALL_jsc16 + mkdir -p debian/unit-jsc16/usr/share/doc/unit-jsc16/examples/jsc-app + install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc16/usr/share/doc/unit-jsc16/examples/jsc-app/index.jsp + install -m 644 -p debian/unit.example-jsc16-config debian/unit-jsc16/usr/share/doc/unit-jsc16/examples/unit.config + install -m 644 -p src/java/README.JSR-340 debian/unit-jsc16/usr/share/doc/unit-jsc16/ +endef +export MODULE_PREINSTALL_jsc16 + +define MODULE_POSTINSTALL_jsc16 + cd $$\(BUILDDIR_unit\) \&\& \ + DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall +endef +export MODULE_POSTINSTALL_jsc16 + +define MODULE_POST_jsc16 +cat <<BANNER +---------------------------------------------------------------------- + +The $(MODULE_SUMMARY_jsc16) has been installed. + +To check out the sample app, run these commands: + + sudo service unit restart + cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc16)/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_jsc16 diff --git a/pkg/deb/Makefile.jsc17 b/pkg/deb/Makefile.jsc17 new file mode 100644 index 00000000..16f840da --- /dev/null +++ b/pkg/deb/Makefile.jsc17 @@ -0,0 +1,71 @@ +MODULES+= jsc17 +MODULE_SUFFIX_jsc17= jsc17 + +MODULE_SUMMARY_jsc17= Java 17 module for NGINX Unit + +MODULE_VERSION_jsc17= $(VERSION) +MODULE_RELEASE_jsc17= 1 + +MODULE_CONFARGS_jsc17= java --module=java17 --home=/usr/lib/jvm/java-17-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ +MODULE_MAKEARGS_jsc17= java17 +MODULE_INSTARGS_jsc17= java17-install + +MODULE_SOURCES_jsc17= unit.example-jsc-app \ + unit.example-jsc17-config + +BUILD_DEPENDS_jsc17= openjdk-17-jdk-headless openjdk-17-jre-headless +BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc17) + +MODULE_BUILD_DEPENDS_jsc17=,openjdk-17-jdk-headless +MODULE_DEPENDS_jsc17=,openjdk-17-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME)) + +define MODULE_PREINSTALL_jsc17 + mkdir -p debian/unit-jsc17/usr/share/doc/unit-jsc17/examples/jsc-app + install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc17/usr/share/doc/unit-jsc17/examples/jsc-app/index.jsp + install -m 644 -p debian/unit.example-jsc17-config debian/unit-jsc17/usr/share/doc/unit-jsc17/examples/unit.config + install -m 644 -p src/java/README.JSR-340 debian/unit-jsc17/usr/share/doc/unit-jsc17/ +endef +export MODULE_PREINSTALL_jsc17 + +define MODULE_POSTINSTALL_jsc17 + cd $$\(BUILDDIR_unit\) \&\& \ + DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall +endef +export MODULE_POSTINSTALL_jsc17 + +define MODULE_POST_jsc17 +cat <<BANNER +---------------------------------------------------------------------- + +The $(MODULE_SUMMARY_jsc17) has been installed. + +To check out the sample app, run these commands: + + sudo service unit restart + cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc17)/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_jsc17 diff --git a/pkg/deb/Makefile.python39 b/pkg/deb/Makefile.python39 new file mode 100644 index 00000000..11ce65f0 --- /dev/null +++ b/pkg/deb/Makefile.python39 @@ -0,0 +1,46 @@ +MODULES+= python39 +MODULE_SUFFIX_python39= python3.9 + +MODULE_SUMMARY_python39= Python 3.9 module for NGINX Unit + +MODULE_VERSION_python39= $(VERSION) +MODULE_RELEASE_python39= 1 + +MODULE_CONFARGS_python39= python --config=python3.9-config +MODULE_MAKEARGS_python39= python3.9 +MODULE_INSTARGS_python39= python3.9-install + +MODULE_SOURCES_python39= unit.example-python-app \ + unit.example-python3.9-config + +BUILD_DEPENDS_python39= python3.9-dev +BUILD_DEPENDS+= $(BUILD_DEPENDS_python39) + +MODULE_BUILD_DEPENDS_python39=,python3.9-dev + +define MODULE_PREINSTALL_python39 + mkdir -p debian/unit-python3.9/usr/share/doc/unit-python3.9/examples/python-app + install -m 644 -p debian/unit.example-python-app debian/unit-python3.9/usr/share/doc/unit-python3.9/examples/python-app/wsgi.py + install -m 644 -p debian/unit.example-python3.9-config debian/unit-python3.9/usr/share/doc/unit-python3.9/examples/unit.config +endef +export MODULE_PREINSTALL_python39 + +define MODULE_POST_python39 +cat <<BANNER +---------------------------------------------------------------------- + +The $(MODULE_SUMMARY_python39) has been installed. + +To check out the sample app, run these commands: + + sudo service unit restart + cd /usr/share/doc/unit-$(MODULE_SUFFIX_python39)/examples + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config + curl http://localhost:8400/ + +Online documentation is available at https://unit.nginx.org + +---------------------------------------------------------------------- +BANNER +endef +export MODULE_POST_python39 diff --git a/pkg/deb/debian.module/unit.example-jsc16-config b/pkg/deb/debian.module/unit.example-jsc16-config new file mode 100644 index 00000000..0b10a44d --- /dev/null +++ b/pkg/deb/debian.module/unit.example-jsc16-config @@ -0,0 +1,15 @@ +{ + "applications": { + "example_java16": { + "processes": 1, + "type": "java 16", + "webapp": "/usr/share/doc/unit-jsc16/examples/jsc-app" + } + }, + + "listeners": { + "*:8800": { + "pass": "applications/example_java16" + } + } +} diff --git a/pkg/deb/debian.module/unit.example-jsc17-config b/pkg/deb/debian.module/unit.example-jsc17-config new file mode 100644 index 00000000..28b13e4d --- /dev/null +++ b/pkg/deb/debian.module/unit.example-jsc17-config @@ -0,0 +1,15 @@ +{ + "applications": { + "example_java17": { + "processes": 1, + "type": "java 17", + "webapp": "/usr/share/doc/unit-jsc17/examples/jsc-app" + } + }, + + "listeners": { + "*:8800": { + "pass": "applications/example_java17" + } + } +} diff --git a/pkg/deb/debian.module/unit.example-python3.9-config b/pkg/deb/debian.module/unit.example-python3.9-config new file mode 100644 index 00000000..fdb7e9db --- /dev/null +++ b/pkg/deb/debian.module/unit.example-python3.9-config @@ -0,0 +1,16 @@ +{ + "applications": { + "example_python": { + "type": "python 3.9", + "processes": 2, + "path": "/usr/share/doc/unit-python3.9/examples/python-app", + "module": "wsgi" + } + }, + + "listeners": { + "*:8400": { + "pass": "applications/example_python" + } + } +} |