From f42c13f4311a381c234da50e6ae32d519a11e420 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Tue, 24 Jul 2012 13:58:21 +0200 Subject: [PATCH 01/31] new dependencies added --- src/build/dependencies.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml index 33b0729f0..508a2fbd5 100644 --- a/src/build/dependencies.xml +++ b/src/build/dependencies.xml @@ -138,8 +138,10 @@ - - + + + + From 33ae37ba389157dd4b247fd87cb51ee216741344 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Mon, 30 Jul 2012 15:21:14 +0200 Subject: [PATCH 02/31] hint/pointer re Tomcat setup added --- src/build/targets/cruise-control/continuous-integration.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build/targets/cruise-control/continuous-integration.xml b/src/build/targets/cruise-control/continuous-integration.xml index a7891d546..4256b2bd4 100644 --- a/src/build/targets/cruise-control/continuous-integration.xml +++ b/src/build/targets/cruise-control/continuous-integration.xml @@ -56,7 +56,7 @@ - + From 159404f2dca074504ec5d248a54c05f2306c6c26 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Mon, 30 Jul 2012 15:23:22 +0200 Subject: [PATCH 03/31] Log4JAppender dependencies updated --- src/build/dependencies.xml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml index 508a2fbd5..97ec458a0 100644 --- a/src/build/dependencies.xml +++ b/src/build/dependencies.xml @@ -138,14 +138,8 @@ - - - - - - - - + + From 9087ac9fdb8bf051c3d9ac6386b3207d850a47e1 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Tue, 31 Jul 2012 10:13:05 +0200 Subject: [PATCH 04/31] version without spring jdbc dependency --- src/build/dependencies.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml index 97ec458a0..25a6c670f 100644 --- a/src/build/dependencies.xml +++ b/src/build/dependencies.xml @@ -138,8 +138,8 @@ - - + + From b01908b0adddc77ac09bc1807fc5b7f0991338f1 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Tue, 31 Jul 2012 10:20:51 +0200 Subject: [PATCH 05/31] new activemq appender category added --- conf/log4j.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/log4j.properties b/conf/log4j.properties index 2b8d3832d..151acddc3 100644 --- a/conf/log4j.properties +++ b/conf/log4j.properties @@ -95,6 +95,7 @@ log4j.appender.A4.MaxBackupIndex=7 # Exceptions to the above rules log4j.category.org.wyona.yarep.core.Repository=INFO log4j.category.org.wyona.yanel.core.ResourceTypeRegistry=DEBUG +#log4j.category.activemq-appender=DEBUG #log4j.category.com.wyona.yanelboost.log4jappender.ActiveMQAppender=DEBUG # Makes Jelly errors visible, but do not use in production, because it also generates a lot of debug messages #log4j.category.org.apache.commons.jelly.impl.TagScript=TRACE From f2f3b4c2b6bb97d6d8539607b166843f72bd48f4 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Tue, 31 Jul 2012 13:51:38 +0200 Subject: [PATCH 06/31] latest version --- src/build/dependencies.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml index 25a6c670f..06b30103f 100644 --- a/src/build/dependencies.xml +++ b/src/build/dependencies.xml @@ -138,8 +138,8 @@ - - + + From 37ffcdecd013462bf1d4faad5e165d82dd3ed8c8 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Wed, 1 Aug 2012 08:47:05 +0200 Subject: [PATCH 07/31] libs updated --- src/build/dependencies.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml index 81afbae68..b0d30ea81 100644 --- a/src/build/dependencies.xml +++ b/src/build/dependencies.xml @@ -138,8 +138,8 @@ - - + + From 23f4517ac5b75c7c561d2536aee7992d77f238aa Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Wed, 8 Aug 2012 07:46:29 +0200 Subject: [PATCH 08/31] new Log4jAppender depenencies added --- src/build/dependencies.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml index de9a92ef3..6d843aa16 100644 --- a/src/build/dependencies.xml +++ b/src/build/dependencies.xml @@ -139,8 +139,9 @@ - - + + + From beb065c43504f6996c3a94706f1cc403a4bac2e3 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Thu, 16 Aug 2012 09:07:45 +0200 Subject: [PATCH 09/31] activemq-appender category removed --- conf/log4j.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/log4j.properties b/conf/log4j.properties index 151acddc3..2b8d3832d 100644 --- a/conf/log4j.properties +++ b/conf/log4j.properties @@ -95,7 +95,6 @@ log4j.appender.A4.MaxBackupIndex=7 # Exceptions to the above rules log4j.category.org.wyona.yarep.core.Repository=INFO log4j.category.org.wyona.yanel.core.ResourceTypeRegistry=DEBUG -#log4j.category.activemq-appender=DEBUG #log4j.category.com.wyona.yanelboost.log4jappender.ActiveMQAppender=DEBUG # Makes Jelly errors visible, but do not use in production, because it also generates a lot of debug messages #log4j.category.org.apache.commons.jelly.impl.TagScript=TRACE From deb03422b7b338e01f2a35217385b733b2b4293b Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Thu, 16 Aug 2012 09:08:01 +0200 Subject: [PATCH 10/31] libs updated --- src/build/dependencies.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml index 6d843aa16..56e6d4c0c 100644 --- a/src/build/dependencies.xml +++ b/src/build/dependencies.xml @@ -139,9 +139,9 @@ - - - + + + From 23e36f4ad5f7fd309d40695621d8d02e3179edfa Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Thu, 16 Aug 2012 09:09:41 +0200 Subject: [PATCH 11/31] obsolete jms-queue removed --- conf/log4j.properties | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/conf/log4j.properties b/conf/log4j.properties index 2b8d3832d..5e5e89bbf 100644 --- a/conf/log4j.properties +++ b/conf/log4j.properties @@ -26,11 +26,6 @@ log4j.category.404=INFO, A3 # Do not log 404 within rootCategory log4j.additivity.404=false -# Log boost messages which cannot be sent to ActiveMQ because ActiveMQ might not be available (see com.wyona.yanelboost.log4jappender.ActiveMQAppender) -log4j.category.jms-queue=INFO, A4 -# Do not log 'jms-queue' within rootCategory -log4j.additivity.jms-queue=false - #log4j.rootCategory=DEBUG, A1 #log4j.rootCategory=INFO, A1 log4j.rootCategory=WARN, A1 @@ -82,16 +77,6 @@ log4j.appender.A3.MaxFileSize=1000KB log4j.appender.A3.MaxBackupIndex=7 -# jms-queue log4j -log4j.appender.A4=org.apache.log4j.RollingFileAppender -log4j.appender.A4.File=@LOG4J_DIR@/jms-queue-cnode@CNODE_ID@.log -#log4j.appender.A4.File=${catalina.base}/logs/jms-queue-cnode@CNODE_ID@.log -log4j.appender.A4.layout=org.apache.log4j.PatternLayout -log4j.appender.A4.layout.ConversionPattern=%-4r %d{yyyy-MM-dd HH:mm:ss,SSS Z} [%t] %-5p %c %x - %m%n -log4j.appender.A4.MaxFileSize=1000KB -log4j.appender.A4.MaxBackupIndex=7 - - # Exceptions to the above rules log4j.category.org.wyona.yarep.core.Repository=INFO log4j.category.org.wyona.yanel.core.ResourceTypeRegistry=DEBUG From 3ff905052eb0930592711f4a80169ec7f5828506 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Thu, 16 Aug 2012 09:23:54 +0200 Subject: [PATCH 12/31] SSL properties added --- conf/log4j.properties | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/conf/log4j.properties b/conf/log4j.properties index 5e5e89bbf..d85fc94dc 100644 --- a/conf/log4j.properties +++ b/conf/log4j.properties @@ -5,6 +5,7 @@ # # IMPORTANT: Because of the changes listed below, one might has to re-configure the local.log4j.properties file (and in particular synchronize the "version.log4j.properties" number (see below) # +# Change 20120816: JMS queue appender removed and JMS SSL properties added # Change 20111108: JMS queue appender added # Change 20110712: ActiveMQ appender added (but has no impact on version attribute) # Change 20110627: timezone added @@ -12,7 +13,7 @@ # Change 20091201: access log config added # -------------------------------------------------------------------------------------------------- # Version of this file in order to compare with local.log4j.properties -version.log4j.properties=2011110800 +version.log4j.properties=2012081600 log4j.category.Access=INFO, A2 @@ -63,8 +64,13 @@ log4j.appender.jms.channel=rawEvents log4j.appender.jms.password= log4j.appender.jms.username= log4j.appender.jms.url=tcp://localhost:61616 +#log4j.appender.jms.url=ssl://localhost:61616 +#log4j.appender.jms.truststore=/home/wyona/src/yanel/conf/local/client.ts +#log4j.appender.jms.keystore=/home/wyona/src/yanel/conf/local/client.ks +#log4j.appender.jms.queuedir=/home/wyona/src/yanel/local/apache-tomcat-7.0.25/work +#log4j.appender.jms.messagekey= + # 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!) -#log4j.appender.jms.url=tcp://localhost:61616?connectionTimeout=3000 # 404 log4j From b7a2da615781599e752e5a3e6fb89f3fbe7a9dc3 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Thu, 16 Aug 2012 16:02:25 +0200 Subject: [PATCH 13/31] notes about authentication key added --- conf/realms.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/realms.xml b/conf/realms.xml index 3f6560a0a..b377cee92 100644 --- a/conf/realms.xml +++ b/conf/realms.xml @@ -5,6 +5,7 @@ + Optional 'authkey' attribute added (but has no impact on version attribute) Optional 'user-tracking-domain-id' attribute added (but has no impact on version attribute) Downloads realm containing update.rdf added (but has no impact on version attribute) Order changed (but has no impact on version attribute) @@ -43,6 +44,9 @@ + - + From ab92bb8b46f34fa25f0a98e8fad9c234b6d63d38 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Mon, 27 Aug 2012 09:59:46 +0200 Subject: [PATCH 24/31] log statements improved --- src/core/java/org/wyona/yanel/core/map/RealmManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/java/org/wyona/yanel/core/map/RealmManager.java b/src/core/java/org/wyona/yanel/core/map/RealmManager.java index 853f6cc48..5d50cd2dd 100644 --- a/src/core/java/org/wyona/yanel/core/map/RealmManager.java +++ b/src/core/java/org/wyona/yanel/core/map/RealmManager.java @@ -235,7 +235,7 @@ public void readRealms() throws ConfigurationException { } /** - * Read realms configuration + * Read realm configurations * @param realmsConfigFile Realms configuration file */ public void readRealms(File realmsConfigFile) throws ConfigurationException { @@ -299,7 +299,7 @@ public void readRealms(File realmsConfigFile) throws ConfigurationException { log.error("Class not found: " + e.getMessage() + ". Fallback to default realm implementation!"); realm = new RealmDefaultImpl(realmLabel, realmId, mountPoint, realmConfigFile); } catch(Exception e) { - log.info("Default realm implementation will be used."); + log.info("Default realm implementation will be used, because no custom realm implementation configured for realm '" + realmId + "'."); realm = new RealmDefaultImpl(realmLabel, realmId, mountPoint, realmConfigFile); } @@ -334,6 +334,7 @@ public void readRealms(File realmsConfigFile) throws ConfigurationException { } } } + log.info("All realm configurations have been read."); } catch (Exception e) { log.error(e.getMessage(), e); throw new ConfigurationException("Error setting up realms from file " + From 4017035df69b2f021c90a1465a8cf9d46dc1d2c7 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Mon, 27 Aug 2012 16:22:19 +0200 Subject: [PATCH 25/31] more ambigous libs added --- src/build/build.properties | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/build/build.properties b/src/build/build.properties index 7992ca367..4d06fe7d8 100644 --- a/src/build/build.properties +++ b/src/build/build.properties @@ -91,19 +91,26 @@ stax-api.version=1.0 # Ambiguous/Duplicated libs (in alphabetical order) duplicated.libs=apache-jakarta-commons-codec-1.3.jar,\ + ant-1.6.5.jar,\ + apache-jakarta-commons-logging-1.0.4.jar,\ + avalon-framework-impl-4.2.0.jar,\ + backport-util-concurrent-2.2.jar,\ commons-codec-1.1.jar,\ + commons-digester-1.6.jar,\ commons-lang-2.1.jar,\ commons-lang-2.2.jar,\ commons-lang-2.3.jar,\ commons-lang-2.4.jar,\ commons-logging-1.0.4.jar,\ - apache-jakarta-commons-logging-1.0.4.jar,\ commons-logging-1.1.jar,\ commons-beanutils-1.6.jar,\ commons-collections-2.1.jar,\ commons-collections-3.1.jar,\ + dom4j-1.5.2.jar,\ icu4j-2.6.1.jar,\ log4j-1.2.12.jar,\ + nekohtml-0.9.4.jar,\ + nekohtml-0.9.5.jar,\ slf4j-log4j12-1.3.0.jar,\ xalan-2.6.0.jar,\ xml-apis-1.0.b2.jar,\ From 19697739191202ec26f3f56b4c8cc55f24c312be Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Mon, 27 Aug 2012 20:44:41 +0200 Subject: [PATCH 26/31] security lib updated including bcrypt implementation --- src/build/dependencies.xml | 6 +++--- src/build/pom-core.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml index adb42d8b2..471f627ee 100644 --- a/src/build/dependencies.xml +++ b/src/build/dependencies.xml @@ -64,7 +64,7 @@ --> - + @@ -87,8 +87,8 @@ - - + + wyona-org-security wyona-org-security-core - 1.3.0-rf23d2fea13dec0d3ccc536e67decfdbd1f07f50c + 1.4.0-rda35921743e245b1e6a9754e340906078dba1214 wyona-org-security wyona-org-security-impl - 1.3.0-rf23d2fea13dec0d3ccc536e67decfdbd1f07f50c + 1.4.0-rda35921743e245b1e6a9754e340906078dba1214 wyona-org-security wyona-org-security-util - 1.3.0-rf23d2fea13dec0d3ccc536e67decfdbd1f07f50c + 1.4.0-rda35921743e245b1e6a9754e340906078dba1214 yarep From 5113df91b5f248df57ff12484c1563a8e9e61d44 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Mon, 27 Aug 2012 21:32:25 +0200 Subject: [PATCH 27/31] failover example added --- conf/log4j.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/log4j.properties b/conf/log4j.properties index eca4cd107..d974385b1 100644 --- 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 From eec1f1f44fa7e272839bf618a2aae39da278c264 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Mon, 27 Aug 2012 22:39:22 +0200 Subject: [PATCH 28/31] Log4JAppender updated such that also failover works --- src/build/dependencies.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml index adb42d8b2..746ea3446 100644 --- a/src/build/dependencies.xml +++ b/src/build/dependencies.xml @@ -139,7 +139,7 @@ - + From 3602b3775e56c6e32627bb50285265eb90e30dab Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Wed, 29 Aug 2012 09:11:25 +0200 Subject: [PATCH 29/31] Log4JAppender lib updated getting message keys from realms configuration --- src/build/dependencies.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml index 746ea3446..6510fc06a 100644 --- a/src/build/dependencies.xml +++ b/src/build/dependencies.xml @@ -139,7 +139,7 @@ - + From 9535b6d3c0d808889adb59c0f593fef6002a0d6d Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Wed, 29 Aug 2012 09:12:48 +0200 Subject: [PATCH 30/31] sample auth key added --- conf/realms.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/realms.xml b/conf/realms.xml index b377cee92..f0b872d61 100644 --- a/conf/realms.xml +++ b/conf/realms.xml @@ -45,7 +45,7 @@ From 6a64dd53f3881ad5dac13290e1c7b46f55819037 Mon Sep 17 00:00:00 2001 From: Michael Wechner Date: Wed, 29 Aug 2012 09:34:57 +0200 Subject: [PATCH 31/31] updated to latest version --- src/build/dependencies.xml | 6 +++--- src/build/pom-core.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml index 471f627ee..be3ee8891 100644 --- a/src/build/dependencies.xml +++ b/src/build/dependencies.xml @@ -64,7 +64,7 @@ --> - + @@ -87,8 +87,8 @@ - - + + wyona-org-security wyona-org-security-core - 1.4.0-rda35921743e245b1e6a9754e340906078dba1214 + 1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba wyona-org-security wyona-org-security-impl - 1.4.0-rda35921743e245b1e6a9754e340906078dba1214 + 1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba wyona-org-security wyona-org-security-util - 1.4.0-rda35921743e245b1e6a9754e340906078dba1214 + 1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba yarep