Updated Branches: refs/heads/trunk 032063006 -> 2ecf41d02
http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/activemq-throughput.xml ---------------------------------------------------------------------- diff --git a/assembly/src/sample-conf/activemq-throughput.xml b/assembly/src/sample-conf/activemq-throughput.xml deleted file mode 100644 index 3e2b9ab..0000000 --- a/assembly/src/sample-conf/activemq-throughput.xml +++ /dev/null @@ -1,82 +0,0 @@ -<!-- - 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. ---> -<!-- - Tune ActiveMQ broker for high throughput of messages - Be sure to make necessary changes in your producer and consumer, since there you can make the most notable difference - - For more information, see: - http://activemq.apache.org/performance-tuning.html - - To run ActiveMQ with this configuration add xbean:conf/activemq-throughput.xml to your command - e.g. $ bin/activemq console xbean:conf/activemq-throughput.xml - --> -<beans - xmlns="http://www.springframework.org/schema/beans"; - xmlns:amq="http://activemq.apache.org/schema/core"; - 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 - http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> - - <!-- Allows us to use system properties as variables in this configuration file --> - <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - - <broker xmlns="http://activemq.apache.org/schema/core"; brokerName="localhost" dataDirectory="${activemq.data}" useJmx="false" advisorySupport="false"> - - <!-- - Use VM cursor - For more information, see: - http://activemq.apache.org/message-cursors.html - --> - <destinationPolicy> - <policyMap> - <policyEntries> - <policyEntry topic=">" producerFlowControl="true" memoryLimit="1mb"> - <pendingSubscriberPolicy> - <vmCursor /> - </pendingSubscriberPolicy> - </policyEntry> - <policyEntry queue=">" producerFlowControl="true" memoryLimit="1mb"> - <pendingQueuePolicy> - <vmQueueCursor/> - </pendingQueuePolicy> - </policyEntry> - </policyEntries> - </policyMap> - </destinationPolicy> - - <!-- - Use KahaDB for persistence - Tune it a bit so we minimize IO operations - For more information, see: - http://activemq.apache.org/kahadb.html - --> - <persistenceAdapter> - <kahaDB directory="${activemq.data}/kahadb" enableJournalDiskSyncs="false" indexWriteBatchSize="10000" indexCacheSize="1000"/> - </persistenceAdapter> - - <!-- - Use TCP transport - For more information, see: - http://activemq.apache.org/configuring-transports.html - --> - <transportConnectors> - <transportConnector name="openwire" uri="tcp://0.0.0.0:61616"/> - </transportConnectors> - - </broker> - -</beans> http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/assembly/src/sample-conf/jetty-demo.xml ---------------------------------------------------------------------- diff --git a/assembly/src/sample-conf/jetty-demo.xml b/assembly/src/sample-conf/jetty-demo.xml deleted file mode 100644 index cf8d970..0000000 --- a/assembly/src/sample-conf/jetty-demo.xml +++ /dev/null @@ -1,162 +0,0 @@ - - <!-- - 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="securityLoginService" class="org.eclipse.jetty.security.HashLoginService"> - <property name="name" value="ActiveMQRealm" /> - <property name="config" value="${activemq.conf}/jetty-realm.properties" /> - </bean> - - <bean id="securityConstraint" class="org.eclipse.jetty.util.security.Constraint"> - <property name="name" value="BASIC" /> - <property name="roles" value="user,admin" /> - <!-- 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="admin" /> - <!-- 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="/admin/*,*.jsp" /> - </bean> - <bean id="adminSecurityConstraintMapping" class="org.eclipse.jetty.security.ConstraintMapping"> - <property name="constraint" ref="adminSecurityConstraint" /> - <property name="pathSpec" value="*.action" /> - </bean> - <bean id="securityHandler" class="org.eclipse.jetty.security.ConstraintSecurityHandler"> - <property name="loginService" ref="securityLoginService" /> - <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"> - <bean id="sec" class="org.eclipse.jetty.server.handler.HandlerCollection"> - <property name="handlers"> - <list> - <bean class="org.eclipse.jetty.webapp.WebAppContext"> - <property name="contextPath" value="/hawtio" /> - <property name="war" value="${activemq.home}/webapps/hawtio" /> - <property name="logUrlOnStart" value="true" /> - </bean> - <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="/fileserver" /> - <property name="resourceBase" value="${activemq.home}/webapps/fileserver" /> - <property name="logUrlOnStart" value="true" /> - <property name="parentLoaderPriority" value="true" /> - </bean> - <bean class="org.eclipse.jetty.webapp.WebAppContext"> - <property name="contextPath" value="/demo" /> - <property name="resourceBase" value="${activemq.home}/webapps-demo/demo" /> - <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> - </property> - </bean> - - <bean id="rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler"> - <property name="rules"> - <set> - <bean class="org.eclipse.jetty.rewrite.handler.RedirectRegexRule"> - <property name="regex" value="/api/jolokia(.*)"/> - <property name="replacement" value="/hawtio/jolokia$1"/> - </bean> - </set> - </property> - </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="port" value="8161"/> - </bean> - - <bean id="Server" depends-on="jettyPort" class="org.eclipse.jetty.server.Server" init-method="start" - destroy-method="stop"> - - <property name="connectors"> - <list> - <bean id="Connector" class="org.eclipse.jetty.server.nio.SelectChannelConnector"> - <!-- see the jettyPort bean --> - <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.ssl.SslSelectChannelConnector"> - <property name="port" value="8162" /> - <property name="keystore" value="file:${activemq.conf}/broker.ks" /> - <property name="password" value="password" /> - </bean> - --> - </list> - </property> - - <property name="handler"> - <bean id="handlers" class="org.eclipse.jetty.server.handler.HandlerCollection"> - <property name="handlers"> - <list> - <ref bean="rewrite"/> - <ref bean="contexts" /> - <ref bean="securityHandler" /> - </list> - </property> - </bean> - </property> - - </bean> - -</beans> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq/blob/2ecf41d0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 66cc829..9dd6423 100755 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,7 @@ <xerces-version>2.11.0</xerces-version> <zookeeper-version>3.4.5</zookeeper-version> <jaxb-basics-version>0.6.4</jaxb-basics-version> + <stompjms-version>1.16</stompjms-version> <pax-exam-version>2.6.0</pax-exam-version> <paxexam-karaf-container-version>1.0.0</paxexam-karaf-container-version>
