Logging issues fixed:

 - Added possibility to configure logging of BKUWebstart. Logging is now configured from log4j configuration deployed with BKUWebstart in a first step. In a second step the webstart launcher looks for a log4j configuration file in the user's mooca configuration directory and updates the log4j configuration.
 - Logging of IAIK PKI properly initialized. IAIK PKI does not mess with the log4j configuration any longer.
 - Changed log4j accordingly (an appender is now needed as IAIK PKI does not reconfigure log4j any longer).

Added css-stylesheet to ErrorResponses issued by the BKU to improve the presentation to the user.

Changed dependencies of BKUWebStart (see Issue#469 https://egovlabs.gv.at/tracker/index.php?func=detail&aid=469&group_id=13&atid=134).

DataURLConnection now uses the request encoding of SL < 1.2. application/x-www-form-urlencoded is now used as default encoding method. multipart/form-data is used only if transfer parameters are present in the request that require a Content-Type parameter. This can only be set with multipart/form-data. This is not in conformance with SL 1.2, however it should improve compatibility with applications. 

Therefore, removed the ability to configure the DataURLConnection implementation class.

DataURLConnection now uses a streaming implementation for encoding of application/x-www-form-urlencoded requests. 

XWWWFormUrlImputDecoder now uses a streaming implementation for decoding of application/x-www-form-urlencoded requests.

Fixed Bug in SLResultPart that caused a binary response to be provided as parameter "XMLResponse" in a multipart/form-data encoded request to DataURL.

SLCommandFactory now supports unmarshalling of SL < 1.2 requests in order issue meaningful error messages. Therefore, the marshaling context for response marshaling had to be separated from the marshaling context for requests in order to avoid the marshaling of SL < 1.2 namespace prefixes in SL 1.2 responses.

Target attribute in QualifiedProperties is now marshaled. (see Issue#470 https://egovlabs.gv.at/tracker/index.php?func=detail&aid=470&group_id=13&atid=134)

Reporting of XML validation errors improved.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@510 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

1 files changed, 20 insertions, 63 deletions

diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/XWWWFormUrlInputDecoder.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/XWWWFormUrlInputDecoder.java
index f4ebe288..69c659e1 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/XWWWFormUrlInputDecoder.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/XWWWFormUrlInputDecoder.java
@@ -16,86 +16,43 @@
 */
 package at.gv.egiz.bku.binding;

 

-import java.io.ByteArrayInputStream;

-import java.io.ByteArrayOutputStream;

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.URLDecoder;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.commons.fileupload.ParameterParser;
 

-import org.apache.commons.fileupload.ParameterParser;

-

-import at.gv.egiz.bku.slexceptions.SLRuntimeException;

-import at.gv.egiz.bku.utils.StreamUtil;

-

-/**

- * Implementation based on Java's URLDecoder class 

- *

- */

-// FIXME replace this code by a streaming variant

 public class XWWWFormUrlInputDecoder implements InputDecoder {

-

-  public final static String CHAR_SET = "charset";

-  public final static String NAME_VAL_SEP = "=";

-  public final static String SEP = "\\&";

-

-  private String contentType;

-  private InputStream dataStream;

-  private String charset = "UTF-8";

-

-  protected List<FormParameter> decodeInput(InputStream is) throws IOException {

-    List<FormParameter> result = new LinkedList<FormParameter>();

-    ByteArrayOutputStream bos = new ByteArrayOutputStream();

-    StreamUtil.copyStream(is, bos);

-    String inputString = new String(bos.toByteArray());

-    String[] nameValuePairs = inputString.split(SEP);

-    //inputString = URLDecoder.decode(inputString, charset);

-    for (int i = 0; i < nameValuePairs.length; i++) {

-      String[] fields = nameValuePairs[i].split(NAME_VAL_SEP, 2);

-      if (fields.length != 2) {

-        throw new SLRuntimeException("Invalid form encoding, missing value");

-      }

-      String name = URLDecoder.decode(fields[0], charset); 

-      String value =URLDecoder.decode(fields[1], charset);

-      ByteArrayInputStream bais = new ByteArrayInputStream(value

-          .getBytes(charset));

-      FormParameterImpl fpi = new FormParameterImpl(contentType, name, bais, null);

-      result.add(fpi);

-    }

-    return result;

-  }

-

-  @SuppressWarnings("unchecked")

+
+  /**
+   * The MIME type 'application/x-www-form-urlencoded'.
+   */
+  public static final String CONTENT_TYPE = "application/x-www-form-urlencoded";
+
+  /**
+   * The form parameter iterator.
+   */
+  protected XWWWFormUrlInputIterator iterator;
+

+  @SuppressWarnings("unchecked")
   @Override

   public void setContentType(String contentType) {

     ParameterParser pp = new ParameterParser();

     pp.setLowerCaseNames(true);

     Map<String, String> params = pp.parse(contentType, new char[] { ':', ';' });

-    if (!params.containsKey("application/x-www-form-urlencoded")) {

+    if (!params.containsKey(CONTENT_TYPE)) {

       throw new IllegalArgumentException(

           "not a url encoded content type specification: " + contentType);

     }

-    String cs = params.get(CHAR_SET);

-    if (cs != null) {

-      charset = cs;

-    }

-    this.contentType = contentType;

   }

 

   @Override

   public Iterator<FormParameter> getFormParameterIterator() {

-    try {

-      return decodeInput(dataStream).iterator();

-    } catch (IOException e) {

-      throw new SLRuntimeException(e);

-    }

+    return iterator;

   }

 

   @Override

   public void setInputStream(InputStream is) {

-    dataStream = is;

+    iterator = new XWWWFormUrlInputIterator(is);

   }

 }