activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r961470 - in /activemq/trunk/activemq-web-console: pom.xml src/main/webapp/WEB-INF/activemq.xml
Date Wed, 07 Jul 2010 18:30:14 GMT
Author: dejanb
Date: Wed Jul  7 18:30:14 2010
New Revision: 961470

URL: http://svn.apache.org/viewvc?rev=961470&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2570 - more web console pom improvements

Modified:
    activemq/trunk/activemq-web-console/pom.xml
    activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml

Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=961470&r1=961469&r2=961470&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Wed Jul  7 18:30:14 2010
@@ -119,7 +119,7 @@
             <Embed-Directory>WEB-INF/lib</Embed-Directory>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
-            <Import-Package>org.xml.sax,org.xml.sax.helpers,javax.xml.parsers,javax.xml.transform,javax.management.remote,javax.naming,org.w3c.dom,org.apache.activemq,org.apache.activemq.util,org.apache.activemq.xbean,org.apache.activemq*,org.springframework*,org.springframework.context.support,org.springframework.beans.factory.config,org.springframework.core.io,org.springframework.beans.factory,javax.servlet.jsp,javax.servlet.jsp.tagext,*</Import-Package>
+            <Import-Package>org.xml.sax,org.xml.sax.helpers,javax.xml.parsers,javax.xml.transform,javax.management.remote,javax.naming,org.w3c.dom,javax.servlet*,javax.servlet.jsp,javax.servlet.jsp.tagext,javax.management,javax.management.openmbean,javax.net</Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml?rev=961470&r1=961469&r2=961470&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml Wed Jul  7 18:30:14
2010
@@ -26,44 +26,18 @@
   http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
 
-  <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core">
+  <broker  brokerName="web-console" useJmx="true" xmlns="http://activemq.apache.org/schema/core">
 
-    <!-- In ActiveMQ 4, you can setup destination policies -->
-    <destinationPolicy>
-      <policyMap>
-        <policyEntries>
-
-          <policyEntry topic="FOO.>">
-            <dispatchPolicy>
-              <strictOrderDispatchPolicy/>
-            </dispatchPolicy>
-            <subscriptionRecoveryPolicy>
-              <lastImageSubscriptionRecoveryPolicy/>
-            </subscriptionRecoveryPolicy>
-          </policyEntry>
-
-        </policyEntries>
-      </policyMap>
-    </destinationPolicy>
-
-    <networkConnectors>
-      <!-- by default just auto discover the other brokers -->
-      <networkConnector name="defaultNetwork" uri="multicast://default"/>
-      <!--
-      <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)"
failover="true"/>
-      -->
-    </networkConnectors>
+    <persistenceAdapter>
+      <kahaDB directory="${activemq.base}/data/kahadb"/>
+    </persistenceAdapter>
 
     <transportConnectors>
-      <transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+      <transportConnector name="openwire" uri="tcp://localhost:61616"/>
       <transportConnector name="stomp" uri="stomp://localhost:61613"/>
-      <transportConnector name="xmpp" uri="xmpp://localhost:61222"/>
     </transportConnectors>
 
   </broker>
 
-  <!-- lets create a command agent to respond to admin commands over JMS or XMPP on the
ActiveMQ.Agent topic -->
-  <commandAgent xmlns="http://activemq.apache.org/schema/core"/>
-
 </beans>
         <!-- END SNIPPET: xbean -->



Mime
View raw message