Author: sshafroi
Date: 2008-03-14 10:55:31 +0100 (Fri, 14 Mar 2008)
New Revision: 6259
Modified:
branches/2.16/generic.sesam/velocity-directives/src/main/java/no/sesat/search/view/velocity/MD5ParameterDirective.java
Log:
Use configuration.properties via SiteConfiguration for md5.secret
Modified:
branches/2.16/generic.sesam/velocity-directives/src/main/java/no/sesat/search/view/velocity/MD5ParameterDirective.java
===================================================================
---
branches/2.16/generic.sesam/velocity-directives/src/main/java/no/sesat/search/view/velocity/MD5ParameterDirective.java
2008-03-14 09:51:33 UTC (rev 6258)
+++
branches/2.16/generic.sesam/velocity-directives/src/main/java/no/sesat/search/view/velocity/MD5ParameterDirective.java
2008-03-14 09:55:31 UTC (rev 6259)
@@ -21,13 +21,13 @@
import java.io.Writer;
import no.sesat.search.security.MD5Generator;
+import no.sesat.search.site.config.SiteConfiguration;
import org.apache.log4j.Logger;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.runtime.directive.Directive;
import org.apache.velocity.runtime.parser.Token;
import org.apache.velocity.runtime.parser.node.Node;
@@ -37,7 +37,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Endre Midtgård Meckelborg</a>
* @version <tt>$Revision: $</tt>
*/
-public final class MD5ParameterDirective extends Directive {
+public final class MD5ParameterDirective extends AbstractDirective {
/** Logger for this class. */
private static final Logger LOG =
Logger.getLogger(MD5ParameterDirective.class);
@@ -77,11 +77,12 @@
final Node node)
throws IOException, ResourceNotFoundException,
ParseErrorException, MethodInvocationException {
if (node.jjtGetNumChildren() != 1) {
- rsvc.error("#" + getName() + " - wrong number of argumants");
+ LOG.error("#" + getName() + " - wrong number of argumants");
return false;
}
- final MD5Generator digestGenerator = new MD5Generator("S3SAM rockz");
+ SiteConfiguration siteConfig =
getDataModel(context).getSite().getSiteConfiguration();
+ final MD5Generator digestGenerator = new
MD5Generator(siteConfig.getProperty("md5.secret"));
final String input = null != node.jjtGetChild(0).value(context)
? node.jjtGetChild(0).value(context).toString()
: "";
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
