Changeset 268:365f59821036

Timestamp:

09/03/09 16:43:21 (4 years ago)

Author:

jean-gui

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@269

Message:

Restored ClientHttpRequest? as Apache's HttpClient? was making the markup validator fail on file upload (in streaming mode) for not much added benefit.
Same goes for EscapeXMLEntities. Not much benefit from using Apache's classes which need several dependencies

Files:

• .classpath (modified) (1 diff)
• WebContent/WEB-INF/conf/log4j.properties (modified) (2 diffs)
• WebContent/WEB-INF/lib/apache-mime4j-0.6.jar (deleted)
• WebContent/WEB-INF/lib/httpclient-4.0.jar (deleted)
• WebContent/WEB-INF/lib/httpcore-4.0.1.jar (deleted)
• WebContent/WEB-INF/lib/httpmime-4.0.jar (deleted)
• src/org/w3c/unicorn/UnicornCall.java (modified) (8 diffs)
• src/org/w3c/unicorn/request/DirectRequestGET.java (modified) (2 diffs)
• src/org/w3c/unicorn/request/DirectRequestPOST.java (modified) (2 diffs)
• src/org/w3c/unicorn/request/Request.java (modified) (4 diffs)
• src/org/w3c/unicorn/request/URIRequest.java (modified) (2 diffs)
• src/org/w3c/unicorn/request/UploadRequest.java (modified) (7 diffs)
• src/org/w3c/unicorn/response/parser/DefaultParser.java (modified) (1 diff)
• src/org/w3c/unicorn/response/parser/ResponseParser.java (modified) (1 diff)
• src/org/w3c/unicorn/response/parser/ResponseParserFactory.java (modified) (1 diff)
• src/org/w3c/unicorn/util/ClientHttpRequest.java (added)
• src/org/w3c/unicorn/util/EscapeXMLEntities.java (added)
• src/org/w3c/unicorn/util/XHTMLize.java (modified) (4 diffs)

.classpath

@@ -14 +14 @@
         </classpathentry>
         <classpathentry kind="lib" path="WebContent/WEB-INF/lib/xbean.jar"/>
-        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/httpcore-4.0.1.jar"/>
-        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/httpmime-4.0.jar"/>
-        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/httpclient-4.0.jar"/>
-        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/apache-mime4j-0.6.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry kind="lib" path="WebContent/WEB-INF/lib/jsr173_1.0_api.jar"/>

WebContent/WEB-INF/conf/log4j.properties

@@ -1 @@
-log4j.rootLogger=WARN, GUI, Console
-#log4j.rootLogger=WARN, GUI, Console, level-error, level-warning, level-info, level-debug, level-trace
+#log4j.rootLogger=WARN, GUI, Console
+log4j.rootLogger=WARN, level-error, level-warning, level-info, level-debug, level-trace
 
 log4j.logger.org.apache.velocity=DEBUG
 log4j.logger.org.w3c.unicorn.Framework=DEBUG
 
-log4j.logger.org.w3c.unicorn=ALL
-log4j.logger.org.w3c.unicorn.action=DEBUG
-log4j.logger.org.w3c.unicorn.contract=WARN
-log4j.logger.org.w3c.unicorn.input=WARN
-log4j.logger.org.w3c.unicorn.output=WARN
-log4j.logger.org.w3c.unicorn.request=WARN
-log4j.logger.org.w3c.unicorn.response=WARN
-log4j.logger.org.w3c.unicorn.tasklist=WARN
-log4j.logger.org.w3c.unicorn.tasklisttree=WARN
-log4j.logger.org.w3c.unicorn.util=WARN
+#log4j.logger.org.w3c.unicorn=ALL
+#log4j.logger.org.w3c.unicorn.action=DEBUG
+#log4j.logger.org.w3c.unicorn.contract=WARN
+#log4j.logger.org.w3c.unicorn.input=WARN
+#log4j.logger.org.w3c.unicorn.output=WARN
+#log4j.logger.org.w3c.unicorn.request=WARN
+#log4j.logger.org.w3c.unicorn.response=WARN
+#log4j.logger.org.w3c.unicorn.tasklist=WARN
+#log4j.logger.org.w3c.unicorn.tasklisttree=WARN
+#log4j.logger.org.w3c.unicorn.util=WARN
 
