Return-Path: 
 <activemq-commits-return-2738-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 4949 invoked from network); 21 Jul 2006 12:03:52 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 21 Jul 2006 12:03:52 -0000
Received: (qmail 71672 invoked by uid 500); 21 Jul 2006 12:03:52 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 71635 invoked by uid 500); 21 Jul 2006 12:03:52 -0000
Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:activemq-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:activemq-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:activemq-commits@geronimo.apache.org>
List-Id: <activemq-commits.geronimo.apache.org>
Reply-To: activemq-dev@geronimo.apache.org
Delivered-To: mailing list activemq-commits@geronimo.apache.org
Received: (qmail 71626 invoked by uid 99); 21 Jul 2006 12:03:52 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Jul 2006 05:03:52 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Jul 2006 05:03:51 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 324B51A981A; Fri, 21 Jul 2006 05:03:31 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r424276 - in
 /incubator/activemq/trunk/assembly/src/release/conf: activemq-nojournal.xml
 activemq.xml
Date: Fri, 21 Jul 2006 12:03:30 -0000
To: activemq-commits@geronimo.apache.org
From: jstrachan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060721120331.324B51A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jstrachan
Date: Fri Jul 21 05:03:29 2006
New Revision: 424276

URL: http://svn.apache.org/viewvc?rev=424276&view=rev
Log:
added an example configuration file using pure JDBC and no journal together with some example Oracle XML configurations

Added:
    incubator/activemq/trunk/assembly/src/release/conf/activemq-nojournal.xml   (with props)
Modified:
    incubator/activemq/trunk/assembly/src/release/conf/activemq.xml

Added: incubator/activemq/trunk/assembly/src/release/conf/activemq-nojournal.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/conf/activemq-nojournal.xml?rev=424276&view=auto
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/conf/activemq-nojournal.xml (added)
+++ incubator/activemq/trunk/assembly/src/release/conf/activemq-nojournal.xml Fri Jul 21 05:03:29 2006
@@ -0,0 +1,101 @@
+<!-- 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" limitMb="50"/>
+    </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-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" uri="multicast://default"/>
+      
+      or use static hosts
+      
+      <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)" failover="true"/>
+      -->
+    </networkConnectors>
+    
+  </broker>
+  
+  <!--  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="oracle.jdbc.pool.OracleDataSource">
+    <property name="URL" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/>
+    <property name="user" value="scott"/>
+    <property name="password" value="tiger"/>
+  </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 -->

Propchange: incubator/activemq/trunk/assembly/src/release/conf/activemq-nojournal.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/assembly/src/release/conf/activemq-nojournal.xml
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/activemq/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/conf/activemq.xml?rev=424276&r1=424275&r2=424276&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ incubator/activemq/trunk/assembly/src/release/conf/activemq.xml Fri Jul 21 05:03:29 2006
@@ -84,7 +84,15 @@
     <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>
+  -->  
+  
   <!-- Embedded Derby DataSource Sample Setup -->
   <!-- 
   <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">