[ActiveMQ] Align Package With 6.2.x Testing And Versioned Pipeline Fixtures #18417
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,27 @@ | ||
| #!/bin/sh | ||
| # Install Jetty / Jolokia overrides that match the ActiveMQ major line before the broker starts. | ||
| case "${ACTIVEMQ_VERSION}" in | ||
| 5.*) | ||
| cp /integration-templates/jetty-5.17.xml "${ACTIVEMQ_HOME}/conf/jetty.xml" | ||
| cp /integration-templates/jolokia-5.17.xml "${ACTIVEMQ_HOME}/conf/jolokia-access.xml" | ||
| ;; | ||
| *) | ||
| cp /integration-templates/jetty-6.2.xml "${ACTIVEMQ_HOME}/conf/jetty.xml" | ||
| cp /integration-templates/jolokia-6.2.xml "${ACTIVEMQ_HOME}/conf/jolokia-access.xml" | ||
| ;; | ||
| esac | ||
|
|
||
| # Whenever docker container is ran it will remove log files from SERVICE_LOGS_DIR, so to make them accessible again for the docker container to run system test, | ||
| # following commands will help to copy and accesses these files from SERVICE_LOGS_DIR again. | ||
| mkdir -p "${ACTIVEMQ_HOME}/logs" | ||
| cp /sample_logs/* "${ACTIVEMQ_HOME}/logs/" 2>/dev/null || true | ||
| chmod a+rw -R "${ACTIVEMQ_HOME}/logs/" | ||
|
|
||
| bin/activemq console & | ||
| sleep 10 | ||
|
|
||
| while : | ||
| do | ||
| curl -u admin:admin -d "body=message" http://localhost:8161/api/message/TEST?type=queue | ||
| sleep 1 | ||
| done | ||
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,219 @@ | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <!-- | ||
| An embedded servlet engine for serving up the Admin consoles, REST and Ajax APIs and | ||
| some demos Include this file in your configuration to enable ActiveMQ web components | ||
| e.g. <import resource="jetty.xml"/> | ||
| --> | ||
| <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> | ||
|
|
||
| <bean id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration"> | ||
| <property name="sendServerVersion" value="false"/> | ||
| </bean> | ||
|
|
||
| <bean id="jaasLoginService" class="org.eclipse.jetty.jaas.JAASLoginService"> | ||
| <property name="name" value="ActiveMQRealm"/> | ||
| <property name="loginModuleName" value="activemq"/> | ||
| <property name="roleClassNames"> | ||
| <list> | ||
| <value>org.apache.activemq.jaas.GroupPrincipal</value> | ||
| </list> | ||
| </property> | ||
| </bean> | ||
|
|
||
| <bean id="identityService" class="org.eclipse.jetty.security.DefaultIdentityService"/> | ||
|
|
||
| <bean id="securityConstraint" class="org.eclipse.jetty.util.security.Constraint"> | ||
| <property name="name" value="BASIC" /> | ||
| <property name="roles" value="users,admins" /> | ||
| <!-- set authenticate=false to disable login --> | ||
| <property name="authenticate" value="true" /> | ||
| </bean> | ||
| <bean id="adminSecurityConstraint" class="org.eclipse.jetty.util.security.Constraint"> | ||
| <property name="name" value="BASIC" /> | ||
| <property name="roles" value="admins" /> | ||
| <!-- set authenticate=false to disable login --> | ||
| <property name="authenticate" value="true" /> | ||
| </bean> | ||
| <bean id="securityConstraintMapping" class="org.eclipse.jetty.security.ConstraintMapping"> | ||
| <property name="constraint" ref="securityConstraint" /> | ||
| <property name="pathSpec" value="/" /> | ||
| </bean> | ||
| <bean id="adminSecurityConstraintMapping" class="org.eclipse.jetty.security.ConstraintMapping"> | ||
| <property name="constraint" ref="adminSecurityConstraint" /> | ||
| <property name="pathSpec" value="*.action" /> | ||
| </bean> | ||
|
|
||
| <bean id="rewriteHandler" class="org.eclipse.jetty.rewrite.handler.RewriteHandler"> | ||
| <property name="rules"> | ||
| <list> | ||
| <bean id="header" class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule"> | ||
| <property name="pattern" value="*"/> | ||
| <property name="name" value="X-FRAME-OPTIONS"/> | ||
| <property name="value" value="SAMEORIGIN"/> | ||
| </bean> | ||
| <bean id="header" class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule"> | ||
| <property name="pattern" value="*"/> | ||
| <property name="name" value="X-XSS-Protection"/> | ||
| <property name="value" value="1; mode=block"/> | ||
| </bean> | ||
| <bean id="header" class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule"> | ||
| <property name="pattern" value="*"/> | ||
| <property name="name" value="X-Content-Type-Options"/> | ||
| <property name="value" value="nosniff"/> | ||
| </bean> | ||
| <bean id="header" class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule"> | ||
| <property name="pattern" value="*"/> | ||
| <property name="name" value="Cache-Control"/> | ||
| <property name="value" value="no-store"/> | ||
| </bean> | ||
| <bean id="header" class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule"> | ||
| <property name="pattern" value="*"/> | ||
| <property name="name" value="Content-Security-Policy"/> | ||
| <property name="value" value="style-src-elem 'self'; style-src 'self'; img-src 'self'; script-src-elem 'self'; default-src 'none'; object-src 'none'; frame-ancestors 'none'; base-uri 'none';" /> | ||
| </bean> | ||
| <!-- More relaxed rules to allow browsers to properly render XML --> | ||
| <bean id="header" class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule"> | ||
| <property name="pattern" value="/admin/xml/*"/> | ||
| <property name="name" value="Content-Security-Policy"/> | ||
| <property name="value" value="style-src-elem 'self' 'unsafe-inline'; style-src 'self'; img-src 'self' data:; script-src-elem 'self'; default-src 'none'; object-src 'none'; frame-ancestors 'none'; base-uri 'none';" /> | ||
| </bean> | ||
| </list> | ||
| </property> | ||
| </bean> | ||
|
|
||
| <bean id="secHandlerCollection" class="org.eclipse.jetty.server.handler.HandlerCollection"> | ||
| <property name="handlers"> | ||
| <list> | ||
| <ref bean="rewriteHandler"/> | ||
| <bean class="org.eclipse.jetty.webapp.WebAppContext"> | ||
| <property name="contextPath" value="/admin" /> | ||
| <property name="resourceBase" value="${activemq.home}/webapps/admin" /> | ||
| <property name="logUrlOnStart" value="true" /> | ||
| </bean> | ||
| <bean class="org.eclipse.jetty.webapp.WebAppContext"> | ||
| <property name="contextPath" value="/api" /> | ||
| <property name="resourceBase" value="${activemq.home}/webapps/api" /> | ||
| <property name="logUrlOnStart" value="true" /> | ||
| </bean> | ||
| <bean class="org.eclipse.jetty.server.handler.ResourceHandler"> | ||
| <property name="directoriesListed" value="false" /> | ||
| <property name="welcomeFiles"> | ||
| <list> | ||
| <value>index.html</value> | ||
| </list> | ||
| </property> | ||
| <property name="resourceBase" value="${activemq.home}/webapps/" /> | ||
| </bean> | ||
| <bean id="defaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"> | ||
| <property name="serveIcon" value="false" /> | ||
| </bean> | ||
| </list> | ||
| </property> | ||
| </bean> | ||
| <bean id="securityHandler" class="org.eclipse.jetty.security.ConstraintSecurityHandler"> | ||
| <property name="identityService" ref="identityService" /> | ||
| <property name="loginService" ref="jaasLoginService" /> | ||
| <property name="authenticator"> | ||
| <bean class="org.eclipse.jetty.security.authentication.BasicAuthenticator" /> | ||
| </property> | ||
| <property name="constraintMappings"> | ||
| <list> | ||
| <ref bean="adminSecurityConstraintMapping" /> | ||
| <ref bean="securityConstraintMapping" /> | ||
| </list> | ||
| </property> | ||
| <property name="handler" ref="secHandlerCollection" /> | ||
| </bean> | ||
|
|
||
| <bean id="contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"> | ||
| </bean> | ||
|
|
||
| <bean id="jettyPort" class="org.apache.activemq.web.WebConsolePort" init-method="start"> | ||
| <!-- the default port number for the web console --> | ||
| <property name="host" value="0.0.0.0"/> | ||
| <property name="port" value="8161"/> | ||
| </bean> | ||
|
|
||
| <bean id="Server" depends-on="jettyPort" class="org.eclipse.jetty.server.Server" | ||
| destroy-method="stop"> | ||
|
|
||
| <property name="handler"> | ||
| <bean id="handlers" class="org.eclipse.jetty.server.handler.HandlerCollection"> | ||
| <property name="handlers"> | ||
| <list> | ||
| <ref bean="contexts" /> | ||
| <ref bean="securityHandler" /> | ||
| </list> | ||
| </property> | ||
| </bean> | ||
| </property> | ||
|
|
||
| </bean> | ||
|
|
||
| <bean id="invokeConnectors" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"> | ||
| <property name="targetObject" ref="Server" /> | ||
| <property name="targetMethod" value="setConnectors" /> | ||
| <property name="arguments"> | ||
| <list> | ||
| <bean id="Connector" class="org.eclipse.jetty.server.ServerConnector"> | ||
| <constructor-arg ref="Server"/> | ||
| <constructor-arg> | ||
| <list> | ||
| <bean id="httpConnectionFactory" class="org.eclipse.jetty.server.HttpConnectionFactory"> | ||
| <constructor-arg ref="httpConfig"/> | ||
| </bean> | ||
| </list> | ||
| </constructor-arg> | ||
| <!-- see the jettyPort bean --> | ||
| <property name="host" value="#{systemProperties['jetty.host']}" /> | ||
| <property name="port" value="#{systemProperties['jetty.port']}" /> | ||
| </bean> | ||
| <!-- | ||
| Enable this connector if you wish to use https with web console | ||
| --> | ||
| <!-- bean id="SecureConnector" class="org.eclipse.jetty.server.ServerConnector"> | ||
| <constructor-arg ref="Server" /> | ||
| <constructor-arg> | ||
| <bean id="handlers" class="org.eclipse.jetty.util.ssl.SslContextFactory$Server"> | ||
| <property name="keyStorePath" value="${activemq.conf}/broker.ks" /> | ||
| <property name="keyStorePassword" value="password" /> | ||
| </bean> | ||
| </constructor-arg> | ||
| <property name="port" value="8162" /> | ||
| </bean --> | ||
| </list> | ||
| </property> | ||
| </bean> | ||
|
|
||
| <bean id="configureJetty" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"> | ||
| <property name="staticMethod" value="org.apache.activemq.web.config.JspConfigurer.configureJetty" /> | ||
| <property name="arguments"> | ||
| <list> | ||
| <ref bean="Server" /> | ||
| <ref bean="secHandlerCollection" /> | ||
| </list> | ||
| </property> | ||
| </bean> | ||
|
|
||
| <bean id="invokeStart" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean" | ||
| depends-on="configureJetty, invokeConnectors"> | ||
| <property name="targetObject" ref="Server" /> | ||
| <property name="targetMethod" value="start" /> | ||
| </bean> | ||
|
|
||
|
|
||
| </beans> | ||
|
|
||
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,81 @@ | ||||||||||||||||||||||||||||||||||||
| <?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. | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| Based on Apache ActiveMQ Classic 6.2.x conf/jolokia-access.xml, with relaxed | ||||||||||||||||||||||||||||||||||||
| CORS and HTTP method settings so Elastic Agent / Metricbeat can read metrics | ||||||||||||||||||||||||||||||||||||
| without browser Origin headers during integration tests. | ||||||||||||||||||||||||||||||||||||
| --> | ||||||||||||||||||||||||||||||||||||
| <restrict> | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| <cors> | ||||||||||||||||||||||||||||||||||||
| <allow-origin>http://localhost:*</allow-origin> | ||||||||||||||||||||||||||||||||||||
| <allow-origin>http://127.0.0.1:*</allow-origin> | ||||||||||||||||||||||||||||||||||||
| <allow-origin>*</allow-origin> | ||||||||||||||||||||||||||||||||||||
|
Comment on lines
+20
to
+27
There was a problem hiding this comment.
Suggested change
|
||||||||||||||||||||||||||||||||||||
| </cors> | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| <http> | ||||||||||||||||||||||||||||||||||||
| <method>post</method> | ||||||||||||||||||||||||||||||||||||
| <method>get</method> | ||||||||||||||||||||||||||||||||||||
| </http> | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| <!-- By default don't allow write or exec operations --> | ||||||||||||||||||||||||||||||||||||
| <commands> | ||||||||||||||||||||||||||||||||||||
| <command>read</command> | ||||||||||||||||||||||||||||||||||||
| <command>list</command> | ||||||||||||||||||||||||||||||||||||
| <command>version</command> | ||||||||||||||||||||||||||||||||||||
| <command>search</command> | ||||||||||||||||||||||||||||||||||||
| </commands> | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| <allow> | ||||||||||||||||||||||||||||||||||||
| <!-- Allow all operations for the broker itself --> | ||||||||||||||||||||||||||||||||||||
| <mbean> | ||||||||||||||||||||||||||||||||||||
| <name>org.apache.activemq:*</name> | ||||||||||||||||||||||||||||||||||||
| <attribute>*</attribute> | ||||||||||||||||||||||||||||||||||||
| <operation>*</operation> | ||||||||||||||||||||||||||||||||||||
| </mbean> | ||||||||||||||||||||||||||||||||||||
| <!-- Allow all operations for Jolokia Config --> | ||||||||||||||||||||||||||||||||||||
| <mbean> | ||||||||||||||||||||||||||||||||||||
| <name>jolokia:type=Config</name> | ||||||||||||||||||||||||||||||||||||
| <operation>*</operation> | ||||||||||||||||||||||||||||||||||||
| </mbean> | ||||||||||||||||||||||||||||||||||||
| </allow> | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| <!-- deny all operations or getting attributes from these mbeans --> | ||||||||||||||||||||||||||||||||||||
| <deny> | ||||||||||||||||||||||||||||||||||||
| <mbean> | ||||||||||||||||||||||||||||||||||||
| <name>org.apache.logging.log4j2:*</name> | ||||||||||||||||||||||||||||||||||||
| <attribute>*</attribute> | ||||||||||||||||||||||||||||||||||||
| <operation>*</operation> | ||||||||||||||||||||||||||||||||||||
| </mbean> | ||||||||||||||||||||||||||||||||||||
| <mbean> | ||||||||||||||||||||||||||||||||||||
| <name>com.sun.management:type=DiagnosticCommand</name> | ||||||||||||||||||||||||||||||||||||
| <attribute>*</attribute> | ||||||||||||||||||||||||||||||||||||
| <operation>*</operation> | ||||||||||||||||||||||||||||||||||||
| </mbean> | ||||||||||||||||||||||||||||||||||||
| <mbean> | ||||||||||||||||||||||||||||||||||||
| <name>com.sun.management:type=HotSpotDiagnostic</name> | ||||||||||||||||||||||||||||||||||||
| <attribute>*</attribute> | ||||||||||||||||||||||||||||||||||||
| <operation>*</operation> | ||||||||||||||||||||||||||||||||||||
| </mbean> | ||||||||||||||||||||||||||||||||||||
| <mbean> | ||||||||||||||||||||||||||||||||||||
| <name>jdk.management.jfr:type=FlightRecorder</name> | ||||||||||||||||||||||||||||||||||||
| <attribute>*</attribute> | ||||||||||||||||||||||||||||||||||||
| <operation>*</operation> | ||||||||||||||||||||||||||||||||||||
| </mbean> | ||||||||||||||||||||||||||||||||||||
| </deny> | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| </restrict> | ||||||||||||||||||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| variants: | ||
| "v6.2.2": | ||
| SERVICE_VERSION: 6.2.2 | ||
| "v5.17.1": | ||
| SERVICE_VERSION: 5.17.1 | ||
| default: v6.2.2 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These HeaderPatternRule beans are all declared with the same bean id ("header"). In Spring XML, bean ids are expected to be unique; duplicates can either fail parsing or silently override earlier definitions depending on the bean factory settings. Drop the id attributes (since they are not referenced) or make them unique to avoid unpredictable behavior.