Author: jstrachan
Date: Fri Jun 22 08:14:14 2007
New Revision: 549838
URL: http://svn.apache.org/viewvc?view=rev&rev=549838
Log:
added pom & xml config file cleaning from patch AMQ-1281
Added:
activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-default.xml (with
props)
Modified:
activemq/trunk/activemq-web-console/pom.xml
activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-embedded.xml
Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?view=diff&rev=549838&r1=549837&r2=549838
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Fri Jun 22 08:14:14 2007
@@ -36,6 +36,22 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warSourceExcludes>
+ WEB-INF/lib/activation*.jar,
+ WEB-INF/lib/activeio*.jar,
+ WEB-INF/lib/activemq-console*.jar,
+ WEB-INF/lib/activemq-core*.jar,
+ WEB-INF/lib/activemq-xmpp*.jar,
+ WEB-INF/lib/geronimo*.jar,
+ WEB-INF/lib/xml-apis*.jar,
+ WEB-INF/lib/xerces*.jar
+ </warSourceExcludes>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>${jetty-version}</version>
@@ -52,7 +68,15 @@
<name>com.sun.management.jmxremote</name>
<value></value>
</systemProperty>
+
+ <!-- Start an own broker -->
+ <systemProperty>
+ <name>webconsole.type</name>
+ <value>embedded</value>
+ </systemProperty>
+
<!--
+ Use the following configuration to connect to a remote broker using JMX
<systemProperty>
<name>webconsole.type</name>
<value>properties</value>
Added: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-default.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-default.xml?view=auto&rev=549838
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-default.xml (added)
+++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-default.xml Fri
Jun 22 08:14:14 2007
@@ -0,0 +1,26 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+
+ <import resource="webconsole-jndi.xml"/>
+
+</beans>
Propchange: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-default.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-embedded.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-embedded.xml?view=diff&rev=549838&r1=549837&r2=549838
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-embedded.xml (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/webconsole-embedded.xml Fri
Jun 22 08:14:14 2007
@@ -15,30 +15,30 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
/>
- <!-- use the following bean for a local in-JVM broker -->
- <bean id="brokerQuery" class="org.apache.activemq.web.LocalBrokerFacade" autowire='constructor'
singleton="false"/>
-
- <!-- use the following for a remote JMX based broker -->
- <!--<bean id="brokerQuery" class="org.apache.activemq.web.JMXBrokerFacade" autowire='constructor'
singleton="false"/>-->
+
+ <bean id="sessionPool" class="org.apache.activemq.web.SessionPool">
+ <property name="connectionFactory" ref="connectionFactory"/>
+ </bean>
<bean id="brokerService" class="org.apache.activemq.xbean.BrokerFactoryBean">
<property name="config" value="/WEB-INF/activemq.xml"/>
</bean>
+ <bean id="brokerURL" factory-bean="brokerService" factory-method="getVmConnectorURI"/>
- <bean id="sessionPool" class="org.apache.activemq.web.SessionPool">
- <property name="connectionFactory" ref="connectionFactory"/>
+ <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+ <constructor-arg ref="brokerURL"/>
</bean>
- <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory" depends-on="brokerService">
- <property name="brokerURL" value="vm://localhost"/>
- </bean>
+ <bean id="brokerQuery" class="org.apache.activemq.web.LocalBrokerFacade" autowire="constructor"
scope="prototype"/>
- <bean id="queueBrowser" class="org.apache.activemq.web.QueueBrowseQuery" autowire='constructor'
singleton="false"/>
- <bean id="messageQuery" class="org.apache.activemq.web.MessageQuery" autowire='constructor'
singleton="false"/>
+ <bean id="queueBrowser" class="org.apache.activemq.web.QueueBrowseQuery" autowire="constructor"
destroy-method="destroy" scope="request"/>
+ <bean id="messageQuery" class="org.apache.activemq.web.MessageQuery" autowire="constructor"
destroy-method="destroy" scope="request"/>
</beans>
|