Merged feature branch mocca-1.2.13-id@r724 back to trunk.

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

2 files changed, 4 insertions, 43 deletions

diff --git a/BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java b/BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java
deleted file mode 100644
index eefaf5b6..00000000
--- a/BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package at.gv.egiz.bku.online.conf;

-

-import java.net.URL;

-

-import javax.net.ssl.HttpsURLConnection;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.springframework.context.ApplicationContext;

-import org.springframework.context.support.ClassPathXmlApplicationContext;

-

-@Ignore

-public class SSLConfigTest {

-	

-	private SpringConfigurator cfg;

-	private ApplicationContext ctx;

-		

-	@Before

-	public void setUp() throws Exception {

-		ctx = new ClassPathXmlApplicationContext("applicationContext.xml");

-		

-	}

-

-	@Ignore

-	@Test

-	public void testConnect() throws Exception {

-		String url = "https://apps.egiz.gv.at/exchange-moa-id-auth/VerifyIdentityLink?MOASessionID=8151862969943601574";

-		URL u = new URL(url);

-		HttpsURLConnection uc = (HttpsURLConnection) u.openConnection();

-		uc.connect();

-		System.out.println(uc.getCipherSuite());

-	}

-	

-	@After

-	public void shutDown() {

-		

-	}

-}

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 741974eb..da816d48 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
@@ -47,11 +47,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import javax.xml.bind.JAXBElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.junit.Assert.*;
 
@@ -62,11 +62,12 @@ import static org.junit.Assert.*;
 @Ignore
 public class STALRequestBrokerTest {
 
-    private static final Log log = LogFactory.getLog(STALRequestBrokerTest.class);
+    private final Logger log = LoggerFactory.getLogger(STALRequestBrokerTest.class);
     protected static STALRequestBroker stal;
 
     @BeforeClass
     public static void setUp() {
+        Logger log = LoggerFactory.getLogger(STALRequestBrokerTest.class);
         RequestBrokerSTALFactory fac = new RequestBrokerSTALFactory();
         stal = (STALRequestBrokerImpl) fac.createSTAL();
         log.debug("Created STAL " + stal.getClass().getName());