Skip to content

Commit

Permalink
Merge branch 'master' into personalized-content
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelwechner committed Aug 29, 2012
2 parents e6025be + f88eb7a commit 6a2ee81
Show file tree
Hide file tree
Showing 19 changed files with 430 additions and 297 deletions.
17 changes: 12 additions & 5 deletions conf/log4j.properties
Expand Up @@ -57,19 +57,26 @@ 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: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
#log4j.appender.jms.keystore=/home/wyona/src/yanel/conf/local/client.ks
# 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!)

Expand Down
4 changes: 4 additions & 0 deletions conf/realms.xml
Expand Up @@ -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>
Expand Down Expand Up @@ -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/"/>

<!--
Expand Down
9 changes: 8 additions & 1 deletion src/build/build.properties
Expand Up @@ -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,\
Expand Down
8 changes: 4 additions & 4 deletions src/build/dependencies.xml
Expand Up @@ -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"/>
Expand All @@ -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"
Expand Down Expand Up @@ -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.0-r5914d669ada"/>
<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>
Expand Down
6 changes: 3 additions & 3 deletions src/build/pom-core.xml
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions src/core/java/org/wyona/yanel/core/map/Realm.java
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions src/core/java/org/wyona/yanel/core/map/RealmManager.java
Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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 " +
Expand Down
Expand Up @@ -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;
Expand Down
9 changes: 9 additions & 0 deletions src/realms/welcome-admin/yanel/data/css/global.css
Expand Up @@ -58,4 +58,13 @@ a:visited:hover {
color:#777777
}

table {
width: 100%;
border-collapse: collapse;
}

table tr td {
width: 100%;
border: solid 1px gray;
padding: 0.5em;
}
76 changes: 76 additions & 0 deletions src/realms/welcome-admin/yanel/data/xslt/resources.xsl
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>

<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns="http://www.w3.org/1999/xhtml">

<xsl:output
method="xhtml" encoding="UTF-8"
doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"/>

<xsl:template match="/">
<html>
<head>
<base target="_top"/>

<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
<link rel="shortcut icon" href="favicon.ico" type="image/vnd.microsoft.icon" />
<link rel="stylesheet" href="css/global.css" type="text/css"/>
<title>Welcome to Yanel</title>
</head>

<body>
<img src="img/yanel.png" alt="yanel" id="yanellogo"/>
<img src="img/everything_is_content.png"
alt="everything is content" id="everythingiscontent"/>

<h1>Registered resource types</h1>
<br/>

<p>
Here is a list of all resource types which have been registered inside
this Yanel instance and can be used/configured inside realms.
</p>

<table>
<xsl:for-each select="/yanel-info/resourcetypes/resourcetype">
<tr>
<td style="width:1%;">
<img style="float:left;width:32px;height:32px;" src="{icon}" alt="{./icon/@alt}"/>
</td>
<td style="width:50%;">
<strong><xsl:value-of select="localname"/></strong><br/>
<xsl:value-of select="namespace"/>
</td>
<td style="width:50%;">
<xsl:value-of select="description"/>
</td>
<td style="width:1%;">
<a href="{./docu}">Docs</a>
</td>
</tr>
</xsl:for-each>
</table>

<br/>
<hr/>
<a href="?yanel.resource.viewid=xml">Source XML</a>
</body>
</html>
</xsl:template>

<xsl:template match="resourcetypes">
<ul>
<xsl:apply-templates select="resourcetype"/>
</ul>
</xsl:template>

<xsl:template match="resourcetype">
<li>
&lt;{<xsl:value-of select="./namespace"/>}<strong><xsl:value-of select="./localname"/></strong>/&gt;&#160;
(<xsl:value-of select="./description"/>)&#160;
</li>
</xsl:template>

</xsl:stylesheet>

0 comments on commit 6a2ee81

Please sign in to comment.