Merge branch 'master' into show-realms

wyona · Aug 29, 2012 · 0360624 · 0360624
2 parents 7c73725 + 0d07815
commit 0360624
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 39 deletions.
diff --git a/conf/log4j.properties b/conf/log4j.properties
@@ -5,14 +5,15 @@
 #
 # 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
 # Change 20100414: catalina.base variable added (but has no impact on version attribute)
 # 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
@@ -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/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,\

diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml
@@ -64,7 +64,7 @@
 -->
 
       <!-- IMPORTANT: Please make sure to update pom-core.xml as well! -->
-      <dependency groupId="wyona-org-security" artifactId="wyona-org-security-core" version="1.3.0-rf23d2fea13dec0d3ccc536e67decfdbd1f07f50c"/>
+      <dependency groupId="wyona-org-security" artifactId="wyona-org-security-core" version="1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba"/>
 
       <!-- TODO: Add to yanel.xml, because these libs are only needed during runtime -->
       <dependency groupId="avalon-framework" artifactId="avalon-framework-api" version="4.3"/>
@@ -87,8 +87,8 @@
 <!-- IMPORTANT: Please also see src/build/targets/webapp/webapp.xml re ambiguous libs -->
       <dependency groupId="xalan" artifactId="xalan" version="2.7.0"/>
 
-      <dependency groupId="wyona-org-security" artifactId="wyona-org-security-impl" version="1.3.0-rf23d2fea13dec0d3ccc536e67decfdbd1f07f50c"/>
-      <dependency groupId="wyona-org-security" artifactId="wyona-org-security-util" version="1.3.0-rf23d2fea13dec0d3ccc536e67decfdbd1f07f50c"/>
+      <dependency groupId="wyona-org-security" artifactId="wyona-org-security-impl" version="1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba"/>
+      <dependency groupId="wyona-org-security" artifactId="wyona-org-security-util" version="1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba"/>
       <!-- IMPORTANT: Please make sure to update pom-core.xml as well! -->
       <dependency groupId="yarep" artifactId="yarep-impl" version="1.0-dev-rad19798901b2280b7236e915ae96746ab630fcc1"/>
       <dependency groupId="spring" artifactId="spring"
@@ -139,12 +139,9 @@
       <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="2.0.1-rfca959b5e5fc053f7a9d0b144369950a9f801a98"/>
-      <dependency groupId="wyona-com-boost" artifactId="Log4JParsingUtils" version="2.0.1-rfca959b5e5fc053f7a9d0b144369950a9f801a98"/>
-      <dependency groupId="org.apache.activemq" artifactId="activemq-core" version="5.4.2"/>
-      <dependency groupId="org.apache.geronimo.specs" artifactId="geronimo-j2ee-management_1.1_spec" version="1.0.1"/>
-      <dependency groupId="org.apache.geronimo.specs" artifactId="geronimo-jms_1.1_spec" version="1.1.1"/>
-
+      <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>
 
     <!--     get ext by maven -->    

diff --git a/src/build/pom-core.xml b/src/build/pom-core.xml
@@ -10,19 +10,19 @@
       <groupId>wyona-org-security</groupId>
       <artifactId>wyona-org-security-core</artifactId>
       <!-- IMPORTANT: Please make sure to update dependencies.xml as well! -->
-      <version>1.3.0-rf23d2fea13dec0d3ccc536e67decfdbd1f07f50c</version>
+      <version>1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba</version>
     </dependency>
     <dependency>
       <groupId>wyona-org-security</groupId>
       <artifactId>wyona-org-security-impl</artifactId>
       <!-- IMPORTANT: Please make sure to update dependencies.xml as well! -->
-      <version>1.3.0-rf23d2fea13dec0d3ccc536e67decfdbd1f07f50c</version>
+      <version>1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba</version>
     </dependency>
     <dependency>
       <groupId>wyona-org-security</groupId>
       <artifactId>wyona-org-security-util</artifactId>
       <!-- IMPORTANT: Please make sure to update dependencies.xml as well! -->
-      <version>1.3.0-rf23d2fea13dec0d3ccc536e67decfdbd1f07f50c</version>
+      <version>1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba</version>
     </dependency>
     <dependency>
       <groupId>yarep</groupId>

diff --git 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
@@ -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
@@ -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;