-#log4j.logger.org.w3c.unicorn=ALL, package-unicorn
-#log4j.logger.org.w3c.unicorn.action=ALL, package-action
-#log4j.logger.org.w3c.unicorn.contract=ALL, package-contract
-#log4j.logger.org.w3c.unicorn.input=ALL, package-input
-#log4j.logger.org.w3c.unicorn.output=ALL, package-output
-#log4j.logger.org.w3c.unicorn.request=ALL, package-request
-#log4j.logger.org.w3c.unicorn.response=ALL, package-response
-#log4j.logger.org.w3c.unicorn.tasklist=ALL, package-tasklist
-#log4j.logger.org.w3c.unicorn.util=ALL, package-util
+log4j.logger.org.w3c.unicorn=ALL, package-unicorn
+log4j.logger.org.w3c.unicorn.action=ALL, package-action
+log4j.logger.org.w3c.unicorn.contract=ALL, package-contract
+log4j.logger.org.w3c.unicorn.input=ALL, package-input
+log4j.logger.org.w3c.unicorn.output=ALL, package-output
+log4j.logger.org.w3c.unicorn.request=ALL, package-request
+log4j.logger.org.w3c.unicorn.response=ALL, package-response
+log4j.logger.org.w3c.unicorn.tasklist=ALL, package-tasklist
+log4j.logger.org.w3c.unicorn.util=ALL, package-util
 
 log4j.appender.GUI=org.apache.log4j.lf5.LF5Appender
@@ -44 +44 @@
 log4j.appender.level-error.filter.LevelToMatch=error
 log4j.appender.level-error.filter.AcceptOnMatch=true
-log4j.appender.level-error.filter=org.apache.log4j.varia.DenyAllFilter
 
 log4j.appender.level-warning=org.apache.log4j.RollingFileAppender

src/org/w3c/unicorn/UnicornCall.java

@@ -1 @@
-// $Id: UnicornCall.java,v 1.5 2009-09-02 15:45:42 tgambet Exp $
+// $Id: UnicornCall.java,v 1.6 2009-09-03 16:43:21 jean-gui Exp $
 // Author: Jean-Guilhem Rouel
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2006.
@@ -13 +13 @@
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Hashtable;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
 
 import javax.activation.MimeType;
@@ -32 +30 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.app.event.implement.EscapeXmlReference;
 import org.w3.unicorn.tasklist.GroupType;
 import org.w3c.dom.Document;
@@ -56 +53 @@
 import org.w3c.unicorn.tasklisttree.TLTIf;
 import org.w3c.unicorn.tasklisttree.TLTNode;
+import org.w3c.unicorn.util.EscapeXMLEntities;
 import org.w3c.unicorn.util.Property;
 import org.w3c.unicorn.util.Templates;
