Merge branch 'master' into bcrypt

wyona · Aug 29, 2012 · 0d07815 · 0d07815
2 parents 6a64dd5 + 9535b6d
commit 0d07815
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/conf/log4j.properties b/conf/log4j.properties
@@ -65,6 +65,7 @@ log4j.appender.jms.channel=rawEvents
 log4j.appender.jms.url=tcp://localhost:61616
 #
 #log4j.appender.jms.url=ssl://localhost:61617
+#log4j.appender.jms.url=failover:(ssl://localhost:61617,ssl://1.2.3.4:61617)?randomize=false
 #log4j.appender.jms.truststore=/home/wyona/src/yanel/conf/local/client.ts
 # INFO: The keystorepassword is needed if the truststore was generated with a password, e.g. 'keytool -import -alias broker -storepass TRUSTSTORE_PASSWORD -keystore client.ts -file broker_cert'
 #log4j.appender.jms.keystorepassword=TRUSTSTORE_PASSWORD
@@ -75,6 +76,7 @@ log4j.appender.jms.url=tcp://localhost:61616
 #
 #log4j.appender.jms.queuedir=/home/wyona/src/yanel/local/apache-tomcat-7.0.25/work
 #log4j.appender.jms.messagekey=
+#log4j.appender.jms.realmsconfig=$YANEL_HOME/local/apache-tomcat-7.0.25/webapps/yanel/WEB-INF/classes/realms.xml
 
 # INFO: See http://activemq.apache.org/tcp-transport-reference.html (Also see http://activemq.apache.org/failover-transport-reference.html, whereas be aware that the failover connection does not seem to throw a runtime connection if it cannot connect and hence Yanel will hang during startup!)
 

diff --git a/conf/realms.xml b/conf/realms.xml
@@ -5,6 +5,7 @@
 <realms xmlns="http://www.wyona.org/yanel/1.0" version="2009042800">
 
 <changes>
+  <change version="2012081600">Optional 'authkey' attribute added (but has no impact on version attribute)</change>
   <change version="2012022200">Optional 'user-tracking-domain-id' attribute added (but has no impact on version attribute)</change>
   <change version="2010022100">Downloads realm containing update.rdf added (but has no impact on version attribute)</change>
   <change version="2010020400">Order changed (but has no impact on version attribute)</change>
@@ -43,6 +44,9 @@
 </realm>
 
 <realm id="yanel-website" mount-point="/yanel-website/" user-tracking-domain-id="boost-0123456789">
+<!-- INFO: One can specify for each realm an authentication key to sign java messages which are sent to for example ActiveMQ
+<realm id="yanel-website" mount-point="/yanel-website/" user-tracking-domain-id="boost-0123456789" authkey="d3lvbmEK">
+-->
   <config src="@REALMS_DIR@/yanel-website/"/>
 
 <!--

diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml
@@ -139,7 +139,7 @@
       <dependency groupId="wyona-org-yanel" artifactId="yanel-resource-creatable-modifiable-deletable-v3" version="0.1-dev-re534f851072e373b86624d7d6710fa7f1c81f240"/>
 
       <!-- INFO: Log into ActiveMQ Java Messaging System -->
-      <dependency groupId="wyona-com-boost" artifactId="Log4JAppender" version="3.0.1-r3c575981c2a"/>
+      <dependency groupId="wyona-com-boost" artifactId="Log4JAppender" version="3.0.3-r503908d159c"/>
       <dependency groupId="wyona-com-boost" artifactId="Log4JParsingUtils" version="2.0.1-r5914d669ada"/>
       <dependency groupId="wyona-com-boost" artifactId="MessageUtils" version="2.0.1-r5914d669ada"/>
     </artifact:dependencies>