unicorn commit: + parameter ENABLED_MODULES

changeset:   1621:72ddd30fd11c
tag:         tip
user:        Thomas Gambet <tgambet@w3.org>
date:        Thu Feb 24 13:21:34 2011 -0500
files:       WebContent/WEB-INF/conf/unicorn.properties.default src/org/w3c/unicorn/output/OutputFactory.java
description:
+ parameter ENABLED_MODULES


diff -r d3e30d1d6470 -r 72ddd30fd11c WebContent/WEB-INF/conf/unicorn.properties.default
--- a/WebContent/WEB-INF/conf/unicorn.properties.default	Thu Feb 24 10:58:08 2011 -0500
+++ b/WebContent/WEB-INF/conf/unicorn.properties.default	Thu Feb 24 13:21:34 2011 -0500
@@ -7,6 +7,8 @@
 DEFAULT_LANGUAGE = en
 DEFAULT_FORMAT = xhtml10
 
+ENABLED_MODULES = simple,mail
+
 SHOW_LANGUAGE_UNAVAILABLE_MESSAGE = true
 
 ACCEPT_LOCAL_ADDRESSES = false
diff -r d3e30d1d6470 -r 72ddd30fd11c src/org/w3c/unicorn/output/OutputFactory.java
--- a/src/org/w3c/unicorn/output/OutputFactory.java	Thu Feb 24 10:58:08 2011 -0500
+++ b/src/org/w3c/unicorn/output/OutputFactory.java	Thu Feb 24 13:21:34 2011 -0500
@@ -3,6 +3,7 @@
 // Please first read the full copyright statement in file COPYRIGHT.html
 package org.w3c.unicorn.output;
 
+import java.util.Arrays;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
@@ -35,7 +36,7 @@
 		String module = mapOfOutputParameter.get("output");
 		
 		/* Commented out for now as this is unnecessary and that doesn't seem quite safe */		
-		if(null == module || "".equals(module)) {
+		if(null == module || "".equals(module) || Property.get("ENABLED_MODULES") == null || !Arrays.asList(Property.get("ENABLED_MODULES").split("\\s*,\\s*")).contains(module)) {
 			module = "simple";
 		}
 		

Received on Thursday, 24 February 2011 18:21:41 UTC