@@ -607 +605 @@
                         if (!group.isSetType()) {
                                 for (String observerId : group.getObservationList()) {
-                                        tempMap.put(observerId, mapOfResponse.get(observerId));
+                                        if(mapOfResponse.get(observerId) != null) {
+                                                tempMap.put(observerId, mapOfResponse.get(observerId));
+                                        }
                                 }
                         } else {
@@ -903 +903 @@
                 } catch (final Exception e) {
                         RequestThread.logger.error("Exception : " + e.getMessage(), e);
-                        e.printStackTrace();
                         try {
                                 StringBuilder builder = new StringBuilder();
                                 //String lang[] = unicornCall.getMapOfStringParameter().get(
                                 //              Property.get("UNICORN_PARAMETER_PREFIX") + "lang");
-                                
                                 String lang = unicornCall.getLang();
 
                                 VelocityContext context = new VelocityContext(Framework.getLanguageContexts().get(lang));
-                                
-                                final EventCartridge aEventCartridge = new EventCartridge();
-                                aEventCartridge.addEventHandler(new EscapeXmlReference());
+                                EventCartridge aEventCartridge = new EventCartridge();
+                                aEventCartridge.addEventHandler(new EscapeXMLEntities());
                                 aEventCartridge.attachToContext(context);
                                 
@@ -921 +918 @@
                                 else
                                         context.put("exception", "");
-
                                 ByteArrayOutputStream os = new ByteArrayOutputStream();
                                 OutputStreamWriter osw = new OutputStreamWriter(os);
                                 Templates.write("io_error.vm", context, osw);
-                                
                                 osw.close();
-
                                 InputStreamReader isr = new InputStreamReader(
                                                 new ByteArrayInputStream(os.toByteArray()));
-
                                 char[] chararray = new char[8192];
                                 int readLength = 0;
@@ -936 +929 @@
                                         builder.append(chararray, 0, readLength);
                                 }
-                                aResponse = ResponseParserFactory.parse(builder.toString(),
-                                                this.aRequest.getResponseType());
-                                aResponse.setXml(builder);
+                                aResponse = ResponseParserFactory.parse(builder.toString(), "default");                         
+                                aResponse.setXml(builder);                              
                         } catch (MalformedURLException e1) {
                                 RequestThread.logger

src/org/w3c/unicorn/request/DirectRequestGET.java

@@ -1 @@
-// $Id: DirectRequestGET.java,v 1.3 2009-09-02 12:41:28 tgambet Exp $
+// $Id: DirectRequestGET.java,v 1.4 2009-09-03 16:43:19 jean-gui Exp $
 // Author: Damien LEROY.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -87 +87 @@
 
         @Override
-        public Response doRequest() throws IOException {
+        public Response doRequest() throws Exception {
                 Request.logger.trace("doRequest");
                 final URL aURL;

src/org/w3c/unicorn/request/DirectRequestPOST.java

@@ -1 @@
-// $Id: DirectRequestPOST.java,v 1.2 2009-08-28 12:39:48 jean-gui Exp $
+// $Id: DirectRequestPOST.java,v 1.3 2009-09-03 16:43:19 jean-gui Exp $
 // Author: Damien LEROY.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -115 +115 @@
 
         @Override
-        public Response doRequest() throws IOException {
+        public Response doRequest() throws Exception {
                 Request.logger.trace("doRequest");
                 final URL aURL = new URL(sURL);

src/org/w3c/unicorn/request/Request.java

@@ -1 @@
-// $Id: Request.java,v 1.2 2009-08-28 12:39:48 jean-gui Exp $
+// $Id: Request.java,v 1.3 2009-09-03 16:43:19 jean-gui Exp $
 // Author: Damien LEROY.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -5 +5 @@
 package org.w3c.unicorn.request;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.event.EventCartridge;
+import org.apache.velocity.app.event.implement.EscapeXmlReference;
+import org.w3c.unicorn.Framework;
 import org.w3c.unicorn.contract.EnumInputMethod;
 import org.w3c.unicorn.input.InputModule;
 import org.w3c.unicorn.response.Response;
 import org.w3c.unicorn.response.parser.ResponseParserFactory;
+import org.w3c.unicorn.util.Templates;
 
 /**
@@ -68 +76 @@
          * @throws IOException
          *             odd error occured
+         * @throws Exception 
          */
         public abstract org.w3c.unicorn.response.Response doRequest()
-                        throws IOException;
+                        throws IOException, Exception;
 
         public abstract EnumInputMethod getInputMethod();
@@ -136 +145 @@
         }
 
-        protected Response streamToResponse(InputStream is) throws IOException {
+        protected Response streamToResponse(InputStream is) throws Exception {
                 StringBuilder builder = new StringBuilder();
                 InputStreamReader isr = new InputStreamReader(is, "UTF-8");
                 char[] chararray = new char[8192];
                 int readLength = 0;
+                Response res;
+                
                 while ((readLength = isr.read(chararray, 0, 8192)) > -1) {
                         builder.append(chararray, 0, readLength);
                 }
-
-                Response res = ResponseParserFactory.parse(builder.toString(), this
-                                .getResponseType());
-                res.setXml(builder);
+                Request.logger.debug(builder);
+                res = ResponseParserFactory.parse(builder.toString(), this.getResponseType());
+                if(res != null) {
+                        res.setXml(builder);
+                }
 
                 return res;

src/org/w3c/unicorn/request/URIRequest.java

@@ -1 @@
-// $Id: URIRequest.java,v 1.2 2009-08-28 12:39:48 jean-gui Exp $
+// $Id: URIRequest.java,v 1.3 2009-09-03 16:43:19 jean-gui Exp $
 // Author: Damien LEROY.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -96 +96 @@
         /**
          * Do the request to the observer
-         * 
-         * @throws IOException
-         *             odd error occured
+         * @throws Exception 
          */
         @Override
-        public Response doRequest() throws IOException {
+        public Response doRequest() throws Exception {
                 Request.logger.trace("doRequest");
                 if (Request.logger.isDebugEnabled()) {

src/org/w3c/unicorn/request/UploadRequest.java

@@ -1 @@
-// $Id: UploadRequest.java,v 1.2 2009-08-28 12:39:48 jean-gui Exp $
+// $Id: UploadRequest.java,v 1.3 2009-09-03 16:43:19 jean-gui Exp $
 // Author: Damien LEROY.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -6 +6 @@
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.util.Hashtable;
 import java.util.Map;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.mime.MultipartEntity;
-import org.apache.http.entity.mime.content.InputStreamBody;
-import org.apache.http.entity.mime.content.StringBody;
-import org.apache.http.impl.client.DefaultHttpClient;
 import org.w3c.unicorn.contract.EnumInputMethod;
 import org.w3c.unicorn.input.InputModule;
 import org.w3c.unicorn.input.UploadInputModule;
 import org.w3c.unicorn.response.Response;
+import org.w3c.unicorn.util.ClientHttpRequest;
 
 /**
@@ -37 +33 @@
          */
         private String sInputParameterName = null;
+
+        /**
+         * A http client for the request in upload
+         */
+        private ClientHttpRequest aClientHttpRequest = null;
 
         /**
@@ -99 +100 @@
 
         @Override
-        public Response doRequest() throws IOException {
+        public Response doRequest() throws Exception {
                 Request.logger.trace("doRequest");
-                DefaultHttpClient httpclient = new DefaultHttpClient();
-                 
-                HttpPost method = new HttpPost(sURL);
-                method.setHeader("Accept-Language", sLang);
-                MultipartEntity entity = new MultipartEntity();
-
+                this.aClientHttpRequest = new ClientHttpRequest(sURL);
+                Request.logger.debug("Lang : " + this.sLang + ".");
+                this.aClientHttpRequest.setLang(sLang);
+                this.aClientHttpRequest.setParameter(this.sInputParameterName,
+                                this.aUploadInputModule.getFileName(), this.aUploadInputModule
+                                                .getInputStream());
                 for (final String sName : this.mapOfParameter.keySet()) {
                         final String sValue = this.mapOfParameter.get(sName);
@@ -114 +115 @@
                                 Request.logger.debug("Value :" + sValue + ".");
                         }
-                        entity.addPart(sName, new StringBody(sValue));
-                        //entity.addPart(sName, new StringBody(sValue, Charset.forName("UTF-8")));
+                        this.aClientHttpRequest.setParameter(sName, sValue);
                 }
+                InputStream is = this.aClientHttpRequest.post();
 
-                InputStreamBody file = new InputStreamBody(this.aUploadInputModule.getInputStream(), 
-                                this.aUploadInputModule.getMimeType().toString(), 
-                                this.aUploadInputModule.getFileName());
-                entity.addPart(this.sInputParameterName, file);
-                method.setEntity(entity);
-                 
-                HttpResponse response = httpclient.execute(method);
-                return streamToResponse(response.getEntity().getContent());
+                return streamToResponse(is);
         }
-        
+
         @Override
         public EnumInputMethod getInputMethod() {
@@ -134 +128 @@
         }
 
-        /*@Override
+        @Override
         public String toString() {
                 final int iStringBufferSize = 1000;
@@ -140 +134 @@
                 aStringBuffer.append("ClientHttpRequest:").append(
                                 this.aClientHttpRequest);
-                return aStringBuffer.toString();
-        }*/
+                return "lolmdr: " + aStringBuffer.toString();
+        }
 
 }

src/org/w3c/unicorn/response/parser/DefaultParser.java

@@ -44 +44 @@
          *            The input stream.
          * @return The corresponding response.
-         */
-        public Response parse(String r) {
-
-                try {
-                        /*XmlOptions opts = new XmlOptions();
-                        opts.setCharacterEncoding("UTF-8");*/
-                        
-                        org.w3.unicorn.observationresponse.ObservationresponseDocument ord = org.w3.unicorn.observationresponse.ObservationresponseDocument.Factory
-                                        .parse(r);
-                        return swap(ord);
-                } catch (Exception e) {
-                        e.printStackTrace();
-                        return null;
-                }
+         * @throws Exception 
+         */
+        public Response parse(String r) throws Exception {
+                ObservationresponseDocument ord = ObservationresponseDocument.Factory.parse(r);
+                return swap(ord);
         }
 

src/org/w3c/unicorn/response/parser/ResponseParser.java

@@ -4 +4 @@
 
 public interface ResponseParser {
-        public Response parse(String r);
+        public Response parse(String r) throws Exception;
 }

src/org/w3c/unicorn/response/parser/ResponseParserFactory.java

@@ -42 +42 @@
          *            The type of the response.
          * @return The response parsed corresponding to the input.
+         * @throws Exception 
          */
-        public static Response parse(String r, String responseType) {
+        public static Response parse(String r, String responseType) throws Exception {
                 try {
                         Response response = createResponseParser(responseType).parse(r);

src/org/w3c/unicorn/util/XHTMLize.java

@@ -47 +47 @@
                         return oValue.toString();
                 else
-                        return StringEscapeUtils.escapeHtml(oValue.toString());
+                        return StringEscapeUtils.escapeXml(oValue.toString());
         }
 
@@ -64 +64 @@
                                 sResultat += insertImg((Img) oElement);
                         } else {
-                                sResultat += StringEscapeUtils.escapeHtml(oElement.toString());
+                                sResultat += StringEscapeUtils.escapeXml(oElement.toString());
                         }
                 }
@@ -86 +86 @@
                                 sResultat += insertImg((Img) oElement);
                         } else {
-                                sResultat += StringEscapeUtils.escapeHtml(oElement.toString());
+                                sResultat += StringEscapeUtils.escapeXml(oElement.toString());
                         }
                 }
@@ -101 +101 @@
          */
         private String insertImg(final Img aImage) {
-                return "<img src=\"" + StringEscapeUtils.escapeHtml(aImage.getSrc())
-                                + "\" alt=\"" + StringEscapeUtils.escapeHtml(aImage.getAlt())
+                return "<img src=\"" + StringEscapeUtils.escapeXml(aImage.getSrc())
+                                + "\" alt=\"" + StringEscapeUtils.escapeXml(aImage.getAlt())
                                 + "\"/>";
         }