From d7a3b8fdb62c881afb87838f2bb03b4c4b58e16d Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 8 Oct 2008 15:59:43 +0000
Subject: simpleGUI (header,chipperling removed)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@87 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml                                  |  30 +-
 BKUApplet/src/test/resources/appletTest.html       |  29 ++
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 295 ++++++-----
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |  77 ++-
 BKULocalApp/pom.xml                                |   2 +-
 BKUOnline/src/main/webapp/appletPage.jsp           |  16 +-
 .../finanzonline/FinanzOnlineLogin/award.gif       | Bin 0 -> 8717 bytes
 .../finanzonline/FinanzOnlineLogin/bmf_01.gif      | Bin 0 -> 2479 bytes
 .../finanzonline/FinanzOnlineLogin/bmf_02.gif      | Bin 0 -> 5583 bytes
 .../finanzonline/FinanzOnlineLogin/browser.js      | 165 ++++++
 .../FinanzOnlineLogin/buergerkarte.gif             | Bin 0 -> 1219 bytes
 .../finanzonline/FinanzOnlineLogin/eps-logo.gif    | Bin 0 -> 4557 bytes
 .../finanzonline/FinanzOnlineLogin/epsa-award.jpg  | Bin 0 -> 24106 bytes
 .../webapp/finanzonline/FinanzOnlineLogin/fon.css  | 553 +++++++++++++++++++++
 .../finanzonline/FinanzOnlineLogin/index.css       | 101 ++++
 BKUOnline/src/main/webapp/finanzonline/iframe.html |  22 +
 BKUOnline/src/main/webapp/finanzonline/index.html  | 192 +++++++
 BKUOnline/src/main/webapp/index.html               |   2 +
 BKUOnline/src/test/resources/appletTest.html       |   2 +-
 19 files changed, 1279 insertions(+), 207 deletions(-)
 create mode 100644 BKUApplet/src/test/resources/appletTest.html
 create mode 100644 BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/award.gif
 create mode 100644 BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/bmf_01.gif
 create mode 100644 BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/bmf_02.gif
 create mode 100644 BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/browser.js
 create mode 100644 BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/buergerkarte.gif
 create mode 100644 BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/eps-logo.gif
 create mode 100644 BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/epsa-award.jpg
 create mode 100644 BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/fon.css
 create mode 100644 BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/index.css
 create mode 100644 BKUOnline/src/main/webapp/finanzonline/iframe.html
 create mode 100644 BKUOnline/src/main/webapp/finanzonline/index.html

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 35672e51..130749c5 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>
     <groupId>at.gv.egiz</groupId>
@@ -11,7 +10,6 @@
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
   <version>1.0-SNAPSHOT</version>
-  <description />
   <build>
     <plugins>
       <plugin>
@@ -81,6 +79,30 @@
           <verify>true</verify>
         </configuration>
       </plugin>
+      <plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copytestlibs</id>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>commons-logging</groupId>
+									<artifactId>commons-logging</artifactId>
+								</artifactItem>
+								<artifactItem>
+									<groupId>iaik</groupId>
+									<artifactId>iaik_jce_me4se</artifactId>
+								</artifactItem>
+							</artifactItems>
+							<outputDirectory>${project.build.directory}/test-libs</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
     </plugins>
   </build>
   <dependencies>
@@ -114,4 +136,4 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
new file mode 100644
index 00000000..3b944a40
--- /dev/null
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -0,0 +1,29 @@
+<!--
+  Copyright 2008 Federal Chancellery Austria and
+  Graz University of Technology
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<html>
+  <body>
+    <center>
+      <applet code="at.gv.egiz.bku.online.applet.BKUApplet.class"
+              archive="../BKUApplet-1.0-SNAPSHOT.jar, ../test-libs/commons-logging-1.1.1.jar , ../test-libs/iaik_jce_me4se-3.04.jar"
+              width=210 height=160>
+              <param name="WSDL_URL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/stal?wsdl"/>
+              <param name="SessionId" value="TestSession"/>
+              <param name="redirectURL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/bkuResult"/>
+      </applet>
+    </center>
+  </body>
+</html>
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java
index b09669b8..24cc2601 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java
@@ -40,11 +40,7 @@ import java.text.MessageFormat;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import java.util.StringTokenizer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.swing.GroupLayout;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JFileChooser;
@@ -56,7 +52,6 @@ import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.JTextArea;
 import javax.swing.LayoutStyle;
