diff options
author | Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-05-21 23:53:02 +0200 |
---|---|---|
committer | Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-05-29 01:22:26 +0200 |
commit | c95b7f7b07eb99f5bdd1a908a3f387488c54b997 (patch) | |
tree | a67d6d876296146d3fb7c1d206d3ebd2bb9fbe60 /kubernetes/portal/charts/portal-app/resources/server | |
parent | 48eaa240290bb1bbf1117e8411f560c446d4aefc (diff) |
[PORTAL] Move portal subcharts to components
In order to allow to define dependencies per subchart let's move all
of them to components and make sure that they can be build
independently.
Issue-ID: AAF-1134
Change-Id: Ia75ba66d9338dbacaea500c20f6a5b384d1685a1
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Diffstat (limited to 'kubernetes/portal/charts/portal-app/resources/server')
-rw-r--r-- | kubernetes/portal/charts/portal-app/resources/server/server.xml | 157 | ||||
-rw-r--r-- | kubernetes/portal/charts/portal-app/resources/server/web.xml | 155 |
2 files changed, 0 insertions, 312 deletions
diff --git a/kubernetes/portal/charts/portal-app/resources/server/server.xml b/kubernetes/portal/charts/portal-app/resources/server/server.xml deleted file mode 100644 index dec68376d2..0000000000 --- a/kubernetes/portal/charts/portal-app/resources/server/server.xml +++ /dev/null @@ -1,157 +0,0 @@ -<?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. - - Modifications to this file for use in ONAP are also subject to the Apache-2.0 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" logArgs="false"/> - <!-- 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 (blocking & non-blocking) - 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" - {{ if .Values.global.aafEnabled }} - redirectPort="8443" - {{ end }} - /> - <!-- A "Connector" using the shared thread pool--> - <!-- - <Connector executor="tomcatThreadPool" - port="8080" protocol="HTTP/1.1" - connectionTimeout="20000" - redirectPort="8443" /> - --> - <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 - This connector uses the NIO implementation that requires the JSSE - style configuration. When using the APR/native implementation, the - OpenSSL style configuration is required as described in the APR/native - documentation --> - <!-- - <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol" - maxThreads="150" SSLEnabled="true" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" /> - --> - {{ if .Values.global.aafEnabled }} - <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol" - maxThreads="150" SSLEnabled="true" scheme="https" secure="true" - keystoreFile="{{.Values.aafConfig.credsPath}}/{{.Values.aafConfig.keystoreFile}}" - keystorePass="${javax.net.ssl.keyStorePassword}" - clientAuth="false" sslProtocol="TLS" /> - {{ end }} - <!-- Define an AJP 1.3 Connector on port 8009 --> - <Connector port="8009" protocol="AJP/1.3" - {{ if .Values.global.aafEnabled }} - redirectPort="8443" - {{ end }} - /> - - - <!-- 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" - 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>
\ No newline at end of file diff --git a/kubernetes/portal/charts/portal-app/resources/server/web.xml b/kubernetes/portal/charts/portal-app/resources/server/web.xml deleted file mode 100644 index 8f88e12666..0000000000 --- a/kubernetes/portal/charts/portal-app/resources/server/web.xml +++ /dev/null @@ -1,155 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ============LICENSE_START========================================== - ONAP Portal - =================================================================== - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - =================================================================== - - Unless otherwise specified, all software contained herein is licensed - under the Apache License, Version 2.0 (the "License"); - you may not use this software 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. - - Unless otherwise specified, all documentation contained herein is licensed - under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - you may not use this documentation except in compliance with the License. - You may obtain a copy of the License at - - https://creativecommons.org/licenses/by/4.0/ - - Unless required by applicable law or agreed to in writing, documentation - 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. - - ============LICENSE_END============================================ - - - --> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - <display-name>fusion</display-name> - - <!-- - <context-param> - <param-name>log4jConfigLocation</param-name> - <param-value>/WEB-INF/conf/log4j.properties</param-value> - </context-param> - - <listener> - <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class> - </listener> - --> - - <!-- The Portal app can function on a HA cluster --> - <distributable/> - - <!-- <context-param> - <param-name>contextConfigLocation</param-name> - <param-value>/WEB-INF/oid-context.xml</param-value> - </context-param> - - <listener> - <listener-class> - org.springframework.web.context.ContextLoaderListener - </listener-class> - </listener> --> - - - <listener> - <listener-class>org.onap.portalapp.portal.listener.UserSessionListener</listener-class> - </listener> - <!-- - <filter> - <filter-name>springSessionRepositoryFilter</filter-name> - <filter-class>org.onap.portalapp.music.filter.MusicSessionRepositoryFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>springSessionRepositoryFilter</filter-name> - <url-pattern>/*</url-pattern> - <dispatcher>REQUEST</dispatcher> - <dispatcher>ERROR</dispatcher> - </filter-mapping> - --> - <filter> - <filter-name>CorsFilter</filter-name> - <filter-class>org.apache.catalina.filters.CorsFilter</filter-class> - <init-param> - <param-name>cors.allowed.origins</param-name> - <param-value>http://www.portal.onap.org:9200,http://www.portal.onap.org:9000</param-value> - </init-param> - <init-param> - <param-name>cors.allowed.methods</param-name> - <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value> - </init-param> - <init-param> - <param-name>cors.allowed.headers</param-name> - <param-value>EPService,JSESSIONID,X-ECOMP-RequestID,X-Widgets-Type,Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers</param-value> - </init-param> - <init-param> - <param-name>cors.exposed.headers</param-name> - <param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials</param-value> - </init-param> - <init-param> - <param-name>cors.support.credentials</param-name> - <param-value>true</param-value> - </init-param> - <init-param> - <param-name>cors.preflight.maxage</param-name> - <param-value>10</param-value> - </init-param> - </filter> - - <filter-mapping> - <filter-name>CorsFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <filter> - <filter-name>SecurityXssFilter</filter-name> - <filter-class>org.onap.portalapp.filter.SecurityXssFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>SecurityXssFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> -<!-- <filter> --> -<!-- <filter-name>CadiAuthFilter</filter-name> --> -<!-- <filter-class>org.onap.portalsdk.core.onboarding.crossapi.CadiAuthFilter</filter-class> --> -<!-- <init-param> --> -<!-- <param-name>cadi_prop_files</param-name> --> -<!-- Add Absolute path of cadi.properties --> -<!-- <param-value>{Path}/cadi.properties --> -<!-- </param-value> --> -<!-- </init-param> --> -<!-- Add param values with comma delimited values --> -<!-- <init-param> --> -<!-- <param-name>include_url_endpoints</param-name> --> -<!-- <param-value>/auxapi/*</param-value> --> -<!-- </init-param> --> -<!-- <init-param> --> -<!-- <param-name>exclude_url_endpoints</param-name> --> -<!-- <param-value>/api/v3/analytics,/api/v3/storeAnalytics</param-value> --> -<!-- </init-param> --> -<!-- </filter> --> -<!-- <filter-mapping> --> -<!-- <filter-name>CadiAuthFilter</filter-name> --> -<!-- <url-pattern>/auxapi/v3/*</url-pattern> --> -<!-- </filter-mapping> --> -<!-- <filter-mapping> --> -<!-- <filter-name>CadiAuthFilter</filter-name> --> -<!-- <url-pattern>/auxapi/v4/*</url-pattern> --> - -<!-- </filter-mapping> --> -</web-app> |