mirror of https://github.com/apache/activemq.git
Tidied up the activemq.xml file shipped in the distro. Also by default we now embded Jetty so that we can include the web console, or an out of band file transfer mechanism by default
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@516442 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan
parent
82201d28dd
commit
24984276fc
|
|
@ -48,6 +48,10 @@
|
|||
<groupId>${pom.groupId}</groupId>
|
||||
<artifactId>activemq-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>${pom.groupId}</groupId>
|
||||
<artifactId>activemq-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>${pom.groupId}</groupId>
|
||||
<artifactId>activemq-core</artifactId>
|
||||
|
|
@ -82,6 +86,11 @@
|
|||
<artifactId>activemq-web-demo</artifactId>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>${pom.groupId}</groupId>
|
||||
<artifactId>activemq-web-console</artifactId>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>${pom.groupId}</groupId>
|
||||
<artifactId>activemq-rar</artifactId>
|
||||
|
|
@ -177,6 +186,10 @@
|
|||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jetty-util</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jetty-xbean</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.derby</groupId>
|
||||
<artifactId>derby</artifactId>
|
||||
|
|
@ -187,7 +200,31 @@
|
|||
<artifactId>derbynet</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- copied dependencies from activemq-web-console -->
|
||||
<!-- enable commons-logging when inside jetty6:run -->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-jcl</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>opensymphony</groupId>
|
||||
<artifactId>sitemesh</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>jstl</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>taglibs</groupId>
|
||||
<artifactId>standard</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jsp-2.1</artifactId>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
|
|
|
|||
|
|
@ -132,9 +132,6 @@
|
|||
<include>commons-httpclient:commons-httpclient</include>
|
||||
<include>commons-dbcp:commons-dbcp</include>
|
||||
<include>commons-pool:commons-pool</include>
|
||||
<include>org.mortbay.jetty:jetty</include>
|
||||
<include>org.mortbay.jetty:jetty-util</include>
|
||||
<include>org.mortbay.jetty:servlet-api-2.5</include>
|
||||
<include>log4j:log4j</include>
|
||||
<include>mx4j:mx4j-remote</include>
|
||||
<include>mx4j:mx4j-tools</include>
|
||||
|
|
@ -148,5 +145,28 @@
|
|||
<include>activemq:jmdns</include>
|
||||
</includes>
|
||||
</dependencySet>
|
||||
<dependencySet>
|
||||
<outputDirectory>/lib/web</outputDirectory>
|
||||
<unpack>false</unpack>
|
||||
<scope>runtime</scope>
|
||||
<includes>
|
||||
<include>org.mortbay.jetty:jetty</include>
|
||||
<include>org.mortbay.jetty:jetty-util</include>
|
||||
<include>org.mortbay.jetty:jetty-xbean</include>
|
||||
<include>org.mortbay.jetty:servlet-api-2.5</include>
|
||||
<include>org.slf4j:slf4j-jcl</include>
|
||||
|
||||
<!-- JSP support -->
|
||||
<include>org.mortbay.jetty:jsp-2.1</include>
|
||||
<include>org.mortbay.jetty:jsp-api-2.1</include>
|
||||
<include>org.eclipse.jdt:core</include>
|
||||
<include>ant:ant</include>
|
||||
|
||||
<!-- JSTL and other web stuff -->
|
||||
<include>opensymphony:sitemesh</include>
|
||||
<include>javax.servlet:jstl</include>
|
||||
<include>taglibs:standard</include>
|
||||
</includes>
|
||||
</dependencySet>
|
||||
</dependencySets>
|
||||
</assembly>
|
||||
|
|
|
|||
|
|
@ -152,5 +152,28 @@
|
|||
<include>activemq:jmdns</include>
|
||||
</includes>
|
||||
</dependencySet>
|
||||
<dependencySet>
|
||||
<outputDirectory>/lib/web</outputDirectory>
|
||||
<unpack>false</unpack>
|
||||
<scope>runtime</scope>
|
||||
<includes>
|
||||
<include>org.mortbay.jetty:jetty</include>
|
||||
<include>org.mortbay.jetty:jetty-util</include>
|
||||
<include>org.mortbay.jetty:jetty-xbean</include>
|
||||
<include>org.mortbay.jetty:servlet-api-2.5</include>
|
||||
<include>org.slf4j:slf4j-jcl</include>
|
||||
|
||||
<!-- JSP support -->
|
||||
<include>org.mortbay.jetty:jsp-2.1</include>
|
||||
<include>org.mortbay.jetty:jsp-api-2.1</include>
|
||||
<include>org.eclipse.jdt:core</include>
|
||||
<include>ant:ant</include>
|
||||
|
||||
<!-- JSTL and other web stuff -->
|
||||
<include>opensymphony:sitemesh</include>
|
||||
<include>javax.servlet:jstl</include>
|
||||
<include>taglibs:standard</include>
|
||||
</includes>
|
||||
</dependencySet>
|
||||
</dependencySets>
|
||||
</assembly>
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
|
||||
(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
|
||||
accepted projects until a further review indicates that the infrastructure,
|
||||
communications, and decision making process have stabilized in a manner
|
||||
consistent with other successful ASF projects. While incubation status is not
|
||||
necessarily a reflection of the completeness or stability of the code, it does
|
||||
indicate that the project has yet to be fully endorsed by the ASF.
|
||||
|
|
@ -1,122 +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.
|
||||
-->
|
||||
<!-- START SNIPPET: example -->
|
||||
<beans>
|
||||
|
||||
<!-- Allows us to use system properties as variables in this configuration file -->
|
||||
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
|
||||
|
||||
<broker xmlns="http://activemq.org/config/1.0">
|
||||
|
||||
<memoryManager>
|
||||
<usageManager id="memory-manager" limit="50 MB"/>
|
||||
</memoryManager>
|
||||
|
||||
<!-- In ActiveMQ 4, you can setup destination policies -->
|
||||
<destinationPolicy>
|
||||
<policyMap><policyEntries>
|
||||
|
||||
<policyEntry topic="FOO.>">
|
||||
<dispatchPolicy>
|
||||
<strictOrderDispatchPolicy />
|
||||
</dispatchPolicy>
|
||||
<subscriptionRecoveryPolicy>
|
||||
<lastImageSubscriptionRecoveryPolicy />
|
||||
</subscriptionRecoveryPolicy>
|
||||
</policyEntry>
|
||||
|
||||
</policyEntries></policyMap>
|
||||
</destinationPolicy>
|
||||
|
||||
|
||||
<persistenceAdapter>
|
||||
<jdbcPersistenceAdapter dataDirectory="${activemq.base}/activemq-data"/>
|
||||
|
||||
<!--
|
||||
<jdbcPersistenceAdapter dataDirectory="activemq-data" dataSource="#oracle-ds"/>
|
||||
-->
|
||||
</persistenceAdapter>
|
||||
|
||||
<transportConnectors>
|
||||
<transportConnector name="default" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
|
||||
<transportConnector name="stomp" uri="stomp://localhost:61613"/>
|
||||
</transportConnectors>
|
||||
|
||||
<networkConnectors>
|
||||
<!-- auto discover the other brokers
|
||||
|
||||
<networkConnector name="default-nc" uri="multicast://default"/>
|
||||
|
||||
or use static hosts
|
||||
|
||||
<networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)" failover="true"/>
|
||||
-->
|
||||
</networkConnectors>
|
||||
|
||||
</broker>
|
||||
|
||||
<!-- lets create a command agent to respond to message based admin commands on the ActiveMQ.Agent topic -->
|
||||
<commandAgent xmlns="http://activemq.org/config/1.0"/>
|
||||
|
||||
<!-- This xbean configuration file supports all the standard spring xml configuration options -->
|
||||
|
||||
<!-- Postgres DataSource Sample Setup -->
|
||||
<!--
|
||||
<bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource">
|
||||
<property name="serverName" value="localhost"/>
|
||||
<property name="databaseName" value="activemq"/>
|
||||
<property name="portNumber" value="0"/>
|
||||
<property name="user" value="activemq"/>
|
||||
<property name="password" value="activemq"/>
|
||||
<property name="dataSourceName" value="postgres"/>
|
||||
<property name="initialConnections" value="1"/>
|
||||
<property name="maxConnections" value="10"/>
|
||||
</bean>
|
||||
-->
|
||||
|
||||
<!-- MySql DataSource Sample Setup -->
|
||||
<!--
|
||||
<bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
|
||||
<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
|
||||
<property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
|
||||
<property name="username" value="activemq"/>
|
||||
<property name="password" value="activemq"/>
|
||||
<property name="poolPreparedStatements" value="true"/>
|
||||
</bean>
|
||||
-->
|
||||
|
||||
<!-- Oracle DataSource Sample Setup -->
|
||||
<!--
|
||||
<bean id="oracle-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
|
||||
<property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/>
|
||||
<property name="url" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/>
|
||||
<property name="username" value="scott"/>
|
||||
<property name="password" value="tiger"/>
|
||||
<property name="poolPreparedStatements" value="true"/>
|
||||
</bean>
|
||||
-->
|
||||
|
||||
<!-- Embedded Derby DataSource Sample Setup -->
|
||||
<!--
|
||||
<bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
|
||||
<property name="databaseName" value="derbydb"/>
|
||||
<property name="createDatabase" value="create"/>
|
||||
</bean>
|
||||
-->
|
||||
|
||||
</beans>
|
||||
<!-- END SNIPPET: example -->
|
||||
|
|
@ -20,9 +20,59 @@
|
|||
<!-- Allows us to use system properties as variables in this configuration file -->
|
||||
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
|
||||
|
||||
<broker brokerName="localhost" useJmx="true" xmlns="http://activemq.org/config/1.0">
|
||||
<broker xmlns="http://activemq.org/config/1.0" brokerName="localhost" dataDirectory="${activemq.base}/data">
|
||||
|
||||
<!-- Use the following to set the broker memory limit
|
||||
<!-- Destination specific policies using destination names or wildcards -->
|
||||
<destinationPolicy>
|
||||
<policyMap>
|
||||
<policyEntries>
|
||||
|
||||
<policyEntry topic="FOO.>">
|
||||
<dispatchPolicy>
|
||||
<strictOrderDispatchPolicy/>
|
||||
</dispatchPolicy>
|
||||
<subscriptionRecoveryPolicy>
|
||||
<lastImageSubscriptionRecoveryPolicy/>
|
||||
</subscriptionRecoveryPolicy>
|
||||
</policyEntry>
|
||||
|
||||
</policyEntries>
|
||||
</policyMap>
|
||||
</destinationPolicy>
|
||||
|
||||
|
||||
<!-- The transport connectors ActiveMQ will listen to -->
|
||||
<transportConnectors>
|
||||
<transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
|
||||
<transportConnector name="ssl" uri="ssl://localhost:61617"/>
|
||||
<transportConnector name="stomp" uri="stomp://localhost:61613"/>
|
||||
</transportConnectors>
|
||||
|
||||
<!-- The store and forward broker networks ActiveMQ will listen to -->
|
||||
<networkConnectors>
|
||||
<!-- by default just auto discover the other brokers -->
|
||||
<networkConnector name="default-nc" uri="multicast://default"/>
|
||||
<!--
|
||||
<networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)" failover="true"/>
|
||||
-->
|
||||
</networkConnectors>
|
||||
|
||||
|
||||
<!-- Use the following if you wish to configure the journal with JDBC -->
|
||||
<!--
|
||||
<persistenceAdapter>
|
||||
<journaledJDBC journalLogFiles="5" dataDirectory="${activemq.base}/activemq-data" dataSource="#postgres-ds"/>
|
||||
</persistenceAdapter>
|
||||
-->
|
||||
|
||||
<!-- Or if you want to use pure JDBC without a journal -->
|
||||
<!--
|
||||
<persistenceAdapter>
|
||||
<jdbcPersistenceAdapter dataSource="#postgres-ds"/>
|
||||
</persistenceAdapter>
|
||||
-->
|
||||
|
||||
<!-- Use the following to set the broker memory limit
|
||||
<memoryManager>
|
||||
<usageManager id="memory-manager" limit="20 MB"/>
|
||||
</memoryManager>
|
||||
|
|
@ -34,50 +84,25 @@
|
|||
</managementContext>
|
||||
-->
|
||||
|
||||
<!-- In ActiveMQ 4, you can setup destination policies -->
|
||||
<destinationPolicy>
|
||||
<policyMap><policyEntries>
|
||||
|
||||
<policyEntry topic="FOO.>">
|
||||
<dispatchPolicy>
|
||||
<strictOrderDispatchPolicy />
|
||||
</dispatchPolicy>
|
||||
<subscriptionRecoveryPolicy>
|
||||
<lastImageSubscriptionRecoveryPolicy />
|
||||
</subscriptionRecoveryPolicy>
|
||||
</policyEntry>
|
||||
|
||||
</policyEntries></policyMap>
|
||||
</destinationPolicy>
|
||||
|
||||
|
||||
<persistenceAdapter>
|
||||
<journaledJDBC journalLogFiles="5" dataDirectory="${activemq.base}/activemq-data"/>
|
||||
<!-- To use a different datasource, use the following syntax : -->
|
||||
<!--
|
||||
<journaledJDBC journalLogFiles="5" dataDirectory="../activemq-data" dataSource="#postgres-ds"/>
|
||||
-->
|
||||
</persistenceAdapter>
|
||||
|
||||
<transportConnectors>
|
||||
<transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
|
||||
<transportConnector name="ssl" uri="ssl://localhost:61617"/>
|
||||
<transportConnector name="stomp" uri="stomp://localhost:61613"/>
|
||||
</transportConnectors>
|
||||
|
||||
<networkConnectors>
|
||||
<!-- by default just auto discover the other brokers -->
|
||||
<networkConnector name="default-nc" uri="multicast://default"/>
|
||||
<!--
|
||||
<networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)" failover="true"/>
|
||||
-->
|
||||
</networkConnectors>
|
||||
|
||||
</broker>
|
||||
|
||||
<!-- lets create a command agent to respond to message based admin commands on the ActiveMQ.Agent topic -->
|
||||
<commandAgent xmlns="http://activemq.org/config/1.0"/>
|
||||
|
||||
|
||||
<!-- An embedded servlet engine for serving up the Admin console -->
|
||||
<jetty xmlns="http://mortbay.com/schemas/jetty/1.0">
|
||||
<connectors>
|
||||
<nioConnector port="8161" />
|
||||
</connectors>
|
||||
|
||||
<handlers>
|
||||
<webAppContext contextPath="/admin" resourceBase="webapps" parentLoaderPriority="false" />
|
||||
</handlers>
|
||||
</jetty>
|
||||
|
||||
|
||||
|
||||
<!-- This xbean configuration file supports all the standard spring xml configuration options -->
|
||||
|
||||
<!-- Postgres DataSource Sample Setup -->
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ log4j.appender.stdout.threshold=INFO
|
|||
|
||||
# File appender
|
||||
log4j.appender.out=org.apache.log4j.RollingFileAppender
|
||||
log4j.appender.out.file=${activemq.base}/activemq-data/activemq.log
|
||||
log4j.appender.out.file=${activemq.base}/data/activemq.log
|
||||
log4j.appender.out.maxFileSize=1024KB
|
||||
log4j.appender.out.maxBackupIndex=5
|
||||
log4j.appender.out.append=true
|
||||
|
|
|
|||
12
pom.xml
12
pom.xml
|
|
@ -589,12 +589,24 @@
|
|||
<version>${jetty-version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jsp-2.1</artifactId>
|
||||
<version>${jetty-version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jetty-util</artifactId>
|
||||
<version>${jetty-version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jetty-xbean</artifactId>
|
||||
<version>${jetty-version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jetty</artifactId>
|
||||
|
|
|
|||
Loading…
Reference in New Issue