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

5 files changed, 61 insertions, 44 deletions

diff --git a/BKUAppletExt/keystore.ks b/BKUAppletExt/keystore.ks
index 824c3a40..ba0b4652 100644
--- a/BKUAppletExt/keystore.ks
+++ b/BKUAppletExt/keystore.ks
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index b79dd260..c60864bc 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -1,45 +1,62 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <artifactId>bku</artifactId>
+        <artifactId>mocca</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.14-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.14-SNAPSHOT</version>
+    <version>${project.parent.version}</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.14-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.14-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.14-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.14-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.14-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.14-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+        	<groupId>org.slf4j</groupId>
+        	<artifactId>slf4j-api</artifactId>
+        	<optional>true</optional>
+        </dependency>
+        <dependency>
+        	<groupId>org.slf4j</groupId>
+        	<artifactId>slf4j-jdk14</artifactId>
+        	<scope>runtime</scope>
+        	<optional>true</optional>
         </dependency>
     </dependencies>
     <build>
@@ -98,8 +115,8 @@
                             <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeGroupIds>at.gv.egiz</includeGroupIds>
-                            <excludeTransitive>true</excludeTransitive>
+                            <includeScope>runtime</includeScope>
+                            <excludeTransitive>false</excludeTransitive>
                             <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                             <excludes>META-INF\/</excludes>
                         </configuration>
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/ActivationApplet.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/ActivationApplet.java
index 4f2f1331..b8526730 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/ActivationApplet.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/ActivationApplet.java
@@ -16,13 +16,12 @@
  */
 package at.gv.egiz.bku.online.applet;
 
-import at.gv.egiz.bku.gui.AbstractHelpListener;
 import at.gv.egiz.bku.gui.ActivationGUI;
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.SwitchFocusListener;
 import at.gv.egiz.bku.gui.BKUGUIFacade.Style;
+import at.gv.egiz.bku.gui.HelpListener;
 import at.gv.egiz.bku.gui.viewer.FontProvider;
-import at.gv.egiz.bku.online.applet.BKUApplet;
 import at.gv.egiz.bku.smccstal.AbstractSMCCSTAL;
 import at.gv.egiz.bku.smccstal.CardMgmtRequestHandler;
 import at.gv.egiz.stal.ext.APDUScriptRequest;