-import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
@@ -107,14 +102,14 @@ public class BKUGUI implements BKUGUIFacade {
     protected Container contentPane;
     protected ResourceBundle messages;
     /** left and right side main panels */
-    protected JPanel iconPanel;
+//    protected JPanel iconPanel;
     protected JPanel contentPanel;
     /** right side content panels and layouts */
-    protected JPanel headerPanel;
+//    protected JPanel headerPanel;
     protected JPanel mainPanel;
     protected JPanel buttonPanel;
     /** right side fixed labels  */
-    protected JLabel titleLabel;
+//    protected JLabel titleLabel;
     /** remember the pinfield to return to worker */
     protected JPasswordField pinField;
 
@@ -153,13 +148,21 @@ public class BKUGUI implements BKUGUIFacade {
                   
                   log.debug("initializing gui");
 
-                    initIconPanel();
+//                    initIconPanel();
                     initContentPanel();
 
                     GroupLayout layout = new GroupLayout(contentPane);
                     contentPane.setLayout(layout);
-                    layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(layout.createSequentialGroup().addComponent(iconPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(contentPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
-                    layout.setVerticalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(iconPanel, GroupLayout.Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(contentPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE));
+                    layout.setHorizontalGroup(layout.createSequentialGroup().addComponent(contentPanel));
+                    layout.setVerticalGroup(layout.createSequentialGroup().addComponent(contentPanel));
+//                    layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//                      .addGroup(layout.createSequentialGroup()
+//                        .addComponent(iconPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+//                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//                        .addComponent(contentPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
+//                    layout.setVerticalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//                      .addComponent(iconPanel, GroupLayout.Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+//                      .addComponent(contentPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE));
                 }
             });
         } catch (Exception ex) {
@@ -167,34 +170,30 @@ public class BKUGUI implements BKUGUIFacade {
         }
     }
 
-    protected void initIconPanel() {
-        iconPanel = new JPanel();
-        JLabel iconLabel = new JLabel();
-        iconLabel.setIcon(new ImageIcon(getClass().getResource(LOGO_RESOURCE))); // NOI18N
-
-        GroupLayout iconPanelLayout = new GroupLayout(iconPanel);
-        iconPanel.setLayout(iconPanelLayout);
-        iconPanelLayout.setHorizontalGroup(
-          iconPanelLayout.createSequentialGroup()
-//          iconPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//            .addGroup(iconPanelLayout.createSequentialGroup()
-                .addContainerGap()
-                .addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, iconLabel.getPreferredSize().width, GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)); //);
-        iconPanelLayout.setVerticalGroup(
-          iconPanelLayout.createSequentialGroup()
-//          iconPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//            .addGroup(iconPanelLayout.createSequentialGroup()
-                .addContainerGap()
-                .addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, iconLabel.getPreferredSize().height, GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)); //);
-    }
+//    protected void initIconPanel() {
+//        iconPanel = new JPanel();
+//        JLabel iconLabel = new JLabel();
+//        iconLabel.setIcon(new ImageIcon(getClass().getResource(LOGO_RESOURCE))); // NOI18N
+//
+//        GroupLayout iconPanelLayout = new GroupLayout(iconPanel);
+//        iconPanel.setLayout(iconPanelLayout);
+//        iconPanelLayout.setHorizontalGroup(
+//          iconPanelLayout.createSequentialGroup()
+//                .addContainerGap()
+//                .addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, iconLabel.getPreferredSize().width, GroupLayout.PREFERRED_SIZE)
+//                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)); //);
+//        iconPanelLayout.setVerticalGroup(
+//          iconPanelLayout.createSequentialGroup()
+//                .addContainerGap()
+//                .addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, iconLabel.getPreferredSize().height, GroupLayout.PREFERRED_SIZE)
+//                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)); //);
+//    }
 
     protected void initContentPanel() {
 
         contentPanel = new JPanel();
 
-        headerPanel = new JPanel();
+//        headerPanel = new JPanel();
         mainPanel = new JPanel();
         buttonPanel = new JPanel();
 
@@ -202,22 +201,9 @@ public class BKUGUI implements BKUGUIFacade {
 //        mainPanel.setBorder(new TitledBorder("main"));
 //        buttonPanel.setBorder(new TitledBorder("button"));
 
-        titleLabel = new JLabel();
-        titleLabel.setFont(titleLabel.getFont().deriveFont(titleLabel.getFont().getStyle() |
-          java.awt.Font.BOLD, titleLabel.getFont().getSize() + 2));
-//        titleLabel.setForeground(defaultForground);
-
-//        okButton = new JButton();
-//        okButton.setText(messages.getString(BUTTON_OK));
-//        cancelButton = new JButton();
-//        cancelButton.setText(messages.getString(BUTTON_CANCEL));
-//        signButton = new JButton();
-//        signButton.setText(messages.getString(BUTTON_SIGN));
-//        backButton = new JButton();
-//        backButton.setText(messages.getString(BUTTON_BACK));
-//        saveButton = new JButton();
-//        saveButton.setText(messages.getString(BUTTON_SAVE));
-//        contentPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
+//        titleLabel = new JLabel();
+//        titleLabel.setFont(titleLabel.getFont().deriveFont(titleLabel.getFont().getStyle() |
+//          java.awt.Font.BOLD, titleLabel.getFont().getSize() + 2));
         
         JButton b = new JButton();
         b.setText(messages.getString(BUTTON_CANCEL));
@@ -246,33 +232,38 @@ public class BKUGUI implements BKUGUIFacade {
 //            buttonSize = saveButton.getPreferredSize().width;
 
         
-        GroupLayout headerPanelLayout = new GroupLayout(headerPanel);
-        headerPanel.setLayout(headerPanelLayout);
-
-        headerPanelLayout.setHorizontalGroup(
-          headerPanelLayout.createSequentialGroup()
-//          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
-            .addContainerGap());
-        headerPanelLayout.setVerticalGroup(
-          headerPanelLayout.createSequentialGroup()
-//          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+//        GroupLayout headerPanelLayout = new GroupLayout(headerPanel);
+//        headerPanel.setLayout(headerPanelLayout);
+//
+//        headerPanelLayout.setHorizontalGroup(
+//          headerPanelLayout.createSequentialGroup()
+//            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
+//            .addContainerGap());
+//        headerPanelLayout.setVerticalGroup(
+//          headerPanelLayout.createSequentialGroup()
+//            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
 
-//        mainPanel.setPreferredSize(new Dimension(MAIN_PANEL_WIDTH, MAIN_PANEL_HEIGHT));
 
         GroupLayout contentPanelLayout = new GroupLayout(contentPanel);
         contentPanel.setLayout(contentPanelLayout);
+//        contentPanelLayout.setHorizontalGroup(
+//          contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//            .addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+//            .addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+//            .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)); //));
         contentPanelLayout.setHorizontalGroup(
-          contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-            .addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-            .addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-            .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)); //));
+          contentPanelLayout.createSequentialGroup()
+            .addContainerGap()
+            .addGroup(
+              contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                .addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+            .addContainerGap());
         contentPanelLayout.setVerticalGroup(
           contentPanelLayout.createSequentialGroup()
             .addContainerGap()
-            .addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//            .addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+//            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
             .addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 
             .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) //, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
             .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
@@ -294,8 +285,7 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-                titleLabel.setText(messages.getString(TITLE_ERROR));
-//                titleLabel.setForeground(defaultForground);
+//                titleLabel.setText(messages.getString(TITLE_ERROR));
 
                 JLabel waitMsgLabel = new JLabel();
                 waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -308,8 +298,7 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(waitMsgLabel)
-                  .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                  .addComponent(waitMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(waitMsgLabel));
@@ -334,12 +323,11 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-                titleLabel.setText(messages.getString(TITLE_WELCOME));
-//                titleLabel.setForeground(defaultForground);
+//                titleLabel.setText(messages.getString(TITLE_WELCOME));
 
-                JLabel waitMsgLabel = new JLabel();
-                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                waitMsgLabel.setText(messages.getString(MESSAGE_WAIT));
+                JLabel welcomeMsgLabel = new JLabel();
+                welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                welcomeMsgLabel.setText(messages.getString(TITLE_WELCOME)); //MESSAGE_WAIT));
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
@@ -347,12 +335,11 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(waitMsgLabel)
-                  .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                  .addComponent(welcomeMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(waitMsgLabel));
+                  .addComponent(welcomeMsgLabel));
 
                 contentPanel.validate();
 
@@ -375,8 +362,24 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-                titleLabel.setText(messages.getString(TITLE_INSERTCARD));
+//                titleLabel.setText(messages.getString(TITLE_INSERTCARD));
 
+                JLabel insertCardMsgLabel = new JLabel();
+                insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                insertCardMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(insertCardMsgLabel));
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(insertCardMsgLabel));
+                
                 JButton cancelButton = new JButton();
                 cancelButton.setText(messages.getString(BUTTON_CANCEL));
                 cancelButton.addActionListener(cancelListener);
@@ -391,8 +394,7 @@ public class BKUGUI implements BKUGUIFacade {
 //                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
 //                    .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
                         .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
-                        .addContainerGap()); //);
+                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
                 buttonPanelLayout.setVerticalGroup(
                   buttonPanelLayout.createSequentialGroup()
 //                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -403,6 +405,11 @@ public class BKUGUI implements BKUGUIFacade {
         });
     }
 
