W3C home > Mailing lists > Public > www-validator-cvs@w3.org > June 2010

commit: dives more information during initialization

From: Mercurial notifier <nobody@w3.org>
Date: Mon, 14 Jun 2010 09:22:35 -0400
To: Unicorn Updates <www-validator-cvs@w3.org>
Message-Id: <E1OO9cZ-00069F-NP@blinky.w3.org>
changeset:   1228:864c174ad7b0
user:        Thomas Gambet <tgambet@w3.org>
date:        Sun Jun 13 20:01:22 2010 -0400
files:       src/org/w3c/unicorn/action/InitAction.java
description:
dives more information during initialization


diff -r 6da367d390dc -r 864c174ad7b0 src/org/w3c/unicorn/action/InitAction.java
--- a/src/org/w3c/unicorn/action/InitAction.java	Sun Jun 13 20:00:03 2010 -0400
+++ b/src/org/w3c/unicorn/action/InitAction.java	Sun Jun 13 20:01:22 2010 -0400
@@ -9,6 +9,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.velocity.VelocityContext;
 import org.w3c.unicorn.Framework;
 import org.w3c.unicorn.exceptions.InitializationFailedException;
@@ -49,9 +50,9 @@
 			
 			Templates.write("init.vm", velocityContext, out);
 		} else {
-			response.setContentType("text/plain");
+			response.setContentType("text/plain; charset=UTF-8");
 
-			if (task == null || task.equals("all")) {
+			if (task.equals("all")) {
 				
 				Framework.reset();
 				
@@ -60,6 +61,7 @@
 				try {
 					Framework.initCore();
 					out.write("OK\n");
+					out.write("\t-> unicorn.home is " + System.getProperty("unicorn.home") + "\n");
 				} catch (InitializationFailedException e) {
 					Framework.logger.fatal(e.getMessage(), e);
 					out.write("FAILED\n" + e);
@@ -72,6 +74,8 @@
 				try {
 					Framework.initConfig();
 					out.write("OK\n");
+					for (String key : Framework.getUnicornPropertiesFiles().keySet())
+						out.write("\t" + key + "\n");
 				} catch (InitializationFailedException e) {
 					Framework.logger.fatal(e.getMessage(), e);
 					out.write("FAILED\n" + e);
@@ -84,6 +88,8 @@
 				try {
 					Framework.initResponseImplementations();
 					out.write("OK\n");
+					for (String key : Framework.responseImpl.keySet())
+						out.write("\t" + key + ": " + Framework.responseImpl.get(key).getName() + "\n");
 				} catch (InitializationFailedException e) {
 					Framework.logger.fatal(e.getMessage(), e);
 					out.write("FAILED\n" + e);
@@ -92,9 +98,9 @@
 				}
 			}
 			
-			if (task == null || task.equals("all") || task.equals("observers")) {
+			if (task.equals("all") || task.equals("observers")) {
 				
-				if (!Framework.isUcnInitialized && task != null && task.equals("observers")) {
+				if (!Framework.isUcnInitialized && task.equals("observers")) {
 					out.write("Unable to reload the observers because Unicorn is not initialized.\n" +
 							"You should initialize Unicorn fully and successfully one time before trying to perform this task (/init?task=all).");
 					out.close();
@@ -106,6 +112,8 @@
 				try {
 					Framework.initObservers();
 					out.write("OK\n");
+					for (String key : Framework.mapOfObserver.keySet())
+						out.write("\t" + key + ": " + Framework.mapOfObserver.get(key).getIndexURI() + "\n");
 				} catch (InitializationFailedException e) {
 					Framework.logger.fatal(e.getMessage(), e);
 					out.write("FAILED\n" + e);
@@ -114,9 +122,9 @@
 				}
 			}
 			
-			if (task == null || task.equals("all") || task.equals("language")) {
+			if (task.equals("all") || task.equals("languages")) {
 				
-				if (!Framework.isUcnInitialized && task != null && task.equals("language")) {
+				if (!Framework.isUcnInitialized && task.equals("language")) {
 					out.write("Unable to reload the language files because Unicorn is not initialized.\n" +
 							"You should initialize Unicorn fully and successfully one time before trying to perform this task (/init?task=all).");
 					out.close();
@@ -128,6 +136,8 @@
 				try {
 					Framework.initLanguages();
 					out.write("OK\n");
+					for (ULocale key : Framework.getLanguageProperties().keySet())
+						out.write("\t" + key.getName() + ": " + StringEscapeUtils.escapeHtml(key.getDisplayName(Language.getDefaultLocale())) + "\n");
 				} catch (InitializationFailedException e) {
 					Framework.logger.fatal(e.getMessage(), e);
 					out.write("FAILED\n" + e);
@@ -136,9 +146,9 @@
 				}
 			}
 			
-			if (task == null || task.equals("all") || task.equals("tasklist")) {
+			if (task.equals("all") || task.equals("tasklist")) {
 				
-				if (!Framework.isUcnInitialized && task != null && task.equals("tasklist")) {
+				if (!Framework.isUcnInitialized && task.equals("tasklist")) {
 					out.write("Unable to reload the tasklist because Unicorn is not initialized.\n" +
 							"You should initialize Unicorn fully and successfully one time before trying to perform this task (/init?task=all).");
 					out.close();
@@ -150,6 +160,8 @@
 				try {
 					Framework.initTasklists();
 					out.write("OK\n");
+					for (String key : Framework.mapOfTask.keySet())
+						out.write("\t" + key + ": " + Framework.mapOfTask.get(key).getLongName(Language.getDefaultLocale().getBaseName()) + "\n");
 				} catch (InitializationFailedException e) {
 					Framework.logger.fatal(e.getMessage(), e);
 					out.write("FAILED\n" + e);
Received on Monday, 14 June 2010 13:25:15 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:20 GMT