You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2023/09/18 12:16:35 UTC
[myfaces-homepage] branch main updated: Release: 6.0.0-beta-1
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-homepage.git
The following commit(s) were added to refs/heads/main by this push:
new 93ef186 Release: 6.0.0-beta-1
93ef186 is described below
commit 93ef18625bf6336cc34c67209bc933f74b69e088
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Mon Sep 18 11:15:23 2023 +0200
Release: 6.0.0-beta-1
---
tobago/tobago-vm/apache-proxy/000-default.conf | 6 +
tobago/tobago-vm/apache-proxy/index.html | 9 ++
tobago/tobago-vm/docker-compose.yml | 14 ++
tobago/tobago-vm/tomcat10/Dockerfile | 33 ++++
.../tobago-vm/tomcat10/download-deploy-and-run.sh | 36 +++++
tobago/tobago-vm/tomcat10/server.xml | 168 +++++++++++++++++++++
6 files changed, 266 insertions(+)
diff --git a/tobago/tobago-vm/apache-proxy/000-default.conf b/tobago/tobago-vm/apache-proxy/000-default.conf
index ab563af..183cc7a 100644
--- a/tobago/tobago-vm/apache-proxy/000-default.conf
+++ b/tobago/tobago-vm/apache-proxy/000-default.conf
@@ -39,6 +39,12 @@ ServerName tobago-demo.apache.org
Redirect temp /download.html "/demo-5-snapshot/content/000-intro/85-download/Download.xhtml"
Redirect temp /release-checklist.html "/demo-5-snapshot/content/000-intro/90-release-checklist/Release_Checklist.xhtml"
+# 6
+ <Location /demo-6-snapshot/>
+ ProxyPass "http://demo-6-snapshot:8080/demo-6-snapshot/"
+ ProxyPassReverse "http://demo-6-snapshot:8080/demo-6-snapshot/"
+ </Location>
+
# 5
# <Location /demo-5-release/>
diff --git a/tobago/tobago-vm/apache-proxy/index.html b/tobago/tobago-vm/apache-proxy/index.html
index b7c7846..c97afa8 100644
--- a/tobago/tobago-vm/apache-proxy/index.html
+++ b/tobago/tobago-vm/apache-proxy/index.html
@@ -24,6 +24,15 @@
//
var versions = [
+ {
+ major: "6",
+ release: "",
+ staging: "",
+ snapshot: "6.0.0-SNAPSHOT",
+ link: "6",
+ archived: false,
+ current: true
+ },
{
major: "5",
release: "",
diff --git a/tobago/tobago-vm/docker-compose.yml b/tobago/tobago-vm/docker-compose.yml
index 084d2ec..c5e46be 100644
--- a/tobago/tobago-vm/docker-compose.yml
+++ b/tobago/tobago-vm/docker-compose.yml
@@ -27,6 +27,7 @@ services:
max-size: "1m"
max-file: "5"
links:
+ - demo-6-snapshot
# - demo-5-release
# - demo-5-staging
- demo-5-snapshot
@@ -44,6 +45,7 @@ services:
# - demo-1-0-staging
# - demo-1-0-snapshot
depends_on:
+ - demo-6-snapshot
# - demo-5-release
# - demo-5-staging
- demo-5-snapshot
@@ -57,6 +59,18 @@ services:
# - demo-1-5-release
# - demo-1-0-release
restart: unless-stopped
+ demo-6-snapshot:
+ build: tomcat10
+ environment:
+ - TOBAGO_VERSION=6.0.0-SNAPSHOT
+ - CONTEXT_PATH=demo-6-snapshot
+ ports:
+ - "8602:8080"
+ logging:
+ options:
+ max-size: "1m"
+ max-file: "5"
+ restart: unless-stopped
# demo-5-release:
# build: tomcat
# environment:
diff --git a/tobago/tobago-vm/tomcat10/Dockerfile b/tobago/tobago-vm/tomcat10/Dockerfile
new file mode 100644
index 0000000..d4cb95a
--- /dev/null
+++ b/tobago/tobago-vm/tomcat10/Dockerfile
@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM tomcat:10-jdk11
+MAINTAINER dev@myfaces.apache.org
+
+RUN rm -r /usr/local/tomcat/webapps.dist
+RUN rm /usr/local/tomcat/conf/logging.properties
+
+COPY server.xml /usr/local/tomcat/conf
+COPY download-deploy-and-run.sh /usr/local/tomcat/bin
+RUN chmod +x /usr/local/tomcat/bin/download-deploy-and-run.sh
+
+#ENV TOBAGO_VERSION undefined
+#ENV CONTEXT_PATH ROOT
+
+RUN chown -R www-data:www-data /usr/local/tomcat
+
+USER www-data
+
+CMD ["download-deploy-and-run.sh"]
diff --git a/tobago/tobago-vm/tomcat10/download-deploy-and-run.sh b/tobago/tobago-vm/tomcat10/download-deploy-and-run.sh
new file mode 100644
index 0000000..c5367b7
--- /dev/null
+++ b/tobago/tobago-vm/tomcat10/download-deploy-and-run.sh
@@ -0,0 +1,36 @@
+#! /bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if [[ ${TOBAGO_VERSION} == *-SNAPSHOT ]]; then
+ REPO=snapshots
+elif [[ ${STAGING_NUMBER} ]]; then
+#todo: not tested yet
+ REPO=orgapachemyfaces-${STAGING_NUMBER}
+else
+ REPO=releases
+fi
+
+TARGET=/usr/local/tomcat/webapps/${CONTEXT_PATH}
+ARTIFACT=/usr/local/tomcat/tobago-example-demo-${TOBAGO_VERSION}.war
+
+set -x
+curl -o ${ARTIFACT} "https://repository.apache.org/service/local/artifact/maven/content?r=${REPO}&g=org.apache.myfaces.tobago&a=tobago-example-demo&p=war&v=${TOBAGO_VERSION}"
+
+mkdir -p ${TARGET}
+pushd ${TARGET} && jar xf ${ARTIFACT}
+
+catalina.sh run
diff --git a/tobago/tobago-vm/tomcat10/server.xml b/tobago/tobago-vm/tomcat10/server.xml
new file mode 100644
index 0000000..7968383
--- /dev/null
+++ b/tobago/tobago-vm/tomcat10/server.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+ <!-- Note: A "Server" is not itself a "Container", so you may not
+ define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+ <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+ <!-- Security listener. Documentation at /docs/config/listeners.html
+ <Listener className="org.apache.catalina.security.SecurityListener" />
+ -->
+ <!--APR library loader. Documentation at /docs/apr.html -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+ <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+ <!-- Global JNDI resources
+ Documentation at /docs/jndi-resources-howto.html
+ -->
+ <GlobalNamingResources>
+ <!-- Editable user database that can also be used by
+ UserDatabaseRealm to authenticate users
+ -->
+ <Resource name="UserDatabase" auth="Container"
+ type="org.apache.catalina.UserDatabase"
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
+ </GlobalNamingResources>
+
+ <!-- A "Service" is a collection of one or more "Connectors" that share
+ a single "Container" Note: A "Service" is not itself a "Container",
+ so you may not define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/service.html
+ -->
+ <Service name="Catalina">
+
+ <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+ <!--
+ <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+ maxThreads="150" minSpareThreads="4"/>
+ -->
+
+
+ <!-- A "Connector" represents an endpoint by which requests are received
+ and responses are returned. Documentation at :
+ Java HTTP Connector: /docs/config/http.html
+ Java AJP Connector: /docs/config/ajp.html
+ APR (HTTP/AJP) Connector: /docs/apr.html
+ Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+ -->
+ <Connector port="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+ <!-- A "Connector" using the shared thread pool-->
+ <!--
+ <Connector executor="tomcatThreadPool"
+ port="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+ -->
+ <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+ This connector uses the NIO implementation. The default
+ SSLImplementation will depend on the presence of the APR/native
+ library and the useOpenSSL attribute of the
+ AprLifecycleListener.
+ Either JSSE or OpenSSL style configuration may be used regardless of
+ the SSLImplementation selected. JSSE style configuration is used below.
+ -->
+ <!--
+ <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+ maxThreads="150" SSLEnabled="true">
+ <SSLHostConfig>
+ <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+ type="RSA" />
+ </SSLHostConfig>
+ </Connector>
+ -->
+ <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+ This connector uses the APR/native implementation which always uses
+ OpenSSL for TLS.
+ Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+ configuration is used below.
+ -->
+ <!--
+ <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+ maxThreads="150" SSLEnabled="true" >
+ <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+ <SSLHostConfig>
+ <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+ certificateFile="conf/localhost-rsa-cert.pem"
+ certificateChainFile="conf/localhost-rsa-chain.pem"
+ type="RSA" />
+ </SSLHostConfig>
+ </Connector>
+ -->
+
+ <!-- Define an AJP 1.3 Connector on port 8009 -->
+<!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />-->
+
+
+ <!-- An Engine represents the entry point (within Catalina) that processes
+ every request. The Engine implementation for Tomcat stand alone
+ analyzes the HTTP headers included with the request, and passes them
+ on to the appropriate Host (virtual host).
+ Documentation at /docs/config/engine.html -->
+
+ <!-- You should set jvmRoute to support load-balancing via AJP ie :
+ <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+ -->
+ <Engine name="Catalina" defaultHost="localhost">
+
+ <!--For clustering, please take a look at documentation at:
+ /docs/cluster-howto.html (simple how to)
+ /docs/config/cluster.html (reference documentation) -->
+ <!--
+ <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+ -->
+
+ <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+ via a brute-force attack -->
+<!-- <Realm className="org.apache.catalina.realm.LockOutRealm">-->
+ <!-- This Realm uses the UserDatabase configured in the global JNDI
+ resources under the key "UserDatabase". Any edits
+ that are performed against this UserDatabase are immediately
+ available for use by the Realm. -->
+<!-- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"-->
+<!-- resourceName="UserDatabase"/>-->
+<!-- </Realm>-->
+
+ <Host name="localhost" appBase="webapps" autoDeploy="true">
+<!-- <Host name="localhost" appBase="webapps"-->
+<!-- unpackWARs="true" autoDeploy="true">-->
+
+ <!-- SingleSignOn valve, share authentication between web applications
+ Documentation at: /docs/config/valve.html -->
+ <!--
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ -->
+
+ <!-- Access log processes all example.
+ Documentation at: /docs/config/valve.html
+ Note: The pattern used is equivalent to using pattern="common" -->
+ <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+ prefix="localhost_access_log" suffix=".txt"
+ pattern="%h %l %u %t "%r" %s %b" />
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>