2006/unicorn/org/w3c/unicorn/tests UnicornClient.java,1.10,1.11 FirstServlet.java,1.10,1.11 UnicornClientDirectInputTest.java,1.2,1.3 XMLBeansTest.java,1.1,NONE

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

Modified Files:
	UnicornClient.java FirstServlet.java 
	UnicornClientDirectInputTest.java 
Removed Files:
	XMLBeansTest.java 
Log Message:
Fixed a few warnings
Removed XMLBeansTest.java as it won't compile without some libs
Forced com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl to be used
Renamed *_text10.vm to *_text.vm

Index: FirstServlet.java
===================================================================
RCS file: /sources/public/2006/unicorn/org/w3c/unicorn/tests/FirstServlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- FirstServlet.java	17 Jun 2008 13:45:31 -0000	1.10
+++ FirstServlet.java	2 Jul 2008 17:34:47 -0000	1.11
@@ -11,9 +11,7 @@
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;

--- XMLBeansTest.java DELETED ---

Index: UnicornClientDirectInputTest.java
===================================================================
RCS file: /sources/public/2006/unicorn/org/w3c/unicorn/tests/UnicornClientDirectInputTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- UnicornClientDirectInputTest.java	17 Jun 2008 13:45:31 -0000	1.2
+++ UnicornClientDirectInputTest.java	2 Jul 2008 17:34:47 -0000	1.3
@@ -1,20 +1,14 @@
 package org.w3c.unicorn.tests;
 
-import java.io.File;
 import java.io.PrintWriter;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.disk.DiskFileItem;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.w3c.unicorn.UnicornCall;
 import org.w3c.unicorn.contract.EnumInputMethod;
 import org.w3c.unicorn.output.OutputFactory;
 import org.w3c.unicorn.output.OutputFormater;
 import org.w3c.unicorn.output.OutputModule;
-import org.w3c.unicorn.util.Property;
 
 public class UnicornClientDirectInputTest {
 

Index: UnicornClient.java
===================================================================
RCS file: /sources/public/2006/unicorn/org/w3c/unicorn/tests/UnicornClient.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- UnicornClient.java	19 Jun 2008 14:43:05 -0000	1.10
+++ UnicornClient.java	2 Jul 2008 17:34:46 -0000	1.11
@@ -1,14 +1,9 @@
 package org.w3c.unicorn.tests;
 
 import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.PrintWriter;
-import java.io.StringReader;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -43,8 +38,6 @@
 	 * @param args
 	 */
 	public static void main(String[] args) {
-		UnicornCall aUnicornCall = new UnicornCall();
-		
 
 		if(args.length==0) print_help();
 		else if(args.length==1 && args[0].equals("help"))print_help();
@@ -59,7 +52,7 @@
 			pParams = args[4]; 
 		}
 		
-		
+		UnicornCall aUnicornCall = new UnicornCall();		
 
 		//parse other parameters: "x2=on,toto=titi" to a map<String,String[]>  
 		if (pParams.length()!=0) {
@@ -122,8 +115,8 @@
 			Map<String, Object> mapOfStringObject = new LinkedHashMap<String, Object>();
 			mapOfStringObject.put("unicorncall", aUnicornCall);
 			OutputFormater aOutputFormater = OutputFactory.getOutputFormater(
-					outputTemplate, // le template --> text ou xhtml10, see unicorn.properties
-					language,   // la langue
+					outputTemplate, // text or xhtml10, see unicorn.properties
+					language, 
 					"text/html"); // MIME Type
 			OutputModule aOutputModule = OutputFactory.getOutputModule("simple");
 			PrintWriter pw = new PrintWriter(System.out);

Received on Wednesday, 2 July 2008 17:35:23 UTC