@@ -35,8 +34,8 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Locale;
 import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -45,7 +44,7 @@ import org.apache.commons.logging.LogFactory;
 public class ActivationApplet extends BKUApplet {
 
   private static final long serialVersionUID = 1L;
-  private static Log log = LogFactory.getLog(ActivationApplet.class);
+  private final Logger log = LoggerFactory.getLogger(ActivationApplet.class);
 
   @Override
   public void init() {
@@ -53,7 +52,7 @@ public class ActivationApplet extends BKUApplet {
     if (worker instanceof AbstractSMCCSTAL) {
       CardMgmtRequestHandler handler = new CardMgmtRequestHandler();
       ((AbstractSMCCSTAL) worker).addRequestHandler(APDUScriptRequest.class, handler);
-      log.debug("Registered CardMgmtRequestHandler");
+      log.debug("Registered CardMgmtRequestHandler.");
     } else {
       log.warn("Cannot register CardMgmtRequestHandler.");
     }
@@ -67,9 +66,9 @@ public class ActivationApplet extends BKUApplet {
   @Override
   public STALPortType getSTALPort() throws MalformedURLException {
     URL wsdlURL = getURLParameter(WSDL_URL, null);
-    log.debug("setting STAL WSDL: " + wsdlURL);
+    log.debug("Setting STAL WSDL: {}.", wsdlURL);
     QName endpointName = new QName(STAL_WSDL_NS, STAL_SERVICE);
-    log.info("creating STAL-X enabled webservice port");
+    log.info("Creating STAL-X enabled webservice port.");
     STALService stal = new STALService(wsdlURL, endpointName);
     return stal.getSTALPort();
   }
@@ -87,7 +86,7 @@ public class ActivationApplet extends BKUApplet {
           Style guiStyle,
           URL backgroundImgURL,
           FontProvider fontProvider,
-          AbstractHelpListener helpListener,
+          HelpListener helpListener,
           SwitchFocusListener switchFocusListener) {
     return new ActivationGUI(contentPane, locale, guiStyle, backgroundImgURL, fontProvider, helpListener, switchFocusListener);
   }
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementApplet.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementApplet.java
index bf323969..99e7ca3c 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementApplet.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementApplet.java
@@ -16,8 +16,8 @@
  */
 package at.gv.egiz.bku.online.applet;
 
-import at.gv.egiz.bku.gui.AbstractHelpListener;
 import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.bku.gui.HelpListener;
 import at.gv.egiz.bku.gui.PINManagementGUI;
 import at.gv.egiz.bku.gui.PINManagementGUIFacade;
 import at.gv.egiz.bku.gui.SwitchFocusListener;
@@ -25,31 +25,29 @@ import at.gv.egiz.bku.gui.viewer.FontProvider;
 import java.awt.Container;
 import java.net.URL;
 import java.util.Locale;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
- *
+ * 
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class PINManagementApplet extends BKUApplet {
 
-  private static final long serialVersionUID = 1L;
-  private static Log log = LogFactory.getLog(PINManagementApplet.class);
+	private static final long serialVersionUID = 1L;
+	
+	@Override
+	protected BKUGUIFacade createGUI(Container contentPane, Locale locale,
+			BKUGUIFacade.Style guiStyle, URL backgroundImgURL,
+			FontProvider fontProvider, HelpListener helpListener,
+			SwitchFocusListener switchFocusListener) {
+		return new PINManagementGUI(contentPane, locale, guiStyle,
+				backgroundImgURL, fontProvider, helpListener,
+				switchFocusListener);
+	}
+
+	@Override
+	protected AppletBKUWorker createBKUWorker(BKUApplet applet, BKUGUIFacade gui) {
+		return new PINManagementBKUWorker(applet, (PINManagementGUIFacade) gui);
+	}
 
-  @Override
-  protected BKUGUIFacade createGUI(Container contentPane,
-          Locale locale,
-          BKUGUIFacade.Style guiStyle,
-          URL backgroundImgURL,
-          FontProvider fontProvider,
-          AbstractHelpListener helpListener,
-          SwitchFocusListener switchFocusListener) {
-    return new PINManagementGUI(contentPane, locale, guiStyle, backgroundImgURL, fontProvider, helpListener, switchFocusListener);
-  }
 
-  @Override
-  protected AppletBKUWorker createBKUWorker(BKUApplet applet, BKUGUIFacade gui) {
-    return new PINManagementBKUWorker(applet, (PINManagementGUIFacade) gui);
-  }
 }
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementBKUWorker.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementBKUWorker.java
index 5dedcedb..b9f31f42 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementBKUWorker.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementBKUWorker.java
@@ -22,15 +22,16 @@ import at.gv.egiz.bku.smccstal.PINManagementRequestHandler;
 import at.gv.egiz.stal.ErrorResponse;
 import at.gv.egiz.stal.InfoboxReadRequest;
 import at.gv.egiz.stal.QuitRequest;
-import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
 import at.gv.egiz.stal.SignRequest;
 import at.gv.egiz.stal.ext.PINManagementRequest;
 import at.gv.egiz.stal.ext.PINManagementResponse;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * This BKU Worker does not connect to STAL webservice
  * (no Internet connection permitted while activating PINs).
@@ -38,6 +39,8 @@ import java.util.List;
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class PINManagementBKUWorker extends AppletBKUWorker {
+  
+  private final Logger log = LoggerFactory.getLogger(PINManagementBKUWorker.class);
 
   public PINManagementBKUWorker(BKUApplet applet, PINManagementGUIFacade gui) {
     super(applet, gui);
@@ -59,9 +62,9 @@ public class PINManagementBKUWorker extends AppletBKUWorker {
       if (responses.size() == 1) {
         STALResponse response = responses.get(0);
         if (response instanceof PINManagementResponse) {
-          log.debug("PIN management dialog terminated");
+          log.debug("PIN management dialog terminated.");
         } else if (response instanceof ErrorResponse) {
-          log.debug("PIN management dialog terminated with error");
+          log.debug("PIN management dialog terminated with error.");
         } else {
           throw new RuntimeException("Invalid STAL response: " + response.getClass().getName());
         }