Return-Path: 
 <activemq-commits-return-3685-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 93773 invoked from network); 19 Oct 2006 19:11:35 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 19 Oct 2006 19:11:35 -0000
Received: (qmail 18797 invoked by uid 500); 19 Oct 2006 19:11:35 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 18778 invoked by uid 500); 19 Oct 2006 19:11:35 -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 18769 invoked by uid 99); 19 Oct 2006 19:11:35 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Oct 2006 12:11:35 -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; Thu, 19 Oct 2006 12:11:34 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1C4511A981A; Thu, 19 Oct 2006 12:11:14 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r465737 - in
 /incubator/activemq/trunk/assembly/src/release/conf: activemq.xml
 broker-localhost.cert broker.ks client.ks client.ts log4j.properties
Date: Thu, 19 Oct 2006 19:11:13 -0000
To: activemq-commits@geronimo.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061019191114.1C4511A981A@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: chirino
Date: Thu Oct 19 12:11:13 2006
New Revision: 465737

URL: http://svn.apache.org/viewvc?view=rev&rev=465737
Log:
Adding some java keystore and truststore files so that we can configure an ssl connector out of the box.

Added:
    incubator/activemq/trunk/assembly/src/release/conf/broker-localhost.cert   (with props)
    incubator/activemq/trunk/assembly/src/release/conf/broker.ks   (with props)
    incubator/activemq/trunk/assembly/src/release/conf/client.ks   (with props)
    incubator/activemq/trunk/assembly/src/release/conf/client.ts   (with props)
Modified:
    incubator/activemq/trunk/assembly/src/release/conf/activemq.xml
    incubator/activemq/trunk/assembly/src/release/conf/log4j.properties

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?view=diff&rev=465737&r1=465736&r2=465737
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ incubator/activemq/trunk/assembly/src/release/conf/activemq.xml Thu Oct 19 12:11:13 2006
@@ -20,7 +20,7 @@
   <!-- Allows us to use system properties as variables in this configuration file -->
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
   
-  <broker useJmx="true" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="localhost" useJmx="true" xmlns="http://activemq.org/config/1.0">
   
     <!--  Use the following to set the broker memory limit 
     <memoryManager>  

Added: incubator/activemq/trunk/assembly/src/release/conf/broker-localhost.cert
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/conf/broker-localhost.cert?view=auto&rev=465737
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/assembly/src/release/conf/broker-localhost.cert
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/activemq/trunk/assembly/src/release/conf/broker.ks
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/conf/broker.ks?view=auto&rev=465737
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/assembly/src/release/conf/broker.ks
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/activemq/trunk/assembly/src/release/conf/client.ks
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/conf/client.ks?view=auto&rev=465737
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/assembly/src/release/conf/client.ks
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/activemq/trunk/assembly/src/release/conf/client.ts
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/conf/client.ts?view=auto&rev=465737
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/assembly/src/release/conf/client.ts
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/activemq/trunk/assembly/src/release/conf/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/conf/log4j.properties?view=diff&rev=465737&r1=465736&r2=465737
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/conf/log4j.properties (original)
+++ incubator/activemq/trunk/assembly/src/release/conf/log4j.properties Thu Oct 19 12:11:13 2006
@@ -18,7 +18,7 @@
 #
 # 
 #
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, stdout, out
 log4j.logger.org.apache.activemq.spring=WARN
 log4j.logger.org.springframework=WARN
 log4j.logger.org.apache.xbean.spring=WARN