2006/unicorn/org/w3c/unicorn Framework.java,1.20,1.21 UnicornCall.java,1.25,1.26

Update of /sources/public/2006/unicorn/org/w3c/unicorn
In directory hutz:/tmp/cvs-serv6091/org/w3c/unicorn

Modified Files:
	Framework.java UnicornCall.java 
Log Message:
Compatibility with Jigsaw is back

Index: Framework.java
===================================================================
RCS file: /sources/public/2006/unicorn/org/w3c/unicorn/Framework.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Framework.java	29 Jul 2009 09:39:05 -0000	1.20
+++ Framework.java	29 Jul 2009 13:23:33 -0000	1.21
@@ -78,8 +78,7 @@
 	 */
 	static {
 		try {
-			URL aURLPropFile = new URL(Property.class.getResource("/"),
-					 "org/w3c/unicorn/conf/extensions.properties");
+			URL aURLPropFile = Property.getPropertyFileURL("extensions.properties");			
 			
 			final Properties aProperties = new Properties();
 			aProperties.load(aURLPropFile.openStream());
@@ -101,8 +100,7 @@
 			// Retrieve the properties of the response parsers in the resources
 			mapOfReponseParser = new LinkedHashMap<String, ResponseParser>();
 			
-			URL aURLPropFile = new URL(Property.class.getResource("/"),
-					"org/w3c/unicorn/conf/responseParsers.properties");
+			URL aURLPropFile = Property.getPropertyFileURL("responseParsers.properties");
 			
 			final Properties aProperties = new Properties();
 			aProperties.load(aURLPropFile.openStream());

Index: UnicornCall.java
===================================================================
RCS file: /sources/public/2006/unicorn/org/w3c/unicorn/UnicornCall.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- UnicornCall.java	29 Jul 2009 09:18:24 -0000	1.25
+++ UnicornCall.java	29 Jul 2009 13:23:33 -0000	1.26
@@ -860,7 +860,7 @@
 			e.printStackTrace();
 			try {
 				StringBuilder builder = new StringBuilder();
-				String lang = unicornCall.getMapOfStringParameter().get("ucn_lang")[0];
+				String lang = unicornCall.getMapOfStringParameter().get(Property.get("UNICORN_PARAMETER_PREFIX") + "lang")[0];
 				
 				// generateFileFromTemplate generates the error xml file if it doesn't exist already
 				String filePath = TemplateHelper.generateFileFromTemplate("io_error", lang, Property.get("PATH_TO_INDEX_OUTPUT"), "xml");

Received on Wednesday, 29 July 2009 13:23:45 UTC