From c3f41326ef161ac322444558c750decaf296db78 Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Thu, 19 Oct 2006 19:11:13 +0000
Subject: [PATCH] Adding some java keystore and truststore files so that we can
 configure an ssl connector out of the box.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@465737 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/src/release/conf/activemq.xml          |   2 +-
 assembly/src/release/conf/broker-localhost.cert | Bin 0 -> 592 bytes
 assembly/src/release/conf/broker.ks             | Bin 0 -> 1370 bytes
 assembly/src/release/conf/client.ks             | Bin 0 -> 1357 bytes
 assembly/src/release/conf/client.ts             | Bin 0 -> 665 bytes
 assembly/src/release/conf/log4j.properties      |   2 +-
 6 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 assembly/src/release/conf/broker-localhost.cert
 create mode 100644 assembly/src/release/conf/broker.ks
 create mode 100644 assembly/src/release/conf/client.ks
 create mode 100644 assembly/src/release/conf/client.ts

diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index b378163ddd..783f0a62cf 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -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>  
diff --git a/assembly/src/release/conf/broker-localhost.cert b/assembly/src/release/conf/broker-localhost.cert
new file mode 100644
index 0000000000000000000000000000000000000000..dd07c75fb1bbd843ac9fafcd04de0e7d30c90a46
GIT binary patch
literal 592
zcmXqLV)8L)V%*Ba;%a_E&w!VWQ>)FR?K>|cBMU2oL9U^I0UsN4C<~h~duU#EUVeEV
zOoRhNgdIbK3n9V}G#Y3Qw=i2$QGRx6k)e=*07!sYm@_9oIWZ?AzqrIePMp`k%+SEl
z($K=h+|VEj$Tc@GG&F~D>Fu1x`N-kH$jZRn*vnwh*vZt`$Z%&xp}XI?V^*7$`QE=c
z%UL{2;rE=SGwpsXsn7`2F<k2!YWL4#hQJD&BMU>f=9O>0*rr-NxlnHB)#4gM-tcQj
zC+igWai*;?J?>aCxBh?TY(s%9Pgg$;-k}()^j|RPMbtvm1IrJ*&UpIo{LzUGHD8Ty
z{$C+h`ss+M(B0e{#><ioeVLdU85ohB2aGOepu4V}j=a0u<odGX0i4PgxZdqsE5H=>
zXU3Mw=Q9g}4J9UQh<@FA;L?UIFC{GVj!Oz9JPBR@{po`TCwQMRnJ8GT_-|FYYvqqK
z%O3DKC%vq%d9_2;TeEad-~wLhUBTWbv+wp=7glsVnWy+*&FMO6{r|~J8@Ia#e^&Q9
OQ{^y)y-zGLpb7w856uq%

literal 0
HcmV?d00001

diff --git a/assembly/src/release/conf/broker.ks b/assembly/src/release/conf/broker.ks
new file mode 100644
index 0000000000000000000000000000000000000000..674a6042d5552d3c652f3b3ba1ae1ae3d7a98d2e
GIT binary patch
literal 1370
zcmezO_TO6u1_mY|W&~q_q@w)n)FR!S{N%)(jQrvfpafsyGv2R2MLP|en6?`5v2kg$
zF|sgfF$pp<vNEtVF)f^~@_y&f@5LN$5}f{brq30)zr#R_{j$QvG`^herUJJ<9_Rnj
z*?0Cy$CjUkDR%4Ka*uLXzut8u>@B->u>|`j0~-al7ne%|*681s*PoiE#&6`JQMqe|
zsLlTae^1M%Px58H;3l;0(92J=)kBZ1y!pOccHwg;H(gafzcW7D7f2kFd~o&P(N0Mw
zlUr|@EPnt0<j8*^J!9)U;qzfuW`8)@)`xmKa;_^b2u-px+Um07_!sf3P23keWj<Kw
zPOCK8dTqX{q2^J&^Hb`WW6W+>J+b-M_Vw<85{-aATcQvCINZyssMm34^FKXJz8l6*
zuZyh}TDr(3M4@J{(520vZ0nCixgUJw@$~gft%qMvEj@R1a=U)HrF}wq%1s5;xFvVq
zN$>5bK70GOL;9?WyIygpj3v(PNX+jMIm5E|mD4fyq8=L~O<wNkc-M3OOI5`$?iY1`
zpki{3%g;|gO(;fu=~w%VJ#mF8s_~iJ8(TlDthuq!@5!Em`Mt^~mR@`F(U4WCzIwZf
zwsfd-bU^#!X|}${7<z7}wi;V3_dC3z?!hj}trsQ;?%Q(G`033}JYjJce-(UuFwIO+
z;N&I0?hn_?=j~u`Rr(tDsQPlZSGfA_e=DAD<5+F^tn1L9=Z}R=_7;9$RI<Z-o5rO{
zoJF2Dbge&#Kb-K@K*T41ZA;+CyS}zFw%(So+7y(-vGT#%HmAK#6{pWi&TEd|`z?M&
zS|ayrtL<E``(63}l!-Bv%yizT!{9jCGTOIe#WPoN@t(D6I=R;wmM;HZmAT$6YU|?j
zdLa^qpB;N|UUGMtu92P~B(-uHqtn`*Q?GtL$m%~qwQy^V^+ykhk7qMp%szBD_t3(w
zpx+^9+eB{M+Tu{~Y7wvWs;tutTm4pZ`h7M3l9>NcL@xb{Wa7ojbCdE`?QNg83Y@fA
zBlJuSEP?4b0GN(_44N3XGO@UtpU^YlW#iOp^Jx3d%gD&W%3zRdC;&|4%%Lo7!t9}W
z*?IZpc`y+U3=wt=5iW!XKhS8PIo!f*kX&UbWFP<%U>4?t=Pv^}ab5#6LjyxgLkkmg
zLxU(F*WAF+&>YI8w{sfjBZmhtgEKewG8i;=GBq|b+*wiR?sx8()n;YB_b<+J7SB@n
zJ!k1myB|v`Gy-)D*Sdz<{j-=Mu)^lZ!qBaG<(n_Isa8)el-qf=xW<q-{MymUIt6~5
zX=_Z6JC@9?|DQSAP+-f`)lY+WD8?%N7fgB)wb1my@&m6kp8h+3bYerzSL2)iSBRB<
zIwC4`H}{6|vSdSFCT2zkMr7v!ql+2nu4|_w@9s9azU+7ar}71^cl*`~Fh%{Dv8D3)
z%z|J;i3uB`U$-8(v|-Cj3Cq0Wl0pejLf3zP`ryF{-e*iE3RWxrTUG8_`Qyy82Yk*+
zFY9Yw?NIgBES(d$fLD4~u=mOAyS>(h6<tr}DLz<px=vdEfAZ4C?XJO})&0&?IZR>i
e6H5%JIvIX@ZFrpKH2p$;C%YGWcDI{YBmw}GVKk!v

literal 0
HcmV?d00001

diff --git a/assembly/src/release/conf/client.ks b/assembly/src/release/conf/client.ks
new file mode 100644
index 0000000000000000000000000000000000000000..69b2fec54a095b233277666b225f7b32bf7ca25a
GIT binary patch
literal 1357
zcmezO_TO6u1_mY|W&~rl<ebdZyb>UnFY$$8CQxdZK@-z913oq`Z8k<0MlB{mMn+Z!
zmL{e}yVEa<HM9MSzaP%1>>Xpilr><|(X{ltem7Ms^D3NA7W?aX_eJiGXpItgcqb?Q
zl(RZ^uMqoRp6o)+ZH-)aM0C$_Y?hW?^&<A-kK(tnx^H)MENZjkYmy5o(Vk&&NBhW^
z+plcCZCzUyIDJJU*U`U`UDIp6&l5KK;mqXY&aHZPeRH2v%luB2SXnWVI|h#>7JP8X
znzD$4>+7G8pMi{5Y?kkm`rNKnnY)Y8>{H9yxqOzH)md52hf6d#3g)c)BR;RQYH43#
zdGfw}MIIi%PCU#%$-LMi?x$PV<~H}!i>A)rRAsUuamRgaW%g_~{{2}QFZ=Yb&H2~4
z@YbP?qLmf$za%D<oS$=V-9f2(^{<u7z1FR}XsxwN@`Rq=^}qTLsvll4xAd;DWEJPP
zmY8fS8{sxvIoivL;}_#Y3AabTls}y)`u|Z+Nqz46{=0`%$|jsEja1EvXx{wv$L($F
z0}MJjmYG^<7alku*Y|P~Ya)xE&->bKhkh70ExZvtr}Afz$98e%i2ma>!S;;2BHy>F
zG#`AeClR|Rw9Dbp`Np0+#x=jzny>iT?qY4NF!hrAf)9Q?A-s&9+m0Bl6WyHk?Y+R0
z>!LTiPBfodo&3VX`luG$nKP-UT~nnpeKf^i^sigH`IQg*<JcyhIK$(Mggs+r);6qq
z+OUr$yZhhH^HFoMuW@}YP1?V^C*@Q_a$i8>8O2}If2vpPQs;@;BI|Yjw5;fP-ooCQ
zi@)X_zL%Qbn-?iFm8bc~zg5Skaaf57&YJpYPC&)G53PP)^`Zp~YpUkBY6U&e``s6@
zOaA?8mHsCm{;%hdy3=waBzTEmlKCUnlUHg~T}zF3Tv+DjlN%Ix;BoSs)l>YRSIEe(
ziOxP-!^ER&6Bsrl;fw&knRd~cMixn?C5Pwoe{f((PYWslr)bs)JyQcqU_$l*CS(tT
zCdQ3SEUxA!_8aiBacZ@Bw0-AgWMpAwFvvC(0H$*0P!={}_RzfSy!`S!m<R`k2s?%d
z7ea&|Xf)6qZeeI<f*HdMS7IP1&TC+1Xkch*XklV$Y#IgRnj07znnSttbxh-Y<gftd
zZsx{b27|^<rp88wZr+!Zy&Y2P3?AKYWX`RsNIiDcZsp!7kLnlstY}lNFIOq(e`5Je
zOXE#rV5zCj*YbJ7t9|dhT~%u|-(ha<RCQlNyC#0kxcz4LZ6&Wt+m~gtIoxTAQJ1JL
zTY5JBsN31YOGRHW&97n2@4nA(crx<j^%DnH`1<DAvmJA<mAN6Lqs_$3$iRr~JYZBY
z1Kq{MI-y@gSl{-Ff`}{E`~N#1=`*c(FlVMNo2ygg#yx*mf46h~`mt-$)x)>eX1;h6
zRiCc$=7nhX!lm0g1CGAZow_&Hx!=Km>aK(LTvfLiNnW4ku;f6oj2i!)zpH;eJ+iVt
zLRd)QSe8R>z%T9OqgsCT^7oHE@N+-K+|ioRym(bmdV<Hj8<K2KH4dzr%J2E3+ce%@
H%G(kE5!V})

literal 0
HcmV?d00001

diff --git a/assembly/src/release/conf/client.ts b/assembly/src/release/conf/client.ts
new file mode 100644
index 0000000000000000000000000000000000000000..073c4d5e1d6645580d4311a43bab7cda6bbfc0c7
GIT binary patch
literal 665
zcmezO_TO6u1_mY|W(3m$Nk#eDsYSXu`N@en8TrK}KncFY7u%W{SR?dI4J?6b0}Ps&
zd<>cxw=%J~nxD`!;AP{~YV&CO&dbQi!pdNfYbapA$HpAW!Y0ffnwOoIU!DgO;lL1K
z#}MH{i0}iA2Aaby%m#6kp^$+9NPt<G6Ye|%IdNVCGeZMIOG672b3=nDAlKZ$(9j&p
zrMGh$=Oc#)BP#=QV=se2V<%H%Bg35)h3<amj#+J1=6nC*ENAg7h2L|Q&b0fnq(UQ5
z$8fD{sNFw{83HS8jw}q_npeL0Vw-C9<U+ZfSBq;5dBd+Aovc&f$C<Xq^tfZm-1`5S
zvke8dJYD@Xc!y%F(tp9E7f}mM4=g|MI^*fT^G7E()O<C*`G192>8B&2LU(g-7%xjU
z^krgZWMD*g9x%F?f$q9?I`Zyrlk3Zl2XHE1;Ci=jtpHQhpBY;!pU*4^Hk6pKA^LUe
zflC{<yp*uaJ1!}d@FaBo_oojYoZx-NWTIfT;=fhpu9ZK|EPKG`ob<B3=G6{WZ_Uy<
zfeU!0cLjT&%)Z-eU0BieWS-)KHK*&O_5UX?ZQSk}{8`=aOqIhF_CB%1fU3vyPo0U@
U5=q+q_Q%47f`@dq3>Mx701LO~OaK4?

literal 0
HcmV?d00001

diff --git a/assembly/src/release/conf/log4j.properties b/assembly/src/release/conf/log4j.properties
index eaf66dc4db..82980de2a7 100755
--- a/assembly/src/release/conf/log4j.properties
+++ b/assembly/src/release/conf/log4j.properties
@@ -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