diff --git a/conf/log4j.properties b/conf/log4j.properties index 2b8d3832d..02c9b5fda 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 @@ -26,11 +27,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 @@ -61,15 +57,28 @@ log4j.appender.A2.layout.ConversionPattern=%-4r %d{yyyy-MM-dd HH:mm:ss,SSS Z} [% log4j.appender.A2.MaxFileSize=1000KB log4j.appender.A2.MaxBackupIndex=7 -# Access log to ActiveMQ (Java Messaging System) +# INFO: Send access log messages to ActiveMQ (Java Messaging System) # (The following class is retrieved via src/build/dependencies.xml, whereas see artifactId 'Log4JAppender') log4j.appender.jms=com.wyona.yanelboost.log4jappender.ActiveMQAppender log4j.appender.jms.channel=rawEvents -log4j.appender.jms.password= -log4j.appender.jms.username= +# INFO: Please check the port inside ACTIVEMQ_HOME/conf/activemq.xml (see element 'transportConnector') to make sure that you use the correct port 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 +# +# INFO: If ActiveMQ has an authorizationPlugin configured, then you will probably have to set appropriate credentials to authenticate the connection +#log4j.appender.jms.username=test +#log4j.appender.jms.password=test +# +#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!) -#log4j.appender.jms.url=tcp://localhost:61616?connectionTimeout=3000 # 404 log4j @@ -82,16 +91,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 diff --git a/conf/realms.xml b/conf/realms.xml index 3f6560a0a..f0b872d61 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 @@ + - + @@ -87,8 +87,8 @@ - - + + - - - - - - + + + diff --git a/src/build/pom-core.xml b/src/build/pom-core.xml index 5bf303929..ae4287df5 100644 --- a/src/build/pom-core.xml +++ b/src/build/pom-core.xml @@ -10,19 +10,19 @@ wyona-org-security wyona-org-security-core - 1.3.0-rf23d2fea13dec0d3ccc536e67decfdbd1f07f50c + 1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba wyona-org-security wyona-org-security-impl - 1.3.0-rf23d2fea13dec0d3ccc536e67decfdbd1f07f50c + 1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba wyona-org-security wyona-org-security-util - 1.3.0-rf23d2fea13dec0d3ccc536e67decfdbd1f07f50c + 1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba yarep diff --git a/src/core/java/org/wyona/yanel/core/map/Realm.java b/src/core/java/org/wyona/yanel/core/map/Realm.java index 0803b7800..21df72c19 100644 --- a/src/core/java/org/wyona/yanel/core/map/Realm.java +++ b/src/core/java/org/wyona/yanel/core/map/Realm.java @@ -20,8 +20,6 @@ import java.util.ArrayList; import org.wyona.commons.io.FileUtil; -import org.wyona.security.core.IdentityManagerFactory; -import org.wyona.security.core.PolicyManagerFactory; import org.wyona.security.core.api.IdentityManager; import org.wyona.security.core.api.PolicyManager; import org.wyona.yanel.core.LanguageHandler; 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 " + diff --git a/src/core/java/org/wyona/yanel/core/map/RealmWithConfigurationExceptionImpl.java b/src/core/java/org/wyona/yanel/core/map/RealmWithConfigurationExceptionImpl.java index 2c5143b84..e7e12b87f 100644 --- a/src/core/java/org/wyona/yanel/core/map/RealmWithConfigurationExceptionImpl.java +++ b/src/core/java/org/wyona/yanel/core/map/RealmWithConfigurationExceptionImpl.java @@ -20,8 +20,6 @@ import java.util.ArrayList; import org.wyona.commons.io.FileUtil; -import org.wyona.security.core.IdentityManagerFactory; -import org.wyona.security.core.PolicyManagerFactory; import org.wyona.security.core.api.IdentityManager; import org.wyona.security.core.api.PolicyManager; import org.wyona.yanel.core.LanguageHandler;