+    /**
+     * only difference to showInsertCard: title text: card not supported
+     * @param cancelListener
+     * @param cancelCommand
+     */
     @Override
     public void showCardNotSupportedDialog(final ActionListener cancelListener, final String cancelCommand) {
         
@@ -418,12 +425,11 @@ public class BKUGUI implements BKUGUIFacade {
               mainPanel.removeAll();
               buttonPanel.removeAll();
 
-                titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
-//                titleLabel.setForeground(defaultForground);
+//                titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
 
-                JLabel errorMsgLabel = new JLabel();
-                errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                errorMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
+                JLabel insertCardMsgLabel = new JLabel();
+                insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                insertCardMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
@@ -431,12 +437,11 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addComponent(errorMsgLabel)
-                    .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                    .addComponent(insertCardMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addComponent(errorMsgLabel));
+                    .addComponent(insertCardMsgLabel));
 
                 JButton cancelButton = new JButton();
                 cancelButton.setText(messages.getString(BUTTON_CANCEL));
@@ -452,8 +457,7 @@ public class BKUGUI implements BKUGUIFacade {
 //                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
 //                    .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
                         .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
-                        .addContainerGap()); //);
+                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
                 buttonPanelLayout.setVerticalGroup(
                   buttonPanelLayout.createSequentialGroup()
 //                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -478,12 +482,12 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-                if (numRetries < 0) {
-                    String cardpinTitle = messages.getString(TITLE_CARDPIN);
-                    titleLabel.setText(MessageFormat.format(cardpinTitle, new Object[]{pinSpec.getLocalizedName()}));
-                } else {
-                    titleLabel.setText(messages.getString(TITLE_RETRY));
-                }
+//                if (numRetries < 0) {
+//                    String cardpinTitle = messages.getString(TITLE_CARDPIN);
+//                    titleLabel.setText(MessageFormat.format(cardpinTitle, new Object[]{pinSpec.getLocalizedName()}));
+//                } else {
+//                    titleLabel.setText(messages.getString(TITLE_RETRY));
+//                }
 
                 JButton cancelButton = new JButton();
                 cancelButton.setText(messages.getString(BUTTON_CANCEL));
@@ -572,8 +576,7 @@ public class BKUGUI implements BKUGUIFacade {
                         .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
                             .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) //))
-                            .addComponent(infoLabel))
-                        .addContainerGap());
+                            .addComponent(infoLabel)));
 
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
@@ -595,8 +598,7 @@ public class BKUGUI implements BKUGUIFacade {
                         .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
-                        .addContainerGap());//);
+                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
                 buttonPanelLayout.setVerticalGroup(
                   buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
                         .addComponent(okButton)
@@ -643,11 +645,11 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-                if (numRetries < 0) {
-                    titleLabel.setText(messages.getString(TITLE_SIGN));
-                } else {
-                    titleLabel.setText(messages.getString(TITLE_RETRY));
-                }
+//                if (numRetries < 0) {
+//                    titleLabel.setText(messages.getString(TITLE_SIGN));
+//                } else {
+//                    titleLabel.setText(messages.getString(TITLE_RETRY));
+//                }
 
                 JButton cancelButton = new JButton();
                 cancelButton.setText(messages.getString(BUTTON_CANCEL));
@@ -712,16 +714,14 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                            .addComponent(hashDataLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                            .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
-                                .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
-                                    .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                    .addComponent(infoLabel))))
-                        .addContainerGap());
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(hashDataLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                      .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
+                          .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
+                              .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                              .addComponent(infoLabel))));
 
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
@@ -743,8 +743,7 @@ public class BKUGUI implements BKUGUIFacade {
                         .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .addComponent(signButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
-                        .addContainerGap());//);
+                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
                 buttonPanelLayout.setVerticalGroup(
                   buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
                         .addComponent(signButton)
@@ -814,8 +813,7 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-                titleLabel.setText(messages.getString(TITLE_ERROR));
-//                titleLabel.setForeground(defaultForground);
+//                titleLabel.setText(messages.getString(TITLE_ERROR));
 
                 String errorMsgPattern = messages.getString(errorMsgKey);
                 String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
@@ -831,8 +829,7 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(errorMsgLabel) //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
-                  .addContainerGap());
+                  .addComponent(errorMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -852,8 +849,7 @@ public class BKUGUI implements BKUGUIFacade {
 //                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
 //                    .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
                         .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
-                        .addContainerGap()); //);
+                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
                 buttonPanelLayout.setVerticalGroup(
                   buttonPanelLayout.createSequentialGroup()
 //                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -879,16 +875,15 @@ public class BKUGUI implements BKUGUIFacade {
           mainPanel.removeAll();
           buttonPanel.removeAll();
 
-          titleLabel.setText(messages.getString(TITLE_ERROR));
-//                titleLabel.setForeground(defaultForground);
+//          titleLabel.setText(messages.getString(TITLE_ERROR));
 
           String errorMsgPattern = messages.getString(errorMsgKey);
-                String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
-                
-                JLabel errorMsgLabel = new JLabel();
-                errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                errorMsgLabel.setText(errorMsg);
-                errorMsgLabel.setForeground(ERROR_COLOR);
+          String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
+
+          JLabel errorMsgLabel = new JLabel();
+          errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+          errorMsgLabel.setText(errorMsg);
+          errorMsgLabel.setForeground(ERROR_COLOR);
 
           GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
           mainPanel.setLayout(mainPanelLayout);
@@ -896,8 +891,7 @@ public class BKUGUI implements BKUGUIFacade {
           mainPanelLayout.setHorizontalGroup(
             mainPanelLayout.createSequentialGroup()
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-            .addComponent(errorMsgLabel)
-            .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+            .addComponent(errorMsgLabel));
           mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createSequentialGroup()
 //            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -923,7 +917,7 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-                titleLabel.setText(messages.getString(TITLE_WAIT));
+//                titleLabel.setText(messages.getString(TITLE_WAIT));
 
                 JLabel waitMsgLabel = new JLabel();
                 waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -939,8 +933,7 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(waitMsgLabel)
-                  .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                  .addComponent(waitMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -1020,7 +1013,7 @@ public class BKUGUI implements BKUGUIFacade {
           mainPanel.removeAll();
           buttonPanel.removeAll();
 
-          titleLabel.setText(messages.getString(TITLE_HASHDATA));
+//          titleLabel.setText(messages.getString(TITLE_HASHDATA));
 
           JLabel refIdLabel = new JLabel();
           refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -1042,11 +1035,9 @@ public class BKUGUI implements BKUGUIFacade {
           mainPanel.setLayout(mainPanelLayout);
 
           mainPanelLayout.setHorizontalGroup(
-            mainPanelLayout.createSequentialGroup()
-                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+             mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                       .addComponent(refIdLabel)
-                      .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE))
-                  .addContainerGap());
+                      .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
 
           mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createSequentialGroup()
@@ -1082,8 +1073,7 @@ public class BKUGUI implements BKUGUIFacade {
                   .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                   .addComponent(saveButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
                   .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                  .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
-                  .addContainerGap());
+                  .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
           buttonPanelLayout.setVerticalGroup(
             buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
                   .addComponent(saveButton)
@@ -1117,7 +1107,7 @@ public class BKUGUI implements BKUGUIFacade {
           mainPanel.removeAll();
           buttonPanel.removeAll();
 
-          titleLabel.setText(messages.getString(TITLE_HASHDATA));
+//          titleLabel.setText(messages.getString(TITLE_HASHDATA));
 
           JLabel refIdLabel = new JLabel();
           refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -1142,11 +1132,9 @@ public class BKUGUI implements BKUGUIFacade {
           mainPanel.setLayout(mainPanelLayout);
 
           mainPanelLayout.setHorizontalGroup(
-            mainPanelLayout.createSequentialGroup()
-                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                       .addComponent(refIdLabel)
-                      .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE)) // GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                  .addContainerGap());
+                      .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
 
           mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createSequentialGroup()
@@ -1228,8 +1216,7 @@ public class BKUGUI implements BKUGUIFacade {
                   .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                   .addComponent(saveButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
                   .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                  .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
-                  .addContainerGap());//);
+                  .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
           buttonPanelLayout.setVerticalGroup(
             buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
                   .addComponent(saveButton)
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
index 0641bf58..c366cb76 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
@@ -168,9 +168,9 @@ public class BKUGUIWorker implements Runnable {
         //
         List<HashDataInput> signedRefs = new ArrayList();
         signedRefs.add(signedRef1);
-                    signedRefs.add(signedRef2);
-                    signedRefs.add(signedRef3);
-                    signedRefs.add(signedRef4);
+//                    signedRefs.add(signedRef2);
+//                    signedRefs.add(signedRef3);
+//                    signedRefs.add(signedRef4);
 //                    signedRefs.add(signedRef4);
 //                    signedRefs.add(signedRef4);
 //                    signedRefs.add(signedRef4);
@@ -182,62 +182,61 @@ public class BKUGUIWorker implements Runnable {
 
 
 
-//        gui.showWelcomeDialog();
-//
-//        Thread.sleep(2000);
+        gui.showWelcomeDialog();
+
+        Thread.sleep(2000);
+        
+        gui.showWaitDialog(null);
+        
+        Thread.sleep(1000);
         
-//        gui.showWaitDialog(null);
-//        
-//        Thread.sleep(1000);
-//        
-//        gui.showWaitDialog("test");
-//        
-//        Thread.sleep(1000);
+        gui.showWaitDialog("test");
+        
+        Thread.sleep(1000);
           
 
-//            gui.showInsertCardDialog(cancelListener, "cancel");
-//
-//            Thread.sleep(2000);
-//            
-//            gui.showCardNotSupportedDialog(cancelListener, "cancel");
-//            
-//            Thread.sleep(2000);
+            gui.showInsertCardDialog(cancelListener, "cancel");
 
-//            PINSpec cardPinSpec = new PINSpec(4, 4, "[0-9]", "Karten-PIN");
-////            
-//            gui.showCardPINDialog(cardPinSpec, okListener, "ok", cancelListener, "cancel");
-//            
-//            Thread.sleep(2000);
-//
+            Thread.sleep(2000);
+            
+            gui.showCardNotSupportedDialog(cancelListener, "cancel");
+            
+            Thread.sleep(2000);
+
+            PINSpec cardPinSpec = new PINSpec(4, 4, "[0-9]", "Karten-PIN");
+            
+            gui.showCardPINDialog(cardPinSpec, okListener, "ok", cancelListener, "cancel");
+            
+            Thread.sleep(2000);
 
-//    gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
 
-//            Thread.sleep(2000);
+            Thread.sleep(4000);
 
-//            gui.showSignaturePINRetryDialog(signPinSpec, 2, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
-//
-//            Thread.sleep(2000);
-////            
-//            gui.showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, new Object[] {"Testfehler"}, null, null);
-//            
-//            Thread.sleep(2000);
-//            
+            gui.showSignaturePINRetryDialog(signPinSpec, 2, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+
+            Thread.sleep(2000);
+            
+            gui.showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, new Object[] {"Testfehler"}, null, null);
+            
+            Thread.sleep(2000);
               
             gui.showErrorDialog("error.test", new Object[] {"Testfehler", "noch ein TestFehler"}); 
 
             Thread.sleep(2000);
-//            
+            
             gui.showErrorDialog("error.no.hashdata", null); 
             
             Thread.sleep(2000);
-//          
+          
             gui.showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, new Object[] {"Testfehler"}); 
 
             Thread.sleep(2000);
-//          
+          
             gui.showErrorDialog("error.unknown", null); 
 
 
+//            gui.showTextPlainHashDataInput("hallo,\n welt!", "12345", null, "cancel", null, "save");
 //            gui.showTextPlainHashDataInput("hallo,\n welt!", "12345", null, "cancel", null, "save");
 //            Thread.sleep(2000);
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index 9ad6f50b..594f5af2 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -8,7 +8,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
-	<name />
+	<name>BKU Local App</name>
 	<version>1.0-SNAPSHOT</version>
 	<description />
 	<build>
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
index 5f208a2a..b9225e56 100644
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ b/BKUOnline/src/main/webapp/appletPage.jsp
@@ -19,12 +19,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MOCCA Appletpage</title>
-<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>MOCCA Appletpage</title>
+        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+  	<script type="text/javascript" src="js/deployJava.js"></script>
 </head>
 <body>
-<script src="./js/deployJava.js"></script>
 <script>
 	if (!deployJava.versionCheck('1.6.0_04+')) {
 		document
@@ -34,8 +34,8 @@
 			codebase :'applet',
 			code :'at.gv.egiz.bku.online.applet.BKUApplet.class',
 			archive :'BKUApplet-1.0-SNAPSHOT.jar, commons-logging-1.1.1.jar, iaik_jce_me4se-3.04.jar',
-			width :400,
-			height :200
+			width :190,
+			height :130
 		};
 		var parameters = {
 			WSDL_URL :'../stal?wsdl',
@@ -46,8 +46,8 @@
 		deployJava.runApplet(attributes, parameters, version);
 	}
 </script>
-<br />
+<!--br />
 <hr/>
-Powered by <img src="img/mocca-t_s.png" alt="mocca-logo" width="100">
+Powered by <img src="img/mocca-t_s.png" alt="mocca-logo" width="100"-->
 </body>
 </html>
diff --git a/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/award.gif b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/award.gif
new file mode 100644
index 00000000..8807fcf6
Binary files /dev/null and b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/award.gif differ
diff --git a/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/bmf_01.gif b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/bmf_01.gif
new file mode 100644
index 00000000..dd7697a4
Binary files /dev/null and b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/bmf_01.gif differ
diff --git a/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/bmf_02.gif b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/bmf_02.gif
new file mode 100644
index 00000000..961d511e
Binary files /dev/null and b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/bmf_02.gif differ
diff --git a/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/browser.js b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/browser.js
new file mode 100644
index 00000000..6fbf74f0
--- /dev/null
+++ b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/browser.js
@@ -0,0 +1,165 @@
+var BrowserDetect = {
+	init: function () {
+		this.browser = this.searchString(this.dataBrowser) || "An unknown browser";
+		this.version = this.searchVersion(navigator.userAgent)
+			|| this.searchVersion(navigator.appVersion)
+			|| "an unknown version";
+		this.OS = this.searchString(this.dataOS) || "an unknown OS";
+	},
+	searchString: function (data) {
+		for (var i=0;i<data.length;i++)	{
+			var dataString = data[i].string;
+			var dataProp = data[i].prop;
+			this.versionSearchString = data[i].versionSearch || data[i].identity;
+			if (dataString) {
+				if (dataString.indexOf(data[i].subString) != -1)
+					return data[i].identity;
+			}
+			else if (dataProp)
+				return data[i].identity;
+		}
+	},
+	searchVersion: function (dataString) {
+		var index = dataString.indexOf(this.versionSearchString);
+		if (index == -1) return;
+		return parseFloat(dataString.substring(index+this.versionSearchString.length+1));
+	},
+	dataBrowser: [
+		{ 	string: navigator.userAgent,
+			subString: "OmniWeb",
+			versionSearch: "OmniWeb/",
+			identity: "OmniWeb"
+		},
+		{
+			string: navigator.vendor,
+			subString: "Apple",
+			identity: "Safari"
+		},
+		{
+			prop: window.opera,
+			identity: "Opera"
+		},
+		{
+			string: navigator.vendor,
+			subString: "iCab",
+			identity: "iCab"
+		},
+		{
+			string: navigator.vendor,
+			subString: "KDE",
+			identity: "Konqueror"
+		},
+		{
+			string: navigator.userAgent,
+			subString: "Firefox",
+			identity: "Firefox"
+		},
+		{
+			string: navigator.vendor,
+			subString: "Camino",
+			identity: "Camino"
+		},
+		{		// for newer Netscapes (6+)
+			string: navigator.userAgent,
+			subString: "Netscape",
+			identity: "Netscape"
+		},
+		{
+			string: navigator.userAgent,
+			subString: "MSIE",
+			identity: "Explorer",
+			versionSearch: "MSIE"
+		},
+		{
+			string: navigator.userAgent,
+			subString: "Gecko",
+			identity: "Mozilla",
+			versionSearch: "rv"
+		},
+		{ 		// for older Netscapes (4-)
+			string: navigator.userAgent,
+			subString: "Mozilla",
+			identity: "Netscape",
+			versionSearch: "Mozilla"
+		}
+	],
+	dataOS : [
+		{
+			string: navigator.platform,
+			subString: "Win",
+			identity: "Windows"
+		},
+		{
+			string: navigator.platform,
+			subString: "Mac",
+			identity: "Mac"
+		},
+		{
+			string: navigator.platform,
+			subString: "Linux",
+			identity: "Linux"
+		}
+	]
+
+};
+BrowserDetect.init();
+function writeBrowser() {
+
+nok=false;
+			if(BrowserDetect.browser.toLowerCase() == "explorer") {
+			if(eval(BrowserDetect.version) < 6) {
+				nok=true;
+			} 
+		}
+		if(BrowserDetect.browser.toLowerCase() == "opera") {
+			if(eval(BrowserDetect.version) < 9) {
+				nok=true;
+			}
+		}	
+		if(BrowserDetect.browser.toLowerCase() == "firefox") {
+			if(eval(BrowserDetect.version) < 1.5) {
+				nok=true;
+			} 
+		}	
+
+ if (nok==true) {
+ 
+		document.write("<TABLE BORDER=0 CELLPADDING=0 WIDTH='100%'><TR><TD VALIGN=TOP WIDTH='85%' BGCOLOR='#003399'><TABLE id='erlaeut' BORDER=1"); 
+		document.write("CELLSPACING=5 CELLPADDING=2 WIDTH='100%' ><TR><TD WIDTH='100%' BGCOLOR='#FFFFFF'><FONT COLOR='#000000'>");
+		document.write("Sehr geehrter FinanzOnline-Teilnehmer!<p>Die Men&uuml;f&uuml;hrung in FinanzOnline wurde aus technischen Gr&uuml;nden ge&auml;ndert. Da Sie m&ouml;glicherweise eine veraltete und nicht mehr dem letzten Sicherheitsstandard entsprechende Version Ihres Webbrowsers verwenden, besteht ab diesem Zeitpunkt die M&ouml;glichkeit, dass das Men&uuml; in FinanzOnline nicht richtig angezeigt werden kann.</p><p>Wir empfehlen daher bereits heute auch zu Ihrer Sicherheit, ein Update auf die aktuell g&uuml;ltige Browserversion durchzuf&uuml;hren. Die unterst&uuml;tzten Webbrowser finden Sie auf der <a href='https://www.bmf.gv.at/EGovernment/FINANZOnline/Browsereinstellungen/_start.htm' target='_blank'>BMF-Homepage unter 'E-Government'/'FinanzOnline'/'Browsereinstellungen'</a>.</p>");
+		
+		
+/*		document.write("Verwendeter Browser: " + BrowserDetect.browser + " " + BrowserDetect.version + " / " + BrowserDetect.OS);
+		if(BrowserDetect.browser.toLowerCase() == "explorer") {
+			if(eval(BrowserDetect.version) < 6) {
+				document.write("<font color='red'> *** nicht supported ***</font>");
+			} else {
+				//document.write("<font color='green'> *** supported ***</font>");
+			}
+		}
+		if(BrowserDetect.browser.toLowerCase() == "opera") {
+			if(eval(BrowserDetect.version) < 9) {
+				document.write("<font color='red'> *** nicht supported ***</font>");
+			} else {
+				//document.write("<font color='green'> *** supported ***</font>");
+			}
+		}	
+		if(BrowserDetect.browser.toLowerCase() == "firefox") {
+			if(eval(BrowserDetect.version) < 1.5) {
+				document.write("<font color='red'> *** nicht supported ***</font>");
+			} else {
+				//document.write("<font color='green'> *** supported ***</font>");
+			}
+		}	
+//		document.write("<br><br>Vorschlag für unterstütze Browser:<br>");
+//		document.write("<ul><li>Internet Explorer 6, PC</li>");
+//		document.write("<li>Internet Explorer 7, PC</li>");
+//		document.write("<li>Firefox (>= 1.5), PC + Mac + Linux</li>");
+//		document.write("<li>Safari (>= 1.3+), Mac (<- WIE TESTEN??)</li>");
+//		document.write("<li>Opera (>= 9), PC + Mac + Linux</li>");
+//		document.write("</ul>");
+*/
+		document.write("</FONT></TD></TR></TABLE></TD></TR><TR><TD WIDTH='85%'>&nbsp;</TD></TR></TABLE>");
+		
+ }		
+}
\ No newline at end of file
diff --git a/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/buergerkarte.gif b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/buergerkarte.gif
new file mode 100644
index 00000000..99d5f37e
Binary files /dev/null and b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/buergerkarte.gif differ
diff --git a/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/eps-logo.gif b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/eps-logo.gif
new file mode 100644
index 00000000..6f4ee65c
Binary files /dev/null and b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/eps-logo.gif differ
diff --git a/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/epsa-award.jpg b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/epsa-award.jpg
new file mode 100644
index 00000000..0e68626d
Binary files /dev/null and b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/epsa-award.jpg differ
diff --git a/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/fon.css b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/fon.css
new file mode 100644
index 00000000..f9b7b229
--- /dev/null
+++ b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/fon.css
@@ -0,0 +1,553 @@
+BODY {
+	margin-left : 0px;
+	margin-right : 0px;
+	margin-top : 0px;
+	color : black;
+	background-color : #E8F4FE;
+	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif, sans-serif;
+	font-size:13px;
+	font-weight: normal;
+}
+table.user {
+	background-color: #D6E6F9;
+	width: 100%;
+	font-family:Verdana,Arial,Helv;
+	font-size:13px;
+}
+
+.BUT { 
+   HEIGHT: 20px;   
+   BORDER:1px solid #000000;
+   TEXT-DECORATION:none;
+   BACKGROUND-IMAGE:url(../graphics/butback.gif);
+}
+
+A {
+	color : #000000;
+}
+
+
+TH.label {
+	padding: 10px;
+	margin-left: 10px;
+	font-size: 13px;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	color: #D6E6F9;
+	background-color: #006699;
+	vertical-align: top
+}
+
+TH.label_hell {
+	padding : 5px;
+	margin-left : 10px;
+	font-size : 13px;
+	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-weight : bold;
+	color : #000000;
+    background-color : #D6E6F9;
+  	vertical-align : top;
+  	text-align : left;
+}
+TD.input {
+	padding : 5px;
+	margin-left : 10px;
+	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+	color : #000000;
+    background-color : #D6E6F9;
+   	vertical-align : middle;
+   	text-align : right;
+   	font-size: 13px;
+}
+
+TD.input_links {
+	padding: 5px;
+	margin-left: 10px;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	color: #000000;
+	background-color: #D6E6F9;
+	vertical-align: bottom;
+	text-align: left;
+	font-size: 13px;
+}
+
+TD.input_center {
+	padding: 5px;
+	margin-left: 10px;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	color: #000000;
+	background-color: #D6E6F9;
+	vertical-align: bottom;
+	text-align: center;
+	font-size: 13px;
+}
+
+TD.input_mitte {
+    padding : 5px;
+    margin-left : 10px;
+    font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+    color : #000000;
+    background-color : #D6E6F9;
+    vertical-align : middle;
+    text-align : left;
+    font-size: 13px;
+}
+
+TD.spacer {
+	padding : 5px;
+	margin-left : 10px;
+    background-color : #D6E6F9;
+   	vertical-align : top;
+   	font-size: 50%;
+}
+TD.erlaeut2 {
+	padding : 5px;
+	margin-left : 5px;
+	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+	color : #000000;
+    background-color : #D6E6F9;
+   	vertical-align : top;
+   	font-size: 13px;
+}
+TD.erlaeut {
+	padding : 5px;
+	margin-left : 10px;
+	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+	color : #000000;
+    background-color : #D6E6F9;
+   	vertical-align : top;
+   	font-size: 13px;
+}
+TD.erlaeut_white {
+	margin-left : 10px;
+	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+	color : #000000;
+    background-color :  #D6E5F8;
+   	vertical-align : top;
+   	font-size: 13px;
+}
+TD.login {
+	padding : 5px;
+	margin-left : 10px;
+	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+	color : #000000;
+   	vertical-align : top;
+   	font-size: 13px;
+}
+.tabcap {
+	margin-left : 10px;
+	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-weight : bold;
+	color : #D6E6F9;
+	background-color : #6699CC;
+	font-size : 13px;
+	font-weight : bold;
+	padding : 5px;
+	padding-top:1px; 
+	padding-bottom:1px;
+}
+
+INPUT {
+	font-family : Verdana,Arial,Helv;
+	font-size : 8pt;
+	color : #000000;
+}
+
+TD.erlaeut_fett {
+	padding : 5px;
+	margin-left : 10px;
+	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+	color : #000000;
+	background-color : #D6E6F9;
+    vertical-align : top;
+    font-size : 13px;
+	font-weight : bold;
+}
+
+
+TABLE.normal {
+	width : 100%;
+}
+CAPTION.cap {
+	width : 100%;
+	padding : 10px;
+	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+	color : black;
+    background-color : #E8FDFD;
+	font-size : 11pt;
+	font-weight : bold;
+}
+
+H1{
+  color : #D6E6F9;
+  text-align : center;
+  border-left-color: #996666;
+  padding-top: 0px;
+  padding-right: 0px;
+  padding-bottom: 0px;
+  padding-left: 10px;
+  ;
+  border-style: solid;
+  border-top-width: 0px;
+  border-right-width: 0px;
+  border-bottom-width: 0px;
+  border-left-width : 0px;
+  background-color : #006699;
+}
+H2{
+  color : #006699;
+  text-align : center;
+  font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+  padding-top: 0px;
+  padding-right: 0px;
+  padding-bottom: 0px;
+  padding-left: 10px;
+  font-size : 25px;
+}
+H3{
+  color : #006699;;
+  text-align : center;
+  border-left-color: #996666;
+  padding-top: 0px;
+  padding-right: 0px;
+  padding-bottom: 0px;
+  padding-left: 10px;
+  border-style: solid;
+  border-top-width: 0px;
+  border-right-width: 0px;
+  border-bottom-width: 0px;
+  border-left-width : 0px;
+}
+H3.info_center{
+  color : #006699;
+  text-align : center;
+  padding-top: 0px;
+  padding-right: 0px;
+  padding-bottom: 0px;
+  padding-left: 10px;
+  border-style: solid;
+  border-top-width: 0px;
+  border-right-width: 0px;
+  border-bottom-width: 0px;
+  border-left-width : 0px;
+}
+.inv{
+  color : #D6E6F9;
+  text-align : left;
+  background-color : #006699;
+  font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+  font-size : 13px;
+  width: 100%;
+}
+.inv2{
+  color : #D6E6F9;
+  text-align : left;
+  background-color : #006699;
+  font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+  font-size : 13px;
+  width: 100%;
+  font-weight: bold; 
+}
+H4{
+  color : #006699;
+  text-align : center;
+  border-left-color: #996666;
+  padding-top: 0px;
+  padding-right: 0px;
+  padding-bottom: 0px;
+  padding-left: 10px;
+  border-style: solid;
+  border-top-width: 0px;
+  border-right-width: 0px;
+  border-bottom-width: 0px;
+  border-left-width : 0px;
+}
+H5{
+  color : #006699;
+  text-align : center;
+  border-left-color: #996666;
+  padding-top: 0px;
+  padding-right: 0px;
+  padding-bottom: 0px;
+  padding-left: 10px;
+  border-style: solid;
+  border-top-width: 0px;
+  border-right-width: 0px;
+  border-bottom-width: 0px;
+  border-left-width : 0px;
+}
+
+HR{
+  height: 3px;
+}
+#erlauet{
+  color : #006699;
+  text-align : left;
+  border-left-color: #996666;
+  padding: 5px 5px 5px 5px;
+
+}
+#darkblock{
+  background-color : #99CCFF;
+  text-align : left;
+  padding : 5px 5px 5px 5px;
+font-size : 13px;
+}
+#lightblock{
+  background-color : #D6E6F9;
+  text-align : left;
+  padding : 5px 5px 5px 5px;
+font-size : 13px;
+}
+.versiontext { 
+	font-family: Verdana, Arial, Helvetica, sans-serif; 
+	font-size: 6pt; 
+	color: #6b6b6b;
+    font-style: normal;
+    text-decoration: none;
+    text-align: right;
+    padding-right : 5px;
+}
+.navitext { 
+	font-family: Verdana, Arial, Helvetica, sans-serif; 
+	font-size: 7pt; 
+	font-weight: bold; 
+	color: #000000;
+    font-style: normal;
+    text-decoration: underline;
+}
+.navitext:hover { 
+	font-family: Verdana, Arial, Helvetica, sans-serif; 
+	font-size: 7pt; 
+	font-weight: bold; 
+	color: black;
+    font-style: normal;
+    text-decoration: underline;  
+}
+a.pagelinks { 
+	font-family: Verdana, Arial, Helvetica, sans-serif; 
+	font-size: 9pt; 
+	color: #000000;
+}
+a.pagelinks:hover {
+	color: gray;
+}
+
+a.menulinks { 
+	font-family: Verdana, Arial, Helvetica, sans-serif; 
+	font-size: 10pt; 
+	font-weight: normal; 
+	color: #000000;
+    font-style: normal;
+    text-decoration: underline;            
+}
+a.menulinks:hover { 
+    text-decoration: underline;              
+}
+.link_dbx
+{  
+    font-family: Verdana, Arial, Helvetica, sans-serif; 
+    font-weight: normal;  
+    text-decoration: underline;
+	color: #000000;
+}
+.link_dbx:hover 
+{  
+    color: #000000; 
+    text-decoration: underline;
+}	
+.link_nav
+{  
+    font-family: Verdana, Arial, Helvetica, sans-serif; 
+    font-weight: normal; 
+    text-decoration: underline;
+	color: #000000;
+}
+
+.link_nav:hover 
+{  
+    color : gray;
+    text-decoration: underline;
+}
+
+.link
+{  
+    font-family: Verdana, Arial, Helvetica, sans-serif; 
+    font-weight: bold; 
+    text-decoration: underline;
+	color: #D6E5F8;
+}
+
+.link:hover 
+{  
+    color: white; 
+}
+
+.link_fett
+{  
+    font-family: Verdana, Arial, Helvetica, sans-serif; 
+    font-weight: bold; 
+    text-decoration: underline;
+	color: #D6E5F8;
+}
+.link_fett:hover 
+{  
+    color: #000000; 
+    text-decoration: underline;
+}
+.header { font-family:Verdana,Arial,Helv; font-size:12px; margin-left:5px; font-weight:bold; text-decoration:none; color:#D6E5F8;}
+
+/* Definitionen für die Meldungen (hostmeld.inc) */
+.meld {
+background-color: white;
+color : black;
+padding: 5px;
+margin: 2px;
+margin-bottom: 10px;
+border: 6px solid;
+}
+.ok {
+border-color: #199919;
+}
+.fehler {
+border-color: #ff4c4c;
+}
+.hinweis {
+border-color: #003399;
+}
+.fehlerfeld {
+color: red;
+font-weight: bolder;
+}
+
+#tabheader {
+	color : #D6E6F9;
+	background-color : #6699CC;
+	font-size : 13px;
+	font-weight : bold;
+	padding : 5px;
+	padding-top:1px; 
+	padding-bottom:1px;		
+}
+#tab {
+	background-color : #D6E6F9;
+	margin-top: 2px;
+	padding : 5px;
+}
+
+
+/* ================================================================ 
+This copyright notice must be untouched at all times.
+
+The original version of this stylesheet and the associated (x)html
+is available at http://www.cssplay.co.uk/menus/simple_vertical.html
+Copyright (c) 2005-2007 Stu Nicholls. All rights reserved.
+This stylesheet and the associated (x)html may be modified in any 
+way to fit your requirements.
+=================================================================== */
+
+/* Add a margin - for this demo only - and a relative position with a high z-index to make it appear over any element below */
+#menu_container {width:100%; height:22px; z-index:100; background-color: #cccccc;}
+
+/* Get rid of the margin, padding and bullets in the unordered lists */
+#pmenu, #pmenu ul {padding:0; margin:0; list-style-type: none;}
+
+/* Set up the link size, color and borders */
+#pmenu a, #pmenu a:visited {display:block; font-size:10pt; color:#000000; text-decoration:none; text-indent:5px;
+							border:1px solid; border-width:1px 0 1px 1px;  border-bottom-color: gray; border-top-color: white; 
+							border-left-color: white; border-right-color: gray;
+							min-height:20px;
+							line-height:20px;
+							height:20px;
+  							height:auto !important;
+						   }
+
+/* Breitenangaben mit child selector: funkt nicht mit IE < 7. */
+#pmenu > li > ul a {width:170px;} /* LVL 1 Diese Selektion haut im IE6 nicht hin */
+#pmenu > li > ul > li > ul a {width:200px;} /* LVL 2 Diese Selektion haut im IE6 nicht hin */
+/* Breitenangaben ohne child selector: für IE6 */
+#pmenu * a { width:100px; }
+#pmenu * * a { width:200px; }
+
+/* Set up the sub level borders */
+#pmenu li ul li a, #pmenu li ul li a:visited {border-width:0 1px 1px 1px;}
+#pmenu li a.enclose, #pmenu li a.enclose:visited {border-width:1px;}
+
+/* Set up the list items */
+#pmenu li {float:left; background:#cccccc;} /* orig: #7484ad;*/
+
+/* For Non-IE browsers and IE7 */
+#pmenu li:hover {position:relative;}
+/* Make the hovered list color persist */
+#pmenu li:hover > a {background:#006699; color:#ffffff;} /* orig: #dfd7ca;*/
+/* Set up the sublevel lists with a position absolute for flyouts and overrun padding. The transparent gif is for IE to work */
+#pmenu li ul {display:none;}
+/* For Non-IE and IE7 make the sublevels visible on list hover. This is all it needs */
+#pmenu li:hover > ul {display:block; position:absolute; top:-11px; left:80px; padding:10px 30px 30px 30px; background:transparent url('../graphics/transparent.gif'); width:120px;}
+/* Position the first sub level beneath the top level liinks */
+#pmenu > li:hover > ul {left:-30px; top:12px;}
+
+/* get rid of the table */
+#pmenu table {position:absolute; border-collapse:collapse; top:0; left:0; z-index:100; font-size:1em;}
+
+/* For IE5.5 and IE6 give the hovered links a position relative and a change of background and foreground color. This is needed to trigger IE to show the sub levels */
+* html #pmenu li a:hover {position:relative; background:#006699; color:#ffffff;} /* IE6: aktiv wenn Link hoovert */
+
+/* For accessibility of the top level menu when tabbing */
+#pmenu li a:active, #pmenu li a:focus {background:#006699; color:#ffffff;} /* IE6: aktiv wenn Link hoovert */
+
+/* Set up the pointers for the sub level indication */
+#pmenu li.fly {background:#cccccc url('../graphics/fly.gif') no-repeat right center;}  /* orig: #7484ad;*/
+#pmenu li.drop {background:#cccccc url('../graphics/drop.gif') no-repeat right center;}  /* orig: #7484ad;*/
+
+
+/* This lot is for IE5.5 and IE6 ONLY and is necessary to make the sublevels appear */
+
+/* change the drop down levels from display:none; to visibility:hidden; */
+* html #pmenu li ul {   visibility:hidden; display:block; position:absolute; top:-11px; left:80px; padding:10px 30px 30px 30px; background:transparent url('../graphics/transparent.gif');}
+
+/* keep the third level+ hidden when you hover on first level link */
+#pmenu li a:hover ul ul{
+visibility:hidden;
+}
+/* keep the fourth level+ hidden when you hover on second level link */
+#pmenu li a:hover ul a:hover ul ul{
+visibility:hidden;
+}
+/* keep the fifth level hidden when you hover on third level link */
+#pmenu li a:hover ul a:hover ul a:hover ul ul{
+visibility:hidden;
+}
+/* keep the sixth level hidden when you hover on fourth level link */
+#pmenu li a:hover ul a:hover ul a:hover ul a:hover ul ul {
+visibility:hidden;
+}
+
+/* make the second level visible when hover on first level link and position it */
+#pmenu li a:hover ul {
+visibility:visible; left:-30px; top:14px; lef\t:-31px; to\p:15px;
+}
+
+/* make the third level visible when you hover over second level link and position it and all further levels */
+#pmenu li a:hover ul a:hover ul{ 
+visibility:visible; top:-11px; left:80px;
+}
+/* make the fourth level visible when you hover over third level link */
+#pmenu li a:hover ul a:hover ul a:hover ul { 
+visibility:visible;
+}
+/* make the fifth level visible when you hover over fourth level link */
+#pmenu li a:hover ul a:hover ul a:hover ul a:hover ul { 
+visibility:visible;
+}
+/* make the sixth level visible when you hover over fifth level link */
+#pmenu li a:hover ul a:hover ul a:hover ul a:hover ul a:hover ul { 
+visibility:visible;
+}
+/* If you can see the pattern in the above IE5.5 and IE6 style then you can add as many sub levels as you like */
+
+@media print {
+  #menu_container, #hd, #np {display: none;}
+  #div_teiln {min-width: 20%;}
+  h1, h2, h3, h4, h5 {color: black;}
+}
diff --git a/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/index.css b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/index.css
new file mode 100644
index 00000000..2b7cee82
--- /dev/null
+++ b/BKUOnline/src/main/webapp/finanzonline/FinanzOnlineLogin/index.css
@@ -0,0 +1,101 @@
+	#leftcontent {
+		position: absolute;
+		left:10px;
+		top:120px;
+		width:210px;
+		border:0px solid #000;
+	}
+	#centercontent {
+   		margin-left: 229px;
+   		margin-right:229px;
+   		margin-top: -2px;
+		/*
+		IE5x PC mis-implements the box model. Because of that we sometimes have
+		to perform a little CSS trickery to get pixel-perfect display across browsers.
+		The following bit of code was proposed by Tantek Celik, and it preys upon a CSS
+		parsing bug in IE5x PC that will prematurly close a style rule when it runs
+		into the string "\"}\"". After that string appears in a rule, then, we can override
+		previously set attribute values and only browsers without the parse bug will
+		recognize the new values. So any of the name-value pairs above this comment
+		that we need to override for browsers with correct box-model implementations
+		will be listed below.
+		
+		We use the voice-family property because it is likely to be used very infrequently,
+		and where it is used it will be set on the body tag. So the second voice-family value 
+		of "inherit" will override our bogus "\"}\"" value and allow the proper value to
+		cascade down from the body tag.
+
+		The style rule immediately following this rule offers another chance for CSS2
+		aware browsers to pick up the values meant for correct box-model implementations.
+		It uses a CSS2 selector that will be ignored by IE5x PC.
+		
+		Read more at http://www.glish.com/css/hacks.asp
+		
+		
+		voice-family: "\"}\"";
+		voice-family: inherit;
+   		margin-left: 201px;
+   		margin-right:201px;*/
+	}
+	html>body #centercontent {
+   		margin-left: 231px;
+   		margin-right:231px;
+	}
+	#rightcontent {
+		position: absolute;
+		right:10px;
+		top:120px;
+		width:210px;
+	}
+	#banner {
+		height:120px;
+	}
+	html>body #banner {
+		height:120px;
+	}
+	#rightcontent p {
+		font-size:10px
+	}
+	#tabheader {
+		color : #D6E6F9;
+		background-color : #6699CC;
+		font-size : 13px;
+		font-weight : bold;
+		padding : 5px;
+		padding-top:1px; 
+		padding-bottom:1px;		
+	}
+	#tab {
+		background-color : #D6E6F9;
+		margin-top: 2px;
+		padding : 5px;
+	}	
+	#navlist {
+		padding: 0px;
+		margin: 0px;
+		width: 100%;
+		background-color: #6699cc;
+	}
+	#navlist li {
+		list-style: none;
+		margin: 0;
+		padding: 0.25em;
+		padding-top: 0.3em;
+		padding-bottom: 0.3em;
+		border-bottom: 1px solid white;
+	}
+	a.nb { 
+		font-family:Verdana,Arial,Helv; 
+		font-size:12px; 
+		margin-left:5px; 
+		font-weight:bold; 
+		text-decoration:underline; 
+		color:#D6E6F9;
+	}
+	a.nb:hover {
+		color:white;
+	}
+	
+	@media print {
+   		#rightcontent {display: none;}
+	}
diff --git a/BKUOnline/src/main/webapp/finanzonline/iframe.html b/BKUOnline/src/main/webapp/finanzonline/iframe.html
new file mode 100644
index 00000000..ac2f6c93
--- /dev/null
+++ b/BKUOnline/src/main/webapp/finanzonline/iframe.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title>bkuiframe</title>
+    <link rel="stylesheet" type="text/css" href="FinanzOnlineLogin/fon.css">
+    <link rel="stylesheet" type="text/css" href="FinanzOnlineLogin/index.css">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  </head>
+  <body>
+    <div id="tab" align="center">
+      <img src="FinanzOnlineLogin/buergerkarte.gif" alt="Logo" onMouseOver="document.slform.submit();">
+      </img>
+      <FORM action="https://moa.brz.gv.at:443/moa-id-auth/StartAuthentication?Target=SA&OA=https://moa.brz.gv.at/finon-prod/fon/buergerkartenlogin&Template=http://moa.brz.gv.at/oa/MOAFinanzOnlineAuthentication.htm" method="POST" name="slform">
+        <input type="hidden" name="show" value="false">
+        <input type="hidden" name="bkuURI" value="https://127.0.0.1:3496/BKUOnline-1.0-SNAPSHOT/https-security-layer-request">
+      </FORM>
+    </div>
+    <div id="tab">
+      <a href="https://finanzonline.bmf.gv.at/fon/html/BK_Info.htm" class="link_nav" target="_parent">Informationen zur Bürgerkarte</a>
+    </div>
+  </body>
+</html>
diff --git a/BKUOnline/src/main/webapp/finanzonline/index.html b/BKUOnline/src/main/webapp/finanzonline/index.html
new file mode 100644
index 00000000..d47e8e63
--- /dev/null
+++ b/BKUOnline/src/main/webapp/finanzonline/index.html
@@ -0,0 +1,192 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <title>FinanzOnline Login</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta http-equiv="Content-Style-Type" content="text/css">
+    
+    <link rel="stylesheet" type="text/css" href="FinanzOnlineLogin/fon.css">
+    <link rel="stylesheet" type="text/css" href="FinanzOnlineLogin/index.css">
+    
+    <script src="FinanzOnlineLogin/browser.js" language="javascript" type="text/javascript"></script>
+  </head>
+  
+  <body onload="document.LoginForm.TID.focus();">
+
+    <div id="banner"> 
+      <div id="hd" style="background-color: white; height: 80px;">
+        <img name="FON-Logo" alt="FON-Logo" style="float: left;" src="FinanzOnlineLogin/bmf_01.gif">
+        <img name="BMF-Logo" alt="BMF-Logo" style="float: right;" src="FinanzOnlineLogin/bmf_02.gif">
+      </div>
+    </div>
+    
+    <div id="leftcontent">
+      <div id="tabheader">Login mit Bürgerkarte</div>
+      <div id="bk">
+        <iframe src="./iframe.html" name="moccaframe" width="210px" frameborder="0">
+          Ihr Browser unterstützt leider keine eingebetteten frames.
+        </iframe>
+      </div>
+      <div id="navlist" style="margin-top: 20px;">
+        <ul id="navlist">
+          <li><a href="http://www.bmf.gv.at/EGovernment/FINANZOnline/_start.htm" class="nb">Ãœber FinanzOnline</a></li>
+          <li><a href="https://www.bmf.gv.at/EGovernment/FINANZOnline/Einstiegsinformation/_start.htm" class="nb">Erster Einstieg</a></li>
+          <li><a href="https://www.bmf.gv.at/EGovernment/FINANZOnline/Sicherheit/_start.htm" class="nb">Sicherheit</a></li>
+          <li><a href="https://finanzonline.bmf.gv.at/fon/HilfeDispatcher?TARGET=hilfeframesetNeu&amp;NAMESITE=INFO&amp;MENUSITE=Hauptmen%FC&amp;JAHR=&amp;" class="nb">Hilfe</a></li>
+          <li><a href="http://www.bmf.gv.at/EGovernment/FINANZOnline/HufiggestellteFragenFAQ/_start.htm" class="nb">FAQ</a></li>
+          <li><a href="https://www.bmf.gv.at/EGovernment/FINANZOnline/Hotline/_start.htm" class="nb">Hotline</a></li>
+        </ul>
+      </div>
+    </div>
+    
+    <div id="content">
+      
+      <div id="centercontent">
+        
+        <script type="text/javascript">
+          if(!navigator.cookieEnabled) {
+            var str = "<TABLE BORDER=0 CELLPADDING=0 WIDTH='100%'><TR><TD VALIGN=TOP WIDTH='85%' BGCOLOR='#003399'>"+
+              "<TABLE BORDER CELLSPACING=5 CELLPADDING=2 WIDTH='100%'><TR><TD WIDTH='100%' BGCOLOR='#FFFFFF'><FONT COLOR='#000000'>"+
+              "Bitte beachten Sie, dass von Ihrem Internet-Browser Cookies akzeptiert werden müssen (siehe 'Erstinformation/Browserkonfiguration')."+   
+              "</FONT></TD></TR></TABLE></TD></TR><TR><TD WIDTH='85%'>&nbsp;</TD></TR></TABLE>";
+            document.write(str);
+          }
+        </script>       
+        
+        <table title="Login" border="0" width="100%">
+          <tbody>
+            <tr>
+              <td class="tabcap" colspan="2">Login mit Zugangskennungen</td>
+            </tr>
+            <tr>
+              <td class="erlaeut" width="38%">
+                
+              <label for="TID"><b>Teilnehmer-Identifikation:</b></label></td>
+              <td class="input_links">
+                <form action="/fon/login?" name="LoginForm" method="post"> 
+                  <input size="20" maxlength="12" name="TID" class="inputArea" id="TID" value="" type="text">
+              </form></td>
+            </tr>
+            <tr>
+              <td class="erlaeut">
+                
+              <label for="BENID"><b>Benutzer-Identifikation:</b></label></td>
+              <td class="input_links">
+                <input size="20" maxlength="12" name="BENID" id="BENID" value="" type="password">
+              </td>
+            </tr>
+            <tr>
+              <td class="erlaeut">
+                
+              <label for="PIN"><b>PIN:</b></label></td>
+              <td class="input_links">
+                <input size="20" maxlength="12" name="PIN" id="PIN" value="" type="password">
+              </td>
+            </tr>
+            
+            <tr>
+              <td class="erlaeut" colspan="2" align="center">
+                <input name="BROWSER" value="Firefox 3" type="hidden">
+                <script type="text/javascript">
+                  document.LoginForm.BROWSER.value=BrowserDetect.browser+' '+BrowserDetect.version;
+                </script>
+                <input name="RES" value="1600x1200" type="hidden">
+                <input name="JS" value="J" type="hidden">
+                <input name="LOGINF" value="IN" type="hidden">
+                <input name="S1" value="  Login  " type="submit">
+              </td>
+            </tr>
+            
+            <tr>
+              <td class="erlaeut">
+                <a href="https://finanzonline.bmf.gv.at/fon/Dispatcher?TARGET=Anmeld_online&amp;" class="link_nav">
+                Online-Erstanmeldung</a>
+              </td>
+              <td class="erlaeut">
+                Erstanmeldung zu FinanzOnline für Nicht-Unternehmer (nur für Login mit Zugangskennungen nötig)
+              </td>
+            </tr>
+            <tr>
+              <td class="erlaeut">
+                <a href="https://finanzonline.bmf.gv.at/fon/Dispatcher?TARGET=ruecksetz_online1&amp;" class="link_nav">PIN vergessen / gesperrt</a>
+              </td>
+              <td class="erlaeut">
+                Online-Rücksetzen auf Start-PIN für Nicht-Unternehmer
+              </td>
+            </tr>	
+            
+          </tbody>
+        </table> 
+        
+        
+        
+        <table width="100%">
+          <tbody><tr>
+              <td class="tabcap" colspan="2">Service</td>
+            </tr>
+            
+            <tr>
+              <td class="erlaeut" width="30%">
+                <a href="https://finanzonline.bmf.gv.at/fon/Dispatcher?TARGET=auswahl_antrag_index&amp;" class="link_nav">Anonyme Steuerberechnung</a>
+              </td>
+              <td class="erlaeut">
+                Berechnung der Steuer ohne Anmeldung
+              </td>		
+            </tr>	
+            
+            <tr>
+              <td class="erlaeut">
+                <a href="https://finanzonline.bmf.gv.at/fon/Dispatcher?TARGET=demo&amp;" target="_new" class="link_nav">
+                  DEMO Arbeitnehmerveranlagung
+                </a>
+              </td>
+              <td class="erlaeut">
+                Animierte Anleitung zur Arbeitnehmerveranlagung
+              </td>		
+            </tr>	
+            <tr>
+              <td class="erlaeut">
+                <a href="https://finanzonline.bmf.gv.at/fon/Dispatcher?TARGET=ratgeb&amp;" class="link_nav" target="_new">
+                  FinanzOnline Ratgeber
+                </a>
+              </td>
+              <td class="erlaeut">
+                FinanzOnline in Frage und Antwort
+              </td>		
+            </tr>
+            <tr>
+              <td class="erlaeut">
+                <a href="#" onclick="popup('/fon/Dispatcher?TARGET=eLearning&amp;');" class="link_nav">
+                  FinanzOnline eLearning
+                </a>
+              </td>
+              <td class="erlaeut">
+                Elektronisches Lernprogramm zur Handhabung von FinanzOnline und Durchführung der Arbeitnehmerveranlagung 
+              </td>		
+            </tr>				
+        </tbody></table>
+      </div>
+      
+      <div id="rightcontent">
+        <div id="navlist" style="margin-top: 0px;">
+          
+          
+          <a href="https://finanzonline.bmf.gv.at/fon/html/epsa.htm"><img name="Award" alt="Award" src="FinanzOnlineLogin/epsa-award.jpg" border="0"></a><br>
+          <a href="https://finanzonline.bmf.gv.at/fon/demo/isqw_start.htm"><img name="Award" alt="Award" src="FinanzOnlineLogin/award.gif" border="0"></a><br>
+          <a href="https://finanzonline.bmf.gv.at/fon/html/eZahlung.pdf" target="new"><img name="eps" alt="EPS" style="margin-left: 34px;" src="FinanzOnlineLogin/eps-logo.gif" border="0"></a>
+        </div>
+      </div>
+      
+    </div>
+    
+    <script type="text/javascript">
+      function popup(url)	{
+        var b = 1014;
+        var h = 738;
+        var win = window.open(url,"","left=0,top=0,width="+b+",height="+h+",hotkeys=no,location=no,menubar=no,resizable=no,scrollbars=no,status=no,toolbar=no");
+        win.focus();
+      }
+      document.forms[1].RES.value = screen.width + "x" + screen.height;
+      document.forms[1].JS.value = "J";
+    </script>
+</body></html>
\ No newline at end of file
diff --git a/BKUOnline/src/main/webapp/index.html b/BKUOnline/src/main/webapp/index.html
index 8f1a338e..bf8b3ae0 100644
--- a/BKUOnline/src/main/webapp/index.html
+++ b/BKUOnline/src/main/webapp/index.html
@@ -49,6 +49,8 @@
 <p>
 <h1>TestRequest</h1>
 <a href="HTTP-ohne.html">Security Layer Request</a>
+<h1>FinanzOnline</h1>
+<a href="finanzonline/">FinanzOnline Demo Integration</a>
 <h1>STAL Service</h1>
 <a href="stal">STAL Service Endpoint Information</a>
 </p>
diff --git a/BKUOnline/src/test/resources/appletTest.html b/BKUOnline/src/test/resources/appletTest.html
index bf24a2c9..71f09a93 100644
--- a/BKUOnline/src/test/resources/appletTest.html
+++ b/BKUOnline/src/test/resources/appletTest.html
@@ -22,7 +22,7 @@
               width=380 height=160>
               <param name="WSDL_URL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/stal?wsdl"/>
               <param name="SessionId" value="TestSession"/>
-              <param name="redirectURL" value="http://localhost:3495/redirectURL"/>
+              <param name="redirectURL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/bkuResult"/>
       </applet>
     </center>
   </body>
-- 
cgit v1.2.3