activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1441501 - in /activemq/trunk/activemq-karaf: pom.xml src/main/resources/activemq.xml src/main/resources/features.xml src/main/resources/org.apache.activemq.server-default.cfg src/main/resources/org.apache.activemq.webconsole.cfg
Date Fri, 01 Feb 2013 16:03:23 GMT
Author: dejanb
Date: Fri Feb  1 16:03:23 2013
New Revision: 1441501

URL: http://svn.apache.org/viewvc?rev=1441501&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4034 - osgi, add default configurations

Added:
    activemq/trunk/activemq-karaf/src/main/resources/activemq.xml
    activemq/trunk/activemq-karaf/src/main/resources/org.apache.activemq.server-default.cfg
    activemq/trunk/activemq-karaf/src/main/resources/org.apache.activemq.webconsole.cfg
Modified:
    activemq/trunk/activemq-karaf/pom.xml
    activemq/trunk/activemq-karaf/src/main/resources/features.xml

Modified: activemq/trunk/activemq-karaf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/pom.xml?rev=1441501&r1=1441500&r2=1441501&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/pom.xml (original)
+++ activemq/trunk/activemq-karaf/pom.xml Fri Feb  1 16:03:23 2013
@@ -144,6 +144,21 @@
                   <type>xml</type>
                   <classifier>features</classifier>
                 </artifact>
+                <artifact>
+                  <file>target/classes/activemq.xml</file>
+                  <type>xml</type>
+                  <classifier>activemq</classifier>
+                </artifact>
+                <artifact>
+                  <file>target/classes/org.apache.activemq.server-default.cfg</file>
+                  <type>cfg</type>
+                  <classifier>activemq</classifier>
+                </artifact>
+                <artifact>
+                  <file>target/classes/org.apache.activemq.webconsole.cfg</file>
+                  <type>cfg</type>
+                  <classifier>activemq-webconsole</classifier>
+                </artifact>
               </artifacts>
             </configuration>
           </execution>

Added: activemq/trunk/activemq-karaf/src/main/resources/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/activemq.xml?rev=1441501&view=auto
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/activemq.xml (added)
+++ activemq/trunk/activemq-karaf/src/main/resources/activemq.xml Fri Feb  1 16:03:23 2013
@@ -0,0 +1,78 @@
+<!--
+
+    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: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-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+
+
+    <broker xmlns="http://activemq.apache.org/schema/core"
+            brokerName="${broker-name}"
+            dataDirectory="${data}"
+            start="false">
+
+        <destinationPolicy>
+            <policyMap>
+              <policyEntries>
+                <policyEntry topic=">" producerFlowControl="true">
+                  <pendingMessageLimitStrategy>
+                    <constantPendingMessageLimitStrategy limit="1000"/>
+                  </pendingMessageLimitStrategy>
+                </policyEntry>
+                <policyEntry queue=">" producerFlowControl="true" memoryLimit="1mb">
+                </policyEntry>
+              </policyEntries>
+            </policyMap>
+        </destinationPolicy>
+
+        <managementContext>
+            <managementContext createConnector="false"/>
+        </managementContext>
+
+        <persistenceAdapter>
+            <kahaDB directory="${data}/kahadb"/>
+        </persistenceAdapter>
+
+        <plugins>
+            <jaasAuthenticationPlugin configuration="karaf" />
+        </plugins>
+
+        <systemUsage>
+            <systemUsage>
+                <memoryUsage>
+                    <memoryUsage limit="64 mb"/>
+                </memoryUsage>
+                <storeUsage>
+                    <storeUsage limit="100 gb"/>
+                </storeUsage>
+                <tempUsage>
+                    <tempUsage limit="50 gb"/>
+                </tempUsage>
+            </systemUsage>
+        </systemUsage>
+
+        <transportConnectors>
+            <transportConnector name="openwire" uri="tcp://0.0.0.0:61616?maximumConnections=1000"/>
+        </transportConnectors>
+    </broker>
+
+</beans>
\ No newline at end of file

Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1441501&r1=1441500&r2=1441501&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Fri Feb  1 16:03:23 2013
@@ -67,6 +67,9 @@
         <bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
         <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
         <feature version="${project.version}">activemq-http</feature>
+        <configfile finalname="/etc/activemq.xml">mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/activemq</configfile>
+        <configfile finalname="/etc/org.apache.activemq.server-default.cfg">mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq</configfile>
+        <feature version="${project.version}">activemq-web-console</feature>
     </feature>
 
     <feature name="activemq-http" version="${project.version}" resolver="(obr)" start-level="50">
@@ -91,6 +94,7 @@
     <feature name="activemq-web-console" version="${project.version}" resolver="(obr)"
start-level="50">
       <feature>war</feature>
       <feature>eventadmin</feature>
+      <configfile finalname="/etc/org.apache.activemq.webconsole.cfg">mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq-webconsole</configfile>
       <bundle>mvn:org.apache.activemq/activemq-web-console/${project.version}/war</bundle>
     </feature>
 

Added: activemq/trunk/activemq-karaf/src/main/resources/org.apache.activemq.server-default.cfg
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/org.apache.activemq.server-default.cfg?rev=1441501&view=auto
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/org.apache.activemq.server-default.cfg
(added)
+++ activemq/trunk/activemq-karaf/src/main/resources/org.apache.activemq.server-default.cfg
Fri Feb  1 16:03:23 2013
@@ -0,0 +1,3 @@
+broker-name=amq-broker
+data=${karaf.data}/${broker-name}
+config=${karaf.base}/etc/activemq.xml
\ No newline at end of file

Added: activemq/trunk/activemq-karaf/src/main/resources/org.apache.activemq.webconsole.cfg
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/org.apache.activemq.webconsole.cfg?rev=1441501&view=auto
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/org.apache.activemq.webconsole.cfg (added)
+++ activemq/trunk/activemq-karaf/src/main/resources/org.apache.activemq.webconsole.cfg Fri
Feb  1 16:03:23 2013
@@ -0,0 +1,4 @@
+webconsole.jms.url=tcp://localhost:61616
+webconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-root
+webconsole.jmx.user=karaf
+webconsole.jmx.password=karaf
\ No newline at end of file



Mime
View raw message