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

7 files changed, 21 insertions, 8 deletions

diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index 79a270d8..bce6f584 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -93,7 +93,7 @@
 		<dependency>
 			<groupId>org.mortbay.jetty</groupId>
 			<artifactId>jetty</artifactId>
-			<version>6.1.10</version>
+			<version>6.1.15</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/src/main/java/at/gv/egiz/bku/local/app/Container.java b/BKULocalApp/src/main/java/at/gv/egiz/bku/local/app/Container.java
index f56bbb86..d15d2c1b 100644
--- a/BKULocalApp/src/main/java/at/gv/egiz/bku/local/app/Container.java
+++ b/BKULocalApp/src/main/java/at/gv/egiz/bku/local/app/Container.java
@@ -61,6 +61,7 @@ public class Container {
     handlers.setHandlers(new Handler[] { webappcontext, new DefaultHandler() });

 

     server.setHandler(handlers);

+    server.setGracefulShutdown(1000*3);

   }

 

   public void start() throws Exception {

diff --git a/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties b/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties
index eebe36cd..e2f07481 100644
--- a/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties
+++ b/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties
@@ -49,3 +49,4 @@ AppletTimeout=300000
 #HTTPProxyHost=taranis.iaik.tugraz.at

 #HTTPProxyPort=8888

 DefaultSocketTimeout=200

+#SignatureLayout=
\ No newline at end of file
diff --git a/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java b/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
index 9d77e53e..a1f3864e 100644
--- a/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
+++ b/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
@@ -59,6 +59,7 @@ import static org.junit.Assert.*;
  *
  * @author clemens
  */
+@Ignore
 public class STALRequestBrokerTest {
 
     private static final Log log = LogFactory.getLog(STALRequestBrokerTest.class);
diff --git a/utils/src/main/java/at/gv/egiz/bku/local/ui/TrayIconDialog.java b/utils/src/main/java/at/gv/egiz/bku/local/ui/TrayIconDialog.java
index c7aae215..fef113fd 100644
--- a/utils/src/main/java/at/gv/egiz/bku/local/ui/TrayIconDialog.java
+++ b/utils/src/main/java/at/gv/egiz/bku/local/ui/TrayIconDialog.java
@@ -151,12 +151,12 @@ public class TrayIconDialog implements TrayIconDialogInterface {
   public synchronized static TrayIconDialogInterface getInstance() {

     ClassLoader cl = TrayIconDialog.class.getClassLoader();

     if (instance == null) {

-      if (cl.toString().startsWith("sun.")) {

+      if (cl.toString().equals(cl.getParent().toString())) {

         instance = new TrayIconDialog();

         return instance;

       }

       ClassLoader parent = cl;

-      while (!parent.toString().startsWith("sun.")) {

+      while (!parent.toString().equals(cl.getParent().toString())) {

         parent = parent.getParent();

       }

       try {

diff --git a/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URLDereferencer.java b/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URLDereferencer.java
index 8853a9c1..7361ec26 100644
--- a/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URLDereferencer.java
+++ b/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URLDereferencer.java
@@ -54,7 +54,9 @@ public class URLDereferencer {
    *          must not be null

    * @param aContext

    * @throws MalformedURLException

-   *           if the protocol is not supported

+   *           if the protocol is not supported
+   * @throws IOException if the url cannot be dereferenced (e.g. formdata not provided)
+   *           

    */

   public StreamData dereference(String aUrl, URLDereferencerContext aContext)

       throws IOException {

diff --git a/utils/src/test/java/at/gv/egiz/urldereferencer/FormDataTest.java b/utils/src/test/java/at/gv/egiz/urldereferencer/FormDataTest.java
index 1e0ce916..ecd4c8f7 100644
--- a/utils/src/test/java/at/gv/egiz/urldereferencer/FormDataTest.java
+++ b/utils/src/test/java/at/gv/egiz/urldereferencer/FormDataTest.java
@@ -77,12 +77,20 @@ public class FormDataTest implements FormDataURLSupplier {
   @Test

   public void testFormData() throws IOException {

     paramName = "Müllcontainer";

+    testStream = new ByteArrayInputStream("HelloWorld".getBytes("UTF-8"));

     String url = "formdata:"+paramName;

     StreamData sd = URLDereferencer.getInstance().dereference(url, urlCtx);

-    assertNull(sd);

-    testStream = new ByteArrayInputStream("HelloWorld".getBytes("UTF-8"));

-    sd = URLDereferencer.getInstance().dereference(url, urlCtx);

+    assertNotNull(sd);

     String result = StreamUtil.asString(sd.getStream(), "UTF-8");

     assertEquals("HelloWorld", result);

-  }

+  }
+  
+  @Test(expected=IOException.class)
+  public void testFormDataNotFound() throws IOException {
+    paramName = "Müllcontainer";
+    testStream = new ByteArrayInputStream("HelloWorld".getBytes("UTF-8"));
+    String url = "formdata:"+paramName+"2";
+    StreamData sd = URLDereferencer.getInstance().dereference(url, urlCtx);
+  }
+